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 e1b3c43fb19bad67daa48007b8ea2940e20da897..7afcc5db65dcf9f099b78c731dc4534559eba1d5 100644 (file)
--- 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 941419b6f17e759513841825b6eddb2784adf9f8..5539813182475ee9261075a68c6dbf96d9004945 100644 (file)
--- 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 e4c3bd2e76e4f5a8220ea6fc246b098f204e21c4..b76e57ee39d643a029cc8b437ce955a7e1e07a57 100644 (file)
--- 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 *);