diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-19 17:00:19 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-19 17:00:19 +0800 |
| commit | e01ee3da577f177e77153f3a33d39e13f5e3f9cb (patch) | |
| tree | 14bcfd5a30a5b24b22a9b773b4ba6211e50e8958 /src/mesa/drivers/dri/nouveau | |
| parent | fd1b1fce3faaf40af201a5b06a84df62c855fb12 (diff) | |
| parent | 77544d7b7d7c6fd03c0df81dca07f1bb3a67c119 (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
Diffstat (limited to 'src/mesa/drivers/dri/nouveau')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_shader_0.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_shader_0.c b/src/mesa/drivers/dri/nouveau/nouveau_shader_0.c index 73c1f7c2a5..211483dc02 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_shader_0.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_shader_0.c @@ -263,6 +263,23 @@ pass0_make_mask(GLuint mesa_mask) return mask; } +static GLboolean +pass0_opcode_is_tex(enum prog_opcode op) +{ + switch (op) { + case OPCODE_TEX: + case OPCODE_TXB: + case OPCODE_TXD: + case OPCODE_TXL: + case OPCODE_TXP: + return GL_TRUE; + default: + break; + } + + return GL_FALSE; +} + static nvsTexTarget pass0_make_tex_target(GLuint mesa) { @@ -721,7 +738,11 @@ pass0_translate_arith(nouveauShader *nvs, struct gl_program *prog, (inst->SaturateMode != SATURATE_OFF), src[0], src[1], src[2]); nvsinst->tex_unit = inst->TexSrcUnit; - nvsinst->tex_target = pass0_make_tex_target(inst->TexSrcTarget); + if (pass0_opcode_is_tex(inst->Opcode)) + nvsinst->tex_target = + pass0_make_tex_target(inst->TexSrcTarget); + else + nvsinst->tex_target = NVS_TEX_TARGET_UNKNOWN; ret = GL_TRUE; } else |