summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-07-17 21:59:39 +0200
committerSamuel Pitoiset <[email protected]>2017-07-31 13:53:39 +0200
commit6c15260ecc45f8418457eb1f93ae90ba71926fae (patch)
tree5dbe6954e86f18229f7e37b84d225043a5be47d1 /src
parent5f51c970a99d0aba01baf7520d8508d725e4832d (diff)
mesa: add KHR_no_error support to glSampleMaski()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mapi/glapi/gen/ARB_texture_multisample.xml2
-rw-r--r--src/mesa/main/multisample.c7
-rw-r--r--src/mesa/main/multisample.h3
3 files changed, 11 insertions, 1 deletions
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
@@ -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 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);