@@ -3266,25 +3266,33 @@ <h4>Uniforms and attributes</h4>
32663266 < dt class ="idl-code "> [WebGLHandlesContextLoss] GLint getAttribLocation(WebGLProgram program, DOMString name)
32673267 < span class ="gl-spec "> (< a href ="http://registry.khronos.org/OpenGL/specs/es/2.0/es_full_spec_2.0.pdf#nameddest=section-2.10.4 "> OpenGL ES 2.0 §2.10.4</ a > , < a class ="nonnormative " href ="http://www.khronos.org/opengles/sdk/2.0/docs/man/xhtml/glGetAttribLocation.xml "> man page</ a > )</ span >
32683268 < dd >
3269+ If the context's < a href ="#webgl-context-lost-flag "> webgl context lost flag</ a > is set,
3270+ generates no error and returns -1 regardless of the passed parameters.< br > < br >
3271+
3272+ If the < a href ="#webgl-object-invalidated-flag "> invalidated flag</ a > of the passed
3273+ < code > program</ code > is set, generates an < code > INVALID_OPERATION</ code > error and
3274+ returns -1.< br > < br >
3275+
32693276 If < code > program</ code > was generated by a different < code > WebGLRenderingContext</ code >
3270- than this one, generates an < code > INVALID_OPERATION</ code > error and returns -1. < br > < br >
3277+ than this one, generates an < code > INVALID_OPERATION</ code > error and returns -1.< br > < br >
32713278
3272- If the passed name is longer than the restriction defined
3273- in < a href ="#MAX_LOCATION_LENGTHS "> Maximum Uniform and Attribute Location Lengths</ a > ,
3274- generates an < code > INVALID_VALUE</ code > error and returns -1. < br > < br >
3279+ If < code > program</ code > was deleted,
3280+ generates an < code > INVALID_VALUE</ code > error and returns -1.< br > < br >
32753281
3276- Returns -1 if < code > name </ code > starts with one of the reserved WebGL prefixes
3277- per < a href =" #GLSL_CONSTRUCTS " > GLSL Constructs </ a > . < br > < br >
3282+ If < code > program </ code > is not linked,
3283+ generates an < code > INVALID_OPERATION </ code > error and returns -1. < br > < br >
32783284
3279- Returns -1 if the context's < a href ="#webgl-context-lost-flag "> webgl context lost
3280- flag</ a > is set. < br > < br >
3285+ If the passed < code > name</ code > is longer than the restriction defined
3286+ in < a href ="#MAX_LOCATION_LENGTHS "> Maximum Uniform and Attribute Location Lengths</ a > ,
3287+ generates an < code > INVALID_VALUE</ code > error and returns -1.< br > < br >
32813288
3282- If the < a href =" #webgl-object-invalidated-flag " > invalidated flag </ a > of the passed
3283- program is set, generates an < code > INVALID_OPERATION </ code > error and returns
3284- -1. < br > < br >
3289+ If the passed < code > name </ code > contains
3290+ < a href =" #CHARACTERS_OUTSIDE_VALID_SET " > Characters Outside the GLSL Source Character Set </ a > ,
3291+ generates an < code > INVALID_VALUE </ code > error and returns -1.< br > < br >
32853292
3286- See < a href ="#CHARACTERS_OUTSIDE_VALID_SET "> Characters Outside the GLSL Source Character
3287- Set</ a > for additional validation performed by WebGL implementations.
3293+ If the passed < code > name</ code > starts with one of the reserved WebGL prefixes
3294+ per < a href ="#GLSL_CONSTRUCTS "> GLSL Constructs</ a > and none of the error conditions
3295+ described above apply, generates no error and returns -1.
32883296 < dt class ="idl-code "> any getUniform(WebGLProgram program, WebGLUniformLocation location)
32893297 < span class ="gl-spec "> (< a href ="http://registry.khronos.org/OpenGL/specs/es/2.0/es_full_spec_2.0.pdf#nameddest=section-6.1.8 "> OpenGL ES 2.0 §6.1.8</ a > , < a class ="nonnormative " href ="http://www.khronos.org/opengles/sdk/2.0/docs/man/xhtml/glGetUniform.xml "> man page</ a > )</ span >
32903298 < dd >
@@ -3321,24 +3329,29 @@ <h4>Uniforms and attributes</h4>
33213329 < span class ="gl-spec "> (< a href ="http://registry.khronos.org/OpenGL/specs/es/2.0/es_full_spec_2.0.pdf#nameddest=section-2.10.4 "> OpenGL ES 2.0 §2.10.4</ a > , < a class ="nonnormative " href ="http://www.khronos.org/opengles/sdk/2.0/docs/man/xhtml/glGetUniformLocation.xml "> man page</ a > )</ span >
33223330 < dd >
33233331 If < code > program</ code > was generated by a different < code > WebGLRenderingContext</ code >
3324- than this one, generates an < code > INVALID_OPERATION</ code > error. < br > < br >
3332+ than this one, generates an < code > INVALID_OPERATION</ code > error and returns null. < br > < br >
33253333
3326- < p > Return a new < code > WebGLUniformLocation</ code > that represents the location of a
3327- specific uniform variable within a program object. The return value is null if name does
3328- not correspond to an active uniform variable in the passed program.</ p >
3334+ If < code > program</ code > was deleted,
3335+ generates an < code > INVALID_VALUE</ code > error and returns null.< br > < br >
3336+
3337+ If < code > program</ code > is not linked,
3338+ generates an < code > INVALID_OPERATION</ code > error and returns null.< br > < br >
33293339
3330- < p > If the passed name is longer than the restriction defined
3340+ If the passed < code > name</ code > is longer than the restriction defined
33313341 in < a href ="#MAX_LOCATION_LENGTHS "> Maximum Uniform and Attribute Location Lengths</ a > ,
3332- generates an < code > INVALID_VALUE</ code > error and returns null.</ p >
3342+ generates an < code > INVALID_VALUE</ code > error and returns null.< br > < br >
33333343
3334- < p > Returns null if < code > name</ code > starts with one of the reserved WebGL prefixes
3335- per < a href ="#GLSL_CONSTRUCTS "> GLSL Constructs</ a > .</ p >
3344+ If the passed < code > name</ code > contains
3345+ < a href ="#CHARACTERS_OUTSIDE_VALID_SET "> Characters Outside the GLSL Source Character Set</ a > ,
3346+ generates an < code > INVALID_VALUE</ code > error and returns null.< br > < br >
33363347
3337- < p > See < a href ="#CHARACTERS_OUTSIDE_VALID_SET "> Characters Outside the GLSL Source
3338- Character Set</ a > for additional validation performed by WebGL implementations.</ p >
3348+ If the passed < code > name</ code > starts with one of the reserved WebGL prefixes
3349+ per < a href ="#GLSL_CONSTRUCTS "> GLSL Constructs</ a > and none of the error conditions
3350+ described above apply, generates no error and returns null.< br > < br >
33393351
3340- < p > Returns null if any OpenGL errors are generated during the execution of this
3341- function.</ p >
3352+ Returns a new < code > WebGLUniformLocation</ code > that represents the location of a
3353+ specific uniform variable within a program object. The return value is null if name does
3354+ not correspond to an active uniform variable in the passed < code > program</ code > .
33423355 < dt class ="idl-code "> any getVertexAttrib(GLuint index, GLenum pname)
33433356 < span class ="gl-spec "> (< a href ="http://registry.khronos.org/OpenGL/specs/es/2.0/es_full_spec_2.0.pdf#nameddest=section-6.1.8 "> OpenGL ES 2.0 §6.1.8</ a > , < a class ="nonnormative " href ="http://www.khronos.org/opengles/sdk/2.0/docs/man/xhtml/glGetVertexAttrib.xml "> man page</ a > )</ span >
33443357 < dd >
0 commit comments