From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 20 Jul 2017 09:26:42 +0000 (+0200)
Subject: mesa: add KHR_no_error support to glShaderSource()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fcd8ab6e866b96e6601fdc04c72a74c782b31454;p=mesa.git

mesa: add KHR_no_error support to glShaderSource()

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

diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index e1b3c43fb19..7afcc5db65d 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -5497,7 +5497,7 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="ShaderSource" es2="2.0" marshal="custom">
+    <function name="ShaderSource" es2="2.0" marshal="custom" no_error="true">
         <param name="shader" type="GLuint"/>
         <param name="count" type="GLsizei"/>
         <param name="string" type="const GLchar * const *"/>
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 941419b6f17..55398131824 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1903,6 +1903,15 @@ shader_source(struct gl_context *ctx, GLuint shaderObj, GLsizei count,
 }
 
 
+void GLAPIENTRY
+_mesa_ShaderSource_no_error(GLuint shaderObj, GLsizei count,
+                            const GLchar *const *string, const GLint *length)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   shader_source(ctx, shaderObj, count, string, length, true);
+}
+
+
 void GLAPIENTRY
 _mesa_ShaderSource(GLuint shaderObj, GLsizei count,
                    const GLchar *const *string, const GLint *length)
diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h
index e4c3bd2e76e..b76e57ee39d 100644
--- a/src/mesa/main/shaderapi.h
+++ b/src/mesa/main/shaderapi.h
@@ -134,6 +134,10 @@ _mesa_IsShader(GLuint name);
 extern void GLAPIENTRY
 _mesa_LinkProgram(GLuint programObj);
 
+void GLAPIENTRY
+_mesa_ShaderSource_no_error(GLuint, GLsizei, const GLchar* const *,
+                            const GLint *);
+
 extern void GLAPIENTRY
 _mesa_ShaderSource(GLuint, GLsizei, const GLchar* const *, const GLint *);