summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2011-05-27 09:50:34 -0700
committerEric Anholt <[email protected]>2011-05-27 09:51:28 -0700
commit0653c450cc8da1212e1123a1cd6635c02f7d6919 (patch)
tree71530f49c1af3e34fafa9f81eeaa4ceeea28965d
parent9bd7e9c6b29b212a97bd4ca6c62836160b2f7698 (diff)
i965/fs: Fix up for 8752764076e5b3f052a57e0134424a37bf2e9164.
I failed to commit and squash before pushing.
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_emit.cpp2
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_visitor.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_emit.cpp b/src/mesa/drivers/dri/i965/brw_fs_emit.cpp
index 8958aeb8153..6b7c434949c 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_emit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_emit.cpp
@@ -602,7 +602,7 @@ fs_visitor::generate_code()
if (unlikely(INTEL_DEBUG & DEBUG_WM)) {
printf("Native code for fragment shader %d (%d-wide dispatch):\n",
- ctx->Shader.CurrentFragmentProgram->Name, c->dispatch_width);
+ prog->Name, c->dispatch_width);
}
foreach_iter(exec_list_iterator, iter, this->instructions) {
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index 1445582dc00..6e81256cec5 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -867,9 +867,9 @@ fs_visitor::visit(ir_texture *ir)
assert(!ir->projector);
sampler = _mesa_get_sampler_uniform_value(ir->sampler,
- ctx->Shader.CurrentFragmentProgram,
- &brw->fragment_program->Base);
- sampler = c->fp->program.Base.SamplerUnits[sampler];
+ prog,
+ &fp->Base);
+ sampler = fp->Base.SamplerUnits[sampler];
/* The 965 requires the EU to do the normalization of GL rectangle
* texture coordinates. We use the program parameter state