diff options
author | Ben Skeggs <[email protected]> | 2013-05-17 14:48:15 +1000 |
---|---|---|
committer | Ben Skeggs <[email protected]> | 2013-07-05 14:15:04 +1000 |
commit | c29c6b2b2e65f73c75c70daae1d2d32e53964120 (patch) | |
tree | c0a5ac09ce232dcfdce7c084a7a8f9d16aabcc26 /src/gallium/drivers/nvc0/codegen | |
parent | 4dbca8672bd357bb036dd40c4d8b8a4dc459abcb (diff) |
nvc0: enable very initial support for nvf0 (GK110)
Shaders need a lot of work still. Basic stuff generally works, so this
is basically just fine for gnome-shell, OA etc at this point.
Signed-off-by: Ben Skeggs <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nvc0/codegen')
-rw-r--r-- | src/gallium/drivers/nvc0/codegen/nv50_ir_emit_gk110.cpp | 62 | ||||
-rw-r--r-- | src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.cpp | 9 |
2 files changed, 66 insertions, 5 deletions
diff --git a/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_gk110.cpp b/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_gk110.cpp index bdf37ec5902..e752e90f55a 100644 --- a/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_gk110.cpp +++ b/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_gk110.cpp @@ -1144,13 +1144,45 @@ CodeEmitterGK110::emitPFETCH(const Instruction *i) void CodeEmitterGK110::emitVFETCH(const Instruction *i) { - emitNOP(i); // TODO + uint32_t offset = i->src(0).get()->reg.data.offset; + + code[0] = 0x00000002 | (offset << 23); + code[1] = 0x7ec00000 | (offset >> 9); + +#if 0 + if (i->perPatch) + code[0] |= 0x100; + if (i->getSrc(0)->reg.file == FILE_SHADER_OUTPUT) + code[0] |= 0x200; // yes, TCPs can read from *outputs* of other threads +#endif + + emitPredicate(i); + + defId(i->def(0), 2); + srcId(i->src(0).getIndirect(0), 10); + srcId(i->src(0).getIndirect(1), 32 + 10); // vertex address } void CodeEmitterGK110::emitEXPORT(const Instruction *i) { - emitNOP(i); // TODO + uint32_t offset = i->src(0).get()->reg.data.offset; + + code[0] = 0x00000002 | (offset << 23); + code[1] = 0x7f000000 | (offset >> 9); + +#if 0 + if (i->perPatch) + code[0] |= 0x100; +#endif + + emitPredicate(i); + + assert(i->src(1).getFile() == FILE_GPR); + + srcId(i->src(0).getIndirect(0), 10); + srcId(i->src(0).getIndirect(1), 32 + 10); // vertex base address + srcId(i->src(1), 2); } void @@ -1162,13 +1194,35 @@ CodeEmitterGK110::emitOUT(const Instruction *i) void CodeEmitterGK110::emitInterpMode(const Instruction *i) { - emitNOP(i); // TODO + code[1] |= i->ipa << 21; // TODO: INTERP_SAMPLEID } void CodeEmitterGK110::emitINTERP(const Instruction *i) { - emitNOP(i); // TODO + const uint32_t base = i->getSrc(0)->reg.data.offset; + + code[0] = 0x00000002 | (base << 31); + code[1] = 0x74800000 | (base >> 1); + + if (i->saturate) + code[1] |= 1 << 18; + + if (i->op == OP_PINTERP) + srcId(i->src(1), 23); + else + code[0] |= 0xff << 23; + + srcId(i->src(0).getIndirect(0), 10); + emitInterpMode(i); + + emitPredicate(i); + defId(i->def(0), 2); + + if (i->getSampleMode() == NV50_IR_INTERP_OFFSET) + srcId(i->src(i->op == OP_PINTERP ? 2 : 1), 32 + 10); + else + code[1] |= 0xff << 10; } void diff --git a/src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.cpp b/src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.cpp index 588baa8bc87..2dd7fd22aa4 100644 --- a/src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.cpp +++ b/src/gallium/drivers/nvc0/codegen/nv50_ir_target_nvc0.cpp @@ -351,7 +351,14 @@ TargetNVC0::isAccessSupported(DataFile file, DataType ty) const if (file == FILE_MEMORY_CONST && getChipset() >= 0xe0) // wrong encoding ? return typeSizeof(ty) <= 8; if (ty == TYPE_B96) - return (file == FILE_SHADER_INPUT) || (file == FILE_SHADER_OUTPUT); + return false; + if (getChipset() >= 0xf0) { + // XXX: find wide vfetch/export + if (ty == TYPE_B128) + return false; + if (ty == TYPE_U64) + return false; + } return true; } |