i965/fs: Fix up for 8752764076e5b3f052a57e0134424a37bf2e9164.
I failed to commit and squash before pushing.
diff --git a/src/mesa/drivers/dri/i965/brw_fs_emit.cpp b/src/mesa/drivers/dri/i965/brw_fs_emit.cpp
index 8958aeb..6b7c434 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 @@
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 1445582..6e81256 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 @@
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