diff options
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir.cpp | 12 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir.h | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp index a4b46eb13f1..f811781756e 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp @@ -1233,17 +1233,11 @@ nv50_ir_generate_code(struct nv50_ir_prog_info *info) prog->optLevel = info->optLevel; switch (info->bin.sourceRep) { -#if 0 - case PIPE_IR_LLVM: - case PIPE_IR_GLSL: - return -1; - case PIPE_IR_SM4: - ret = prog->makeFromSM4(info) ? 0 : -2; + case NV50_PROGRAM_IR_TGSI: + ret = prog->makeFromTGSI(info) ? 0 : -2; break; - case PIPE_IR_TGSI: -#endif default: - ret = prog->makeFromTGSI(info) ? 0 : -2; + ret = -1; break; } if (ret < 0) diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h b/src/gallium/drivers/nouveau/codegen/nv50_ir.h index de6c1105368..5c09fed05c1 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h @@ -1253,7 +1253,6 @@ public: inline void add(Value *rval, int& id) { allRValues.insert(rval, id); } bool makeFromTGSI(struct nv50_ir_prog_info *); - bool makeFromSM4(struct nv50_ir_prog_info *); bool convertToSSA(); bool optimizeSSA(int level); bool optimizePostRA(int level); |