From 9f1fab9533a84d35e7121ecc551b206af87f0f85 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 19 Jul 2017 11:05:31 +0200
Subject: mesa: add KHR_no_error support to glBindTexture()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---
 src/mapi/glapi/gen/gl_API.xml | 2 +-
 src/mesa/main/texobj.c        | 8 ++++++++
 src/mesa/main/texobj.h        | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index fc863be87af..95c448d2364 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -3333,7 +3333,7 @@
         <glx sop="143" handcode="client" always_array="true"/>
     </function>
 
-    <function name="BindTexture" es1="1.0" es2="2.0">
+    <function name="BindTexture" es1="1.0" es2="2.0" no_error="true">
         <param name="target" type="GLenum"/>
         <param name="texture" type="GLuint"/>
         <glx rop="4117"/>
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 04f320cbcdd..bf48d7595da 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1702,6 +1702,14 @@ bind_texture(struct gl_context *ctx, GLenum target, GLuint texName,
 }
 
 
+void GLAPIENTRY
+_mesa_BindTexture_no_error(GLenum target, GLuint texName)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   bind_texture(ctx, target, texName, true);
+}
+
+
 void GLAPIENTRY
 _mesa_BindTexture(GLenum target, GLuint texName)
 {
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 9b9e4185d7b..4971a2075d8 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -193,6 +193,9 @@ extern void GLAPIENTRY
 _mesa_DeleteTextures( GLsizei n, const GLuint *textures );
 
 
+void GLAPIENTRY
+_mesa_BindTexture_no_error(GLenum target, GLuint texture);
+
 extern void GLAPIENTRY
 _mesa_BindTexture( GLenum target, GLuint texture );
 
-- 
cgit v1.2.3