diff options
| author | Samuel Pitoiset <[email protected]> | 2017-07-18 12:49:22 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-07-31 13:53:39 +0200 |
| commit | 18bd5d2c8c32897a0d549ea55a874a3832935f6f (patch) | |
| tree | 2599e0bb16d2a083d89b4867535751a8e39f27a2 /src | |
| parent | 698ae2f0ef5929f00085fd0c7b81058bb5d3fc54 (diff) | |
mesa: add KHR_no_error support to glBindSamplers()
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_multi_bind.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/samplerobj.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/samplerobj.h | 5 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_multi_bind.xml b/src/mapi/glapi/gen/ARB_multi_bind.xml index 601680f30bd..5d78954fad4 100644 --- a/src/mapi/glapi/gen/ARB_multi_bind.xml +++ b/src/mapi/glapi/gen/ARB_multi_bind.xml @@ -29,7 +29,7 @@ <param name="textures" type="const GLuint *"/> </function> - <function name="BindSamplers"> + <function name="BindSamplers" no_error="true"> <param name="first" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="samplers" type="const GLuint *"/> diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c index 77496ed8499..cdfd753a8b9 100644 --- a/src/mesa/main/samplerobj.c +++ b/src/mesa/main/samplerobj.c @@ -412,6 +412,14 @@ bind_samplers(struct gl_context *ctx, GLuint first, GLsizei count, void GLAPIENTRY +_mesa_BindSamplers_no_error(GLuint first, GLsizei count, const GLuint *samplers) +{ + GET_CURRENT_CONTEXT(ctx); + bind_samplers(ctx, first, count, samplers, true); +} + + +void GLAPIENTRY _mesa_BindSamplers(GLuint first, GLsizei count, const GLuint *samplers) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h index 26b5dd6b016..eb20df1040d 100644 --- a/src/mesa/main/samplerobj.h +++ b/src/mesa/main/samplerobj.h @@ -112,8 +112,13 @@ GLboolean GLAPIENTRY _mesa_IsSampler(GLuint sampler); void GLAPIENTRY _mesa_BindSampler(GLuint unit, GLuint sampler); + +void GLAPIENTRY +_mesa_BindSamplers_no_error(GLuint first, GLsizei count, const GLuint *samplers); + void GLAPIENTRY _mesa_BindSamplers(GLuint first, GLsizei count, const GLuint *samplers); + void GLAPIENTRY _mesa_SamplerParameteri(GLuint sampler, GLenum pname, GLint param); void GLAPIENTRY |