mesa: add KHR_no_error support for gl*Samplers()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>

diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index e307f8e6edf14bc0cc6e52ad1cb9e7ff8873087b..e8526d1c52866ed490835c2372b88a5bd7689994 100644 (file)
--- 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 20363f70b2803eb07f17b7e531d7ed1cf1002e3e..9fe6c41c8558a20fcf3ba4893ad79f711f1935f4 100644 (file)
--- 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 7ac1743e2d3050bb8955baae5f7e87f9e9b1da48..d78528be2dbfd7096e80354445237ce76b978ddd 100644 (file)
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -193,6 +193,13 @@ create_samplers_err(struct gl_context *ctx, GLsizei count, GLuint *samplers,
    create_samplers(ctx, count, 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)
 {
@@ -200,6 +207,13 @@ _mesa_GenSamplers(GLsizei count, GLuint *samplers)
    create_samplers_err(ctx, count, samplers, "glGenSamplers");
 }
 
+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)
 {

diff --git a/src/mesa/main/samplerobj.h b/src/mesa/main/samplerobj.h
index 8e9539d8d8fdd18415a15b2a06a09f3267e3163e..26b5dd6b0163066b599860e76f002bbf27b17774 100644 (file)
--- a/src/mesa/main/samplerobj.h
+++ b/src/mesa/main/samplerobj.h
@@ -95,8 +95,15 @@ extern void
 _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