From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 17 Jul 2017 19:59:39 +0000 (+0200)
Subject: mesa: add KHR_no_error support to glSampleMaski()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6c15260ecc45f8418457eb1f93ae90ba71926fae;p=mesa.git

mesa: add KHR_no_error support to glSampleMaski()

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

diff --git a/src/mapi/glapi/gen/ARB_texture_multisample.xml b/src/mapi/glapi/gen/ARB_texture_multisample.xml
index 595e1c7eae6..0040c5398d1 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 121023ac827..f8b117f143d 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -116,6 +116,13 @@ sample_maski(struct gl_context *ctx, GLuint index, GLbitfield mask)
    ctx->Multisample.SampleMaskValue = 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)
 {
diff --git a/src/mesa/main/multisample.h b/src/mesa/main/multisample.h
index 7441d3ee941..379afbc574f 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);