summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r600/r700_vertprog.c
diff options
context:
space:
mode:
authorAndre Maasikas <amaasikas@gmail.com>2009-12-04 16:36:41 +0200
committerAndre Maasikas <amaasikas@gmail.com>2009-12-08 15:39:39 +0200
commit50ab51101e4c5e64ab92c260c324fb66a98851a8 (patch)
treea405eb43013a74d06c6296da44cc508e708da5a4 /src/mesa/drivers/dri/r600/r700_vertprog.c
parent94723b60cf3dd838dfaf505450db8ef2e089399c (diff)
r600: glsl - allow specifying texture sampler via uniforms
looks kinda hackish, should rethink later
Diffstat (limited to 'src/mesa/drivers/dri/r600/r700_vertprog.c')
-rw-r--r--src/mesa/drivers/dri/r600/r700_vertprog.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_vertprog.c b/src/mesa/drivers/dri/r600/r700_vertprog.c
index d3d1da7959..759b74dc7e 100644
--- a/src/mesa/drivers/dri/r600/r700_vertprog.c
+++ b/src/mesa/drivers/dri/r600/r700_vertprog.c
@@ -337,6 +337,10 @@ struct r700_vertex_program* r700TranslateVertexShader(GLcontext *ctx,
InitShaderProgram(&(vp->r700AsmCode));
+ for(i=0; i < MAX_SAMPLERS; i++)
+ {
+ vp->r700AsmCode.SamplerUnits[i] = vp->mesa_program->Base.SamplerUnits[i];
+ }
if(GL_FALSE == AssembleInstr(0,
vp->mesa_program->Base.NumInstructions,
&(vp->mesa_program->Base.Instructions[0]),