Mesa (master): i965/fs: Fix up for 8752764076e5b3f052a57e0134424a37bf2e9164 .

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 0653c450cc8da1212e1123a1cd6635c02f7d6919
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0653c450cc8da1212e1123a1cd6635c02f7d6919

Author: Eric Anholt <eric at anholt.net>
Date:   Fri May 27 09:50:34 2011 -0700

i965/fs: Fix up for 8752764076e5b3f052a57e0134424a37bf2e9164.

I failed to commit and squash before pushing.

---

 src/mesa/drivers/dri/i965/brw_fs_emit.cpp    |    2 +-
 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp |    6 +++---
 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 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 @@ 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 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 @@ 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