diff options
| author | Samuel Pitoiset <[email protected]> | 2017-06-26 14:05:46 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-06-28 10:25:12 +0200 |
| commit | 18e31bb25222b8763f8c90eb8a07f6a72bdb0916 (patch) | |
| tree | f4df969e7049a57258e3b085eec9f717d547e1bf | |
| parent | 455b1a3a4b688e859d4b0b12f1f13f4e472444be (diff) | |
mesa: add KHR_no_error support for gl*Samplers()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 2 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/ARB_sampler_objects.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/samplerobj.c | 14 | ||||
| -rw-r--r-- | src/mesa/main/samplerobj.h | 7 |
4 files changed, 23 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml index e307f8e6edf..e8526d1c528 100644 --- a/src/mapi/glapi/gen/ARB_direct_state_access.xml +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -675,7 +675,7 @@ <!-- Sampler object functions --> - <function name="CreateSamplers"> + <function name="CreateSamplers" no_error="true"> <param name="n" type="GLsizei" /> <param name="samplers" type="GLuint *" /> </function> diff --git a/src/mapi/glapi/gen/ARB_sampler_objects.xml b/src/mapi/glapi/gen/ARB_sampler_objects.xml index 20363f70b28..9fe6c41c855 100644 --- a/src/mapi/glapi/gen/ARB_sampler_objects.xml +++ b/src/mapi/glapi/gen/ARB_sampler_objects.xml @@ -7,7 +7,7 @@ <category name="GL_ARB_sampler_objects" number="81"> - <function name="GenSamplers" es2="3.0"> + <function name="GenSamplers" es2="3.0" no_error="true"> <param name="count" type="GLsizei"/> <param name="samplers" type="GLuint *"/> </function> diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c index 7ac1743e2d3..d78528be2db 100644 --- a/src/mesa/main/samplerobj.c +++ b/src/mesa/main/samplerobj.c @@ -194,6 +194,13 @@ create_samplers_err(struct gl_context *ctx, GLsizei count, GLuint *samplers, } void GLAPIENTRY +_mesa_GenSamplers_no_error(GLsizei count, GLuint *samplers) +{ + GET_CURRENT_CONTEXT(ctx); + create_samplers(ctx, count, samplers); +} + +void GLAPIENTRY _mesa_GenSamplers(GLsizei count, GLuint *samplers) { GET_CURRENT_CONTEXT(ctx); @@ -201,6 +208,13 @@ _mesa_GenSamplers(GLsizei count, GLuint *samplers) } void GLAPIENTRY +_mesa_CreateSamplers_no_error(GLsizei count, GLuint *samplers) +{ + GET_CURRENT_CONTEXT(ctx); + create_samplers(ctx, count, samplers); +} + +void GLAPIENTRY _mesa_CreateSamplers(GLsizei count, GLuint *samplers) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h index 8e9539d8d8f..26b5dd6b016 100644 --- a/src/mesa/main/samplerobj.h +++ b/src/mesa/main/samplerobj.h @@ -96,7 +96,14 @@ _mesa_bind_sampler(struct gl_context *ctx, GLuint unit, struct gl_sampler_object *sampObj); void GLAPIENTRY +_mesa_GenSamplers_no_error(GLsizei count, GLuint *samplers); + +void GLAPIENTRY _mesa_GenSamplers(GLsizei count, GLuint *samplers); + +void GLAPIENTRY +_mesa_CreateSamplers_no_error(GLsizei count, GLuint *samplers); + void GLAPIENTRY _mesa_CreateSamplers(GLsizei count, GLuint *samplers); void GLAPIENTRY |