i965: Add HiZ operation state to brw_context

[mesa.git] / src / mesa / drivers / dri / i965 / brw_wm_pass0.c

diff --git a/src/mesa/drivers/dri/i965/brw_wm_pass0.c b/src/mesa/drivers/dri/i965/brw_wm_pass0.c
index 83152526b3ad61d319a795f709e869e51b9c199f..ccf9dc2bc18f899ac9cbe872b60f6f4ec3432509 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_wm_pass0.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_pass0.c
@@ -205,14 +205,14 @@ static const struct brw_wm_ref *pass0_get_reg( struct brw_wm_compile *c,
         case PROGRAM_CONSTANT:
            /* These are invarient:
             */
-           ref = get_const_ref(c, &plist->ParameterValues[idx][component]);
+           ref = get_const_ref(c, &plist->ParameterValues[idx][component].f);
            break;
 
         case PROGRAM_STATE_VAR:
         case PROGRAM_UNIFORM:
            /* These may change from run to run:
             */
-           ref = get_param_ref(c, &plist->ParameterValues[idx][component] );
+           ref = get_param_ref(c, &plist->ParameterValues[idx][component].f );
            break;
 
         default:
@@ -380,7 +380,7 @@ static void pass0_init_payload( struct brw_wm_compile *c )
    GLuint i;
 
    for (i = 0; i < 4; i++) {
-      GLuint j = i >= (c->key.nr_payload_regs + 1) / 2 ? 0 : i;
+      GLuint j = i >= (c->nr_payload_regs + 1) / 2 ? 0 : i;
       pass0_set_fpreg_value( c, PROGRAM_PAYLOAD, PAYLOAD_DEPTH, i, 
                             &c->payload.depth[j] );
    }