diff options
| author | Samuel Pitoiset <[email protected]> | 2017-07-18 20:48:40 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-07-31 13:53:39 +0200 |
| commit | ef0b0389818f9dd99e55e44e52dc7e4446e37c79 (patch) | |
| tree | c15f0bd53b40baa973e1cb0e5e9382a010439afb | |
| parent | 3339b53755b520635c67f5a3ff90628023226334 (diff) | |
mesa: add KHR_no_error support to glDeleteSamplers()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_sampler_objects.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_sampler_objects.xml b/src/mapi/glapi/gen/ARB_sampler_objects.xml index 41fb1c0cca1..e10984b3f76 100644 --- a/src/mapi/glapi/gen/ARB_sampler_objects.xml +++ b/src/mapi/glapi/gen/ARB_sampler_objects.xml @@ -12,7 +12,7 @@ <param name="samplers" type="GLuint *"/> </function> - <function name="DeleteSamplers" es2="3.0"> + <function name="DeleteSamplers" es2="3.0" no_error="true"> <param name="count" type="GLsizei"/> <param name="samplers" type="const GLuint *"/> </function> diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c index 4cb4914731b..2ecb01777b3 100644 --- a/src/mesa/main/samplerobj.c +++ b/src/mesa/main/samplerobj.c @@ -266,6 +266,14 @@ delete_samplers(struct gl_context *ctx, GLsizei count, const GLuint *samplers) void GLAPIENTRY +_mesa_DeleteSamplers_no_error(GLsizei count, const GLuint *samplers) +{ + GET_CURRENT_CONTEXT(ctx); + delete_samplers(ctx, count, samplers); +} + + +void GLAPIENTRY _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h index 76c2c124242..2a28757b9b2 100644 --- a/src/mesa/main/samplerobj.h +++ b/src/mesa/main/samplerobj.h @@ -106,8 +106,13 @@ _mesa_CreateSamplers_no_error(GLsizei count, GLuint *samplers); void GLAPIENTRY _mesa_CreateSamplers(GLsizei count, GLuint *samplers); + +void GLAPIENTRY +_mesa_DeleteSamplers_no_error(GLsizei count, const GLuint *samplers); + void GLAPIENTRY _mesa_DeleteSamplers(GLsizei count, const GLuint *samplers); + GLboolean GLAPIENTRY _mesa_IsSampler(GLuint sampler); |