summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2015-11-07 00:41:05 -0500
committerIlia Mirkin <imirkin@alum.mit.edu>2015-11-07 00:42:15 -0500
commit8e9ade7eb3582fc541700ade1d232a329da890b0 (patch)
treea552add5423b0f058a582e70bec75b528c78dc8c /src
parent393d0c336bc766a123e139ae85383663f81e00d1 (diff)
downloadexternal_mesa3d-8e9ade7eb3582fc541700ade1d232a329da890b0.zip
external_mesa3d-8e9ade7eb3582fc541700ade1d232a329da890b0.tar.gz
external_mesa3d-8e9ade7eb3582fc541700ade1d232a329da890b0.tar.bz2
nv50/ir: allow emission of immediates in imul/imad ops
Nothing actually uses this yet (due to complications), but the emission logic is right. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp
index ee115b5..7e0fb53 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nv50.cpp
@@ -1125,7 +1125,10 @@ CodeEmitterNV50::emitIMUL(const Instruction *i)
if (i->encSize == 8) {
code[1] = (i->sType == TYPE_S16) ? (0x8000 | 0x4000) : 0x0000;
- emitForm_MAD(i);
+ if (i->src(1).getFile() == FILE_IMMEDIATE)
+ emitForm_IMM(i);
+ else
+ emitForm_MAD(i);
} else {
if (i->sType == TYPE_S16)
code[0] |= 0x8100;
@@ -1199,7 +1202,10 @@ CodeEmitterNV50::emitIMAD(const Instruction *i)
code[1] |= neg1 << 27;
code[1] |= neg2 << 26;
- emitForm_MAD(i);
+ if (i->src(1).getFile() == FILE_IMMEDIATE)
+ emitForm_IMM(i);
+ else
+ emitForm_MAD(i);
if (i->flagsSrc >= 0) {
// add with carry from $cX