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

mesa: Fix delayed state flagging for EXT_sso-related program changes.

Browse Source 
Flushing the vertices after having already updated the state doesn't
do any good.  Fixes useshaderprogram-flushverts-1.  As a side effect,
by moving it to the right place we end up skipping no-op state changes
for traditional glUseProgram.
This commit is contained in:
Eric Anholt
2010-11-06 11:43:45 -07:00
parent 8eaa97592a
commit d348b0c72d
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -992,6 +992,7 @@ use_shader_program(struct gl_context *ctx, GLenum type,
} }
if (*target != shProg) { if (*target != shProg) {
FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
_mesa_reference_shader_program(ctx, target, shProg); _mesa_reference_shader_program(ctx, target, shProg);
return true; return true;
} }
@@ -1005,19 +1006,11 @@ use_shader_program(struct gl_context *ctx, GLenum type,
void void
_mesa_use_program(struct gl_context *ctx, struct gl_shader_program *shProg) _mesa_use_program(struct gl_context *ctx, struct gl_shader_program *shProg)
{ {
bool changed = false; use_shader_program(ctx, GL_VERTEX_SHADER, shProg);
use_shader_program(ctx, GL_GEOMETRY_SHADER_ARB, shProg);
changed = use_shader_program(ctx, GL_VERTEX_SHADER, shProg); use_shader_program(ctx, GL_FRAGMENT_SHADER, shProg);
changed = use_shader_program(ctx, GL_GEOMETRY_SHADER_ARB, shProg)
|| changed;
changed = use_shader_program(ctx, GL_FRAGMENT_SHADER, shProg)
|| changed;
_mesa_active_program(ctx, shProg, "glUseProgram"); _mesa_active_program(ctx, shProg, "glUseProgram");
if (changed) {
FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
}
if (ctx->Driver.UseProgram) if (ctx->Driver.UseProgram)
ctx->Driver.UseProgram(ctx, shProg); ctx->Driver.UseProgram(ctx, shProg);
} }
@@ -1589,8 +1582,6 @@ _mesa_UseProgramObjectARB(GLhandleARB program)
struct gl_transform_feedback_object *obj = struct gl_transform_feedback_object *obj =
ctx->TransformFeedback.CurrentObject; ctx->TransformFeedback.CurrentObject;
FLUSH_VERTICES(ctx, _NEW_PROGRAM);
if (obj->Active) { if (obj->Active) {
_mesa_error(ctx, GL_INVALID_OPERATION, _mesa_error(ctx, GL_INVALID_OPERATION,
"glUseProgram(transform feedback active)"); "glUseProgram(transform feedback active)");
@@ -1737,11 +1728,7 @@ void
_mesa_use_shader_program(struct gl_context *ctx, GLenum type, _mesa_use_shader_program(struct gl_context *ctx, GLenum type,
struct gl_shader_program *shProg) struct gl_shader_program *shProg)
{ {
bool changed; use_shader_program(ctx, type, shProg);
changed = use_shader_program(ctx, type, shProg);
if (changed)
FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
if (ctx->Driver.UseProgram) if (ctx->Driver.UseProgram)
ctx->Driver.UseProgram(ctx, shProg); ctx->Driver.UseProgram(ctx, shProg);