OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Track an ActiveProgram distinct from CurrentProgram

Browse Source 
ActiveProgram is the GL_EXT_separate_shader_objects state variable
used for glUniform calls.  glUseProgram also sets this.
This commit is contained in:
Ian Romanick
2010-10-11 16:07:08 -07:00
parent 01abcf3b79
commit 75c6f47288
4 changed files with 73 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/mesa/main/shaderapi.c
View File

@@ -117,6 +117,7 @@ void
_mesa_free_shader_state(struct gl_context *ctx)
{
_mesa_reference_shader_program(ctx, &ctx->Shader.CurrentProgram, NULL);
_mesa_reference_shader_program(ctx, &ctx->Shader.ActiveProgram, NULL);
}
@@ -607,8 +608,8 @@ static GLuint
get_handle(struct gl_context *ctx, GLenum pname)
{
if (pname == GL_PROGRAM_OBJECT_ARB) {
if (ctx->Shader.CurrentProgram)
return ctx->Shader.CurrentProgram->Name;
if (ctx->Shader.ActiveProgram)
return ctx->Shader.ActiveProgram->Name;
else
return 0;
}
@@ -907,6 +908,24 @@ print_shader_info(const struct gl_shader_program *shProg)
}
/**
* Use the named shader program for subsequent glUniform calls
*/
static void
active_program(struct gl_context *ctx, struct gl_shader_program *shProg,
const char *caller)
{
if ((shProg != NULL) && !shProg->LinkStatus) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"%s(program %u not linked)", caller, shProg->Name);
return;
}
if (ctx->Shader.ActiveProgram != shProg) {
_mesa_reference_shader_program(ctx, &ctx->Shader.ActiveProgram, shProg);
}
}
/**
* Use the named shader program for subsequent rendering.
*/
@@ -940,6 +959,8 @@ _mesa_use_program(struct gl_context *ctx, GLuint program)
return;
}
active_program(ctx, shProg, "glUseProgram");
/* debug code */
if (ctx->Shader.Flags & GLSL_USE_PROG) {
print_shader_info(shProg);
@@ -1657,18 +1678,11 @@ void GLAPIENTRY
_mesa_ActiveProgramEXT(GLuint program)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_shader_program *shProg;
struct gl_shader_program *shProg = (program != 0)
? _mesa_lookup_shader_program_err(ctx, program, "glActiveProgramEXT")
: NULL;
shProg = _mesa_lookup_shader_program_err(ctx, program,
"glActiveProgramEXT");
if (!shProg->LinkStatus) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glActiveProgramEXT(program not linked)");
return;
}
_mesa_error(ctx, GL_INVALID_OPERATION,
"glActiveProgramEXT(NOT YET IMPLEMENTED)");
active_program(ctx, shProg, "glActiveProgramEXT");
return;
}