summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker/st_cb_program.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/state_tracker/st_cb_program.c')
-rw-r--r--src/mesa/state_tracker/st_cb_program.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index d79cfe2..6264896 100644
--- a/src/mesa/state_tracker/st_cb_program.c
+++ b/src/mesa/state_tracker/st_cb_program.c
@@ -61,22 +61,22 @@ st_bind_program(struct gl_context *ctx, GLenum target, struct gl_program *prog)
switch (target) {
case GL_VERTEX_PROGRAM_ARB:
- st->dirty.st |= ST_NEW_VERTEX_PROGRAM;
+ st->dirty |= ST_NEW_VERTEX_PROGRAM;
break;
case GL_FRAGMENT_PROGRAM_ARB:
- st->dirty.st |= ST_NEW_FRAGMENT_PROGRAM;
+ st->dirty |= ST_NEW_FRAGMENT_PROGRAM;
break;
case GL_GEOMETRY_PROGRAM_NV:
- st->dirty.st |= ST_NEW_GEOMETRY_PROGRAM;
+ st->dirty |= ST_NEW_GEOMETRY_PROGRAM;
break;
case GL_TESS_CONTROL_PROGRAM_NV:
- st->dirty.st |= ST_NEW_TESSCTRL_PROGRAM;
+ st->dirty |= ST_NEW_TESSCTRL_PROGRAM;
break;
case GL_TESS_EVALUATION_PROGRAM_NV:
- st->dirty.st |= ST_NEW_TESSEVAL_PROGRAM;
+ st->dirty |= ST_NEW_TESSEVAL_PROGRAM;
break;
case GL_COMPUTE_PROGRAM_NV:
- st->dirty_cp.st |= ST_NEW_COMPUTE_PROGRAM;
+ st->dirty |= ST_NEW_COMPUTE_PROGRAM;
break;
}
}
@@ -91,12 +91,12 @@ st_use_program(struct gl_context *ctx, struct gl_shader_program *shProg)
{
struct st_context *st = st_context(ctx);
- st->dirty.st |= ST_NEW_FRAGMENT_PROGRAM;
- st->dirty.st |= ST_NEW_VERTEX_PROGRAM;
- st->dirty.st |= ST_NEW_GEOMETRY_PROGRAM;
- st->dirty.st |= ST_NEW_TESSCTRL_PROGRAM;
- st->dirty.st |= ST_NEW_TESSEVAL_PROGRAM;
- st->dirty_cp.st |= ST_NEW_COMPUTE_PROGRAM;
+ st->dirty |= ST_NEW_FRAGMENT_PROGRAM;
+ st->dirty |= ST_NEW_VERTEX_PROGRAM;
+ st->dirty |= ST_NEW_GEOMETRY_PROGRAM;
+ st->dirty |= ST_NEW_TESSCTRL_PROGRAM;
+ st->dirty |= ST_NEW_TESSEVAL_PROGRAM;
+ st->dirty |= ST_NEW_COMPUTE_PROGRAM;
}
@@ -245,7 +245,7 @@ st_program_string_notify( struct gl_context *ctx,
return false;
if (st->fp == stfp)
- st->dirty.st |= ST_NEW_FRAGMENT_PROGRAM;
+ st->dirty |= ST_NEW_FRAGMENT_PROGRAM;
}
else if (target == GL_GEOMETRY_PROGRAM_NV) {
struct st_geometry_program *stgp = (struct st_geometry_program *) prog;
@@ -256,7 +256,7 @@ st_program_string_notify( struct gl_context *ctx,
return false;
if (st->gp == stgp)
- st->dirty.st |= ST_NEW_GEOMETRY_PROGRAM;
+ st->dirty |= ST_NEW_GEOMETRY_PROGRAM;
}
else if (target == GL_VERTEX_PROGRAM_ARB) {
struct st_vertex_program *stvp = (struct st_vertex_program *) prog;
@@ -266,7 +266,7 @@ st_program_string_notify( struct gl_context *ctx,
return false;
if (st->vp == stvp)
- st->dirty.st |= ST_NEW_VERTEX_PROGRAM;
+ st->dirty |= ST_NEW_VERTEX_PROGRAM;
}
else if (target == GL_TESS_CONTROL_PROGRAM_NV) {
struct st_tessctrl_program *sttcp =
@@ -278,7 +278,7 @@ st_program_string_notify( struct gl_context *ctx,
return false;
if (st->tcp == sttcp)
- st->dirty.st |= ST_NEW_TESSCTRL_PROGRAM;
+ st->dirty |= ST_NEW_TESSCTRL_PROGRAM;
}
else if (target == GL_TESS_EVALUATION_PROGRAM_NV) {
struct st_tesseval_program *sttep =
@@ -290,7 +290,7 @@ st_program_string_notify( struct gl_context *ctx,
return false;
if (st->tep == sttep)
- st->dirty.st |= ST_NEW_TESSEVAL_PROGRAM;
+ st->dirty |= ST_NEW_TESSEVAL_PROGRAM;
}
else if (target == GL_COMPUTE_PROGRAM_NV) {
struct st_compute_program *stcp =
@@ -301,7 +301,7 @@ st_program_string_notify( struct gl_context *ctx,
return false;
if (st->cp == stcp)
- st->dirty_cp.st |= ST_NEW_COMPUTE_PROGRAM;
+ st->dirty |= ST_NEW_COMPUTE_PROGRAM;
}
else if (target == GL_FRAGMENT_SHADER_ATI) {
assert(prog);
@@ -317,7 +317,7 @@ st_program_string_notify( struct gl_context *ctx,
return false;
if (st->fp == stfp)
- st->dirty.st |= ST_NEW_FRAGMENT_PROGRAM;
+ st->dirty |= ST_NEW_FRAGMENT_PROGRAM;
}
if (ST_DEBUG & DEBUG_PRECOMPILE ||