Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>
On Sat, May 6, 2017 at 5:47 PM, Pierre Moreau <pierre.mor...@free.fr> wrote: > This code was merged commented out, and has stayed that way ever since. > > Signed-off-by: Pierre Moreau <pierre.mor...@free.fr> > --- > src/gallium/drivers/nouveau/codegen/nv50_ir.cpp | 12 +++--------- > 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 a4b46eb13f..f811781756 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 de6c110536..5c09fed05c 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); > -- > 2.12.2 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev