diff options
author | Ilia Mirkin <[email protected]> | 2014-01-10 22:17:04 -0500 |
---|---|---|
committer | Maarten Lankhorst <[email protected]> | 2014-01-27 16:40:42 +0100 |
commit | 45b7f1701e4c4d0e3c5a2863fe90686daa6524ce (patch) | |
tree | d19c910cf95bb2c9736ca6ea0c7c93189ada9d0c /src/gallium/drivers/nouveau | |
parent | 42dc414cc6306a51d6b290e72e687b0ad82d5830 (diff) |
nv50/ir: disallow shader input + cbuf in same instruction in gp
Signed-off-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nouveau')
-rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp index c27d4532e5a..ecf5d1c70a2 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp @@ -300,11 +300,16 @@ TargetNV50::insnCanLoad(const Instruction *i, int s, case 0x01: case 0x03: case 0x08: - case 0x09: case 0x0c: case 0x20: case 0x21: break; + case 0x09: + // Shader inputs get transformed to p[] in geometry shaders, and those + // aren't allowed to be used at the same time as c[]. + if (ld->bb->getProgram()->getType() == Program::TYPE_GEOMETRY) + return false; + break; case 0x0d: if (ld->bb->getProgram()->getType() != Program::TYPE_GEOMETRY) return false; |