[Mesa-dev] [PATCH 004/101] mesa: add KHR_no_error support to glSampleMaski()

Samuel Pitoiset samuel.pitoiset at gmail.com
Fri Jul 21 17:39:13 UTC 2017


Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 src/mapi/glapi/gen/ARB_texture_multisample.xml | 2 +-
 src/mesa/main/multisample.c                    | 7 +++++++
 src/mesa/main/multisample.h                    | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/mapi/glapi/gen/ARB_texture_multisample.xml b/src/mapi/glapi/gen/ARB_texture_multisample.xml
index 595e1c7eae..0040c5398d 100644
--- a/src/mapi/glapi/gen/ARB_texture_multisample.xml
+++ b/src/mapi/glapi/gen/ARB_texture_multisample.xml
@@ -59,7 +59,7 @@
       <param name="val" type="GLfloat *"/>
    </function>
 
-   <function name="SampleMaski" es2="3.1">
+   <function name="SampleMaski" es2="3.1" no_error="true">
       <param name="index" type="GLuint"/>
       <param name="mask" type="GLbitfield"/>
    </function>
diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 121023ac82..f8b117f143 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -117,6 +117,13 @@ sample_maski(struct gl_context *ctx, GLuint index, GLbitfield mask)
 }
 
 void GLAPIENTRY
+_mesa_SampleMaski_no_error(GLuint index, GLbitfield mask)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   sample_maski(ctx, index, mask);
+}
+
+void GLAPIENTRY
 _mesa_SampleMaski(GLuint index, GLbitfield mask)
 {
    GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/multisample.h b/src/mesa/main/multisample.h
index 7441d3ee94..379afbc574 100644
--- a/src/mesa/main/multisample.h
+++ b/src/mesa/main/multisample.h
@@ -41,6 +41,9 @@ _mesa_init_multisample(struct gl_context *ctx);
 extern void GLAPIENTRY
 _mesa_GetMultisamplefv(GLenum pname, GLuint index, GLfloat* val);
 
+void GLAPIENTRY
+_mesa_SampleMaski_no_error(GLuint index, GLbitfield mask);
+
 extern void GLAPIENTRY
 _mesa_SampleMaski(GLuint index, GLbitfield mask);
 
-- 
2.13.3



More information about the mesa-dev mailing list