diff options
| author | Timothy Arceri <[email protected]> | 2017-06-28 14:34:14 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-06-29 08:54:11 +1000 |
| commit | cb209dae9919eca304213768fc73b0b91eb96cfe (patch) | |
| tree | 40898bc263d29a92855796f17cd59e220b8393cd | |
| parent | cc88eb97e08070fb5b599c0dd3f3d3cc0b88f9a1 (diff) | |
mesa: add KHR_no_error support for glGetUniformLocation()
Reviewed-by: Samuel Pitoiset <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/uniforms.c | 11 | ||||
| -rw-r--r-- | src/mesa/main/uniforms.h | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 8a8f15b9dd4..f726fe3477d 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -5427,7 +5427,7 @@ <glx ignore="true"/> </function> - <function name="GetUniformLocation" es2="2.0"> + <function name="GetUniformLocation" es2="2.0" no_error="true"> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> <return type="GLint"/> diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 194f64a3b2c..ddfe9064c2d 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -1025,6 +1025,17 @@ _mesa_GetUniformLocation(GLuint programObj, const GLcharARB *name) return _mesa_program_resource_location(shProg, GL_UNIFORM, name); } +GLint GLAPIENTRY +_mesa_GetUniformLocation_no_error(GLuint programObj, const GLcharARB *name) +{ + GET_CURRENT_CONTEXT(ctx); + + struct gl_shader_program *shProg = + _mesa_lookup_shader_program(ctx, programObj); + + return _mesa_program_resource_location(shProg, GL_UNIFORM, name); +} + GLuint GLAPIENTRY _mesa_GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName) diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 1cee90d2a77..9236db97805 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -224,6 +224,8 @@ void GLAPIENTRY _mesa_GetUniformdv(GLuint, GLint, GLdouble *); GLint GLAPIENTRY _mesa_GetUniformLocation(GLuint, const GLcharARB *); +GLint GLAPIENTRY +_mesa_GetUniformLocation_no_error(GLuint, const GLcharARB *); GLuint GLAPIENTRY _mesa_GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName); |