fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-17 21:10:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: add KHR_no_error support for glGetUniformLocation()

Browse source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Timothy Arceri 2017-06-28 14:34:14 +10:00
parent cc88eb97e0
commit cb209dae99
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mapi/glapi/gen/gl_API.xml
View file

@ -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"/>

11
src/mesa/main/uniforms.c
View file

@ -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)

2
src/mesa/main/uniforms.h
View file

@ -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);