diff options
| author | Samuel Pitoiset <[email protected]> | 2017-07-18 12:23:27 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-07-31 13:53:39 +0200 |
| commit | 2af699a2c7bfcc93bbd15a32aaea24dccd7aee0f (patch) | |
| tree | 2861f034a145bc9af518ae5eba020b84d3ba9a61 /src | |
| parent | c95bf616a8924c7d38603ea7f81ac8a051c38f23 (diff) | |
mesa: add KHR_no_error support to glProgramParameteri()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapi/glapi/gen/ARB_get_program_binary.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 10 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.h | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_get_program_binary.xml b/src/mapi/glapi/gen/ARB_get_program_binary.xml index 25e0a37c84b..c521c04de42 100644 --- a/src/mapi/glapi/gen/ARB_get_program_binary.xml +++ b/src/mapi/glapi/gen/ARB_get_program_binary.xml @@ -26,7 +26,7 @@ <param name="length" type="GLsizei"/> </function> - <function name="ProgramParameteri" es2="3.0"> + <function name="ProgramParameteri" es2="3.0" no_error="true"> <param name="program" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="value" type="GLint"/> diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 63aec08d0c6..c6e90edc944 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2215,6 +2215,16 @@ invalid_value: void GLAPIENTRY +_mesa_ProgramParameteri_no_error(GLuint program, GLenum pname, GLint value) +{ + GET_CURRENT_CONTEXT(ctx); + + struct gl_shader_program *shProg = _mesa_lookup_shader_program(ctx, program); + program_parameteri(ctx, shProg, pname, value, true); +} + + +void GLAPIENTRY _mesa_ProgramParameteri(GLuint program, GLenum pname, GLint value) { struct gl_shader_program *shProg; diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index fad584506cb..ae53021d914 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -234,6 +234,9 @@ extern void GLAPIENTRY _mesa_ProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length); +void GLAPIENTRY +_mesa_ProgramParameteri_no_error(GLuint program, GLenum pname, GLint value); + extern void GLAPIENTRY _mesa_ProgramParameteri(GLuint program, GLenum pname, GLint value); |