summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-08-29 13:21:07 -0700
committerEric Anholt <eric@anholt.net>2009-08-29 13:29:38 -0700
commit09549704c6579aae2506891d4e9d1c258eab95db (patch)
treec057d3da84aed09120a8a639ec5fefbdceb84eea
parentc9adb4c9cb7a750134fea3ab096fe8c5bd2ac09f (diff)
downloadexternal_mesa3d-09549704c6579aae2506891d4e9d1c258eab95db.zip
external_mesa3d-09549704c6579aae2506891d4e9d1c258eab95db.tar.gz
external_mesa3d-09549704c6579aae2506891d4e9d1c258eab95db.tar.bz2
i965: Support PROGRAM_ENV_PARAMs in brw_vs_emit.c
-rw-r--r--src/mesa/drivers/dri/i965/brw_curbe.c3
-rw-r--r--src/mesa/drivers/dri/i965/brw_vs_emit.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c
index a1a6c53..0b0e693 100644
--- a/src/mesa/drivers/dri/i965/brw_curbe.c
+++ b/src/mesa/drivers/dri/i965/brw_curbe.c
@@ -248,6 +248,9 @@ static void prepare_constant_buffer(struct brw_context *brw)
GLuint offset = brw->curbe.vs_start * 16;
GLuint nr = brw->vs.prog_data->nr_params / 4;
+ /* Updates the ParamaterValues[i] pointers for all parameters of the
+ * basic type of PROGRAM_STATE_VAR.
+ */
_mesa_load_state_parameters(ctx, vp->program.Base.Parameters);
/* XXX just use a memcpy here */
diff --git a/src/mesa/drivers/dri/i965/brw_vs_emit.c b/src/mesa/drivers/dri/i965/brw_vs_emit.c
index 83167b9..108e19c 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_emit.c
@@ -911,6 +911,7 @@ get_src_reg( struct brw_vs_compile *c,
case PROGRAM_STATE_VAR:
case PROGRAM_CONSTANT:
case PROGRAM_UNIFORM:
+ case PROGRAM_ENV_PARAM:
if (c->vp->use_const_buffer) {
return get_constant(c, inst, argIndex);
}
@@ -930,7 +931,6 @@ get_src_reg( struct brw_vs_compile *c,
return brw_null_reg();
case PROGRAM_LOCAL_PARAM:
- case PROGRAM_ENV_PARAM:
case PROGRAM_WRITE_ONLY:
default:
assert(0);