aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorChristoph Bumiller <[email protected]>2014-02-07 22:39:44 +0100
committerChristoph Bumiller <[email protected]>2014-02-07 22:53:36 +0100
commitb7233acf782a39c7e5643cb303022360664b6046 (patch)
tree1a274cc9ec33042da69261748af01478739c32f5 /src/gallium
parent0c14c5c62a1b4648381c05f024db730e4a0f90c5 (diff)
nvc0/ir/emit: hardcode vertex output stream to 0 for now
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
index 96a4af4262e..f15ca1b057d 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
@@ -1488,8 +1488,13 @@ CodeEmitterNVC0::emitOUT(const Instruction *i)
// vertex stream
if (i->src(1).getFile() == FILE_IMMEDIATE) {
- code[1] |= 0xc000;
- code[0] |= SDATA(i->src(1)).u32 << 26;
+ // Using immediate encoding here triggers an invalid opcode error
+ // or random results when error reporting is disabled.
+ // TODO: figure this out when we get multiple vertex streams
+ assert(SDATA(i->src(1)).u32 == 0);
+ srcId(NULL, 26);
+ // code[1] |= 0xc000;
+ // code[0] |= SDATA(i->src(1)).u32 << 26;
} else {
srcId(i->src(1), 26);
}