Mesa (master): mesa: add KHR_no_error support for glUseProgramStages()
Timothy Arceri
tarceri at kemper.freedesktop.org
Thu May 11 01:09:33 UTC 2017
Module: Mesa
Branch: master
Commit: 00c5119a5e8210e801192c77069b79a87f63264e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=00c5119a5e8210e801192c77069b79a87f63264e
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date: Wed May 3 14:20:26 2017 +1000
mesa: add KHR_no_error support for glUseProgramStages()
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/mapi/glapi/gen/ARB_separate_shader_objects.xml | 2 +-
src/mesa/main/pipelineobj.c | 21 +++++++++++++++++++++
src/mesa/main/pipelineobj.h | 3 +++
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/src/mapi/glapi/gen/ARB_separate_shader_objects.xml b/src/mapi/glapi/gen/ARB_separate_shader_objects.xml
index 26a7afa94a..9b17a4e040 100644
--- a/src/mapi/glapi/gen/ARB_separate_shader_objects.xml
+++ b/src/mapi/glapi/gen/ARB_separate_shader_objects.xml
@@ -15,7 +15,7 @@
<enum name="ALL_SHADER_BITS" value="0xFFFFFFFF"/>
<enum name="PROGRAM_SEPARABLE" value="0x8258"/>
- <function name="UseProgramStages" es2="3.1">
+ <function name="UseProgramStages" es2="3.1" no_error="true">
<param name="pipeline" type="GLuint" />
<param name="stages" type="GLbitfield" />
<param name="program" type="GLuint" />
diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c
index 047c0a340e..b6a4332f60 100644
--- a/src/mesa/main/pipelineobj.c
+++ b/src/mesa/main/pipelineobj.c
@@ -256,6 +256,27 @@ use_program_stages(struct gl_context *ctx, struct gl_shader_program *shProg,
pipe->Validated = false;
}
+void GLAPIENTRY
+_mesa_UseProgramStages_no_error(GLuint pipeline, GLbitfield stages,
+ GLuint prog)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ struct gl_pipeline_object *pipe =
+ _mesa_lookup_pipeline_object(ctx, pipeline);
+ struct gl_shader_program *shProg = NULL;
+
+ if (prog)
+ _mesa_lookup_shader_program(ctx, prog);
+
+ /* Object is created by any Pipeline call but glGenProgramPipelines,
+ * glIsProgramPipeline and GetProgramPipelineInfoLog
+ */
+ pipe->EverBound = GL_TRUE;
+
+ use_program_stages(ctx, shProg, stages, pipe);
+}
+
/**
* Bound program to severals stages of the pipeline
*/
diff --git a/src/mesa/main/pipelineobj.h b/src/mesa/main/pipelineobj.h
index fbcb765924..048a4c7bf3 100644
--- a/src/mesa/main/pipelineobj.h
+++ b/src/mesa/main/pipelineobj.h
@@ -71,6 +71,9 @@ _mesa_validate_program_pipeline(struct gl_context * ctx,
struct gl_pipeline_object *pipe);
+void GLAPIENTRY
+_mesa_UseProgramStages_no_error(GLuint pipeline, GLbitfield stages,
+ GLuint prog);
extern void GLAPIENTRY
_mesa_UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program);
More information about the mesa-commit
mailing list