summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2017-07-19 11:57:22 +0200
committerSamuel Pitoiset <[email protected]>2017-07-31 13:53:39 +0200
commitad427f54aa8881e206bbe504c2fa20a6f95c3dc8 (patch)
treea080c8793b0471e783a83fc221c1bc6fdb0e9eff
parent488af1292ac4834fbd372ef45c87cb7fbc2b381c (diff)
mesa: add KHR_no_error support to glDeleteTextures()
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timothy Arceri <[email protected]>
-rw-r--r--src/mapi/glapi/gen/gl_API.xml2
-rw-r--r--src/mesa/main/texobj.c8
-rw-r--r--src/mesa/main/texobj.h3
3 files changed, 12 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 4d0211a33c7..60505e57b9f 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -3339,7 +3339,7 @@
<glx rop="4117"/>
</function>
- <function name="DeleteTextures" es1="1.0" es2="2.0">
+ <function name="DeleteTextures" es1="1.0" es2="2.0" no_error="true">
<param name="n" type="GLsizei" counter="true"/>
<param name="textures" type="const GLuint *" count="n"/>
<glx sop="144"/>
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 494ea25f803..b703da01bef 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1505,6 +1505,14 @@ delete_textures(struct gl_context *ctx, GLsizei n, const GLuint *textures)
void GLAPIENTRY
+_mesa_DeleteTextures_no_error(GLsizei n, const GLuint *textures)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ delete_textures(ctx, n, textures);
+}
+
+
+void GLAPIENTRY
_mesa_DeleteTextures(GLsizei n, const GLuint *textures)
{
GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 6443a567051..71cc8ffba2e 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -189,6 +189,9 @@ _mesa_CreateTextures_no_error(GLenum target, GLsizei n, GLuint *textures);
extern void GLAPIENTRY
_mesa_CreateTextures(GLenum target, GLsizei n, GLuint *textures);
+void GLAPIENTRY
+_mesa_DeleteTextures_no_error(GLsizei n, const GLuint *textures);
+
extern void GLAPIENTRY
_mesa_DeleteTextures( GLsizei n, const GLuint *textures );