diff options
| author | Andre Maasikas <amaasikas@gmail.com> | 2009-12-04 16:36:41 +0200 |
|---|---|---|
| committer | Andre Maasikas <amaasikas@gmail.com> | 2009-12-08 15:39:39 +0200 |
| commit | 50ab51101e4c5e64ab92c260c324fb66a98851a8 (patch) | |
| tree | a405eb43013a74d06c6296da44cc508e708da5a4 /src/mesa/drivers/dri/r600/r700_fragprog.c | |
| parent | 94723b60cf3dd838dfaf505450db8ef2e089399c (diff) | |
r600: glsl - allow specifying texture sampler via uniforms
looks kinda hackish, should rethink later
Diffstat (limited to 'src/mesa/drivers/dri/r600/r700_fragprog.c')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_fragprog.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_fragprog.c b/src/mesa/drivers/dri/r600/r700_fragprog.c index 0cb9707ee6..8eb439a951 100644 --- a/src/mesa/drivers/dri/r600/r700_fragprog.c +++ b/src/mesa/drivers/dri/r600/r700_fragprog.c @@ -308,6 +308,7 @@ GLboolean r700TranslateFragmentShader(struct r700_fragment_program *fp, GLuint number_of_colors_exported; GLboolean z_enabled = GL_FALSE; GLuint unBit; + int i; //Init_Program Init_r700_AssemblerBase( SPT_FP, &(fp->r700AsmCode), &(fp->r700Shader) ); @@ -320,6 +321,10 @@ GLboolean r700TranslateFragmentShader(struct r700_fragment_program *fp, InitShaderProgram(&(fp->r700AsmCode)); + for(i=0; i < MAX_SAMPLERS; i++) + { + fp->r700AsmCode.SamplerUnits[i] = fp->mesa_program.Base.SamplerUnits[i]; + } if( GL_FALSE == AssembleInstr(0, mesa_fp->Base.NumInstructions, &(mesa_fp->Base.Instructions[0]), |