diff options
| author | Pierre Moreau <pierre.morrow@free.fr> | 2017-05-06 23:47:23 +0200 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2017-05-07 10:26:37 -0400 |
| commit | 27ad060c6e69a408ce903f1dfbaaa6fa82c080a7 (patch) | |
| tree | fa28277061414fcfe45ec84fd8a7cbdccd66746b | |
| parent | 8fe5949b081e45af504518b6675cc955e32f95f0 (diff) | |
nv50/ir: Replace NV50_PROGRAM_IR_* by PIPE_SHADER_IR_*
Signed-off-by: Pierre Moreau <pierre.morrow@free.fr>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
5 files changed, 7 insertions, 10 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp index f811781756..a000bcbd32 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.cpp @@ -1233,7 +1233,7 @@ nv50_ir_generate_code(struct nv50_ir_prog_info *info) prog->optLevel = info->optLevel; switch (info->bin.sourceRep) { - case NV50_PROGRAM_IR_TGSI: + case PIPE_SHADER_IR_TGSI: ret = prog->makeFromTGSI(info) ? 0 : -2; break; default: diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h index e7d840df00..1962ead35a 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h @@ -54,11 +54,6 @@ struct nv50_ir_varying ubyte si; /* TGSI semantic index */ }; -#define NV50_PROGRAM_IR_TGSI 0 -#define NV50_PROGRAM_IR_SM4 1 -#define NV50_PROGRAM_IR_GLSL 2 -#define NV50_PROGRAM_IR_LLVM 3 - #ifdef DEBUG # define NV50_IR_DEBUG_BASIC (1 << 0) # define NV50_IR_DEBUG_VERBOSE (2 << 0) @@ -95,7 +90,7 @@ struct nv50_ir_prog_info uint32_t *code; uint32_t codeSize; uint32_t instructions; - uint8_t sourceRep; /* NV50_PROGRAM_IR */ + uint8_t sourceRep; /* PIPE_SHADER_IR_* */ const void *source; void *relocData; void *fixupData; diff --git a/src/gallium/drivers/nouveau/nouveau_compiler.c b/src/gallium/drivers/nouveau/nouveau_compiler.c index d8009f5bfe..3151a6f420 100644 --- a/src/gallium/drivers/nouveau/nouveau_compiler.c +++ b/src/gallium/drivers/nouveau/nouveau_compiler.c @@ -109,7 +109,7 @@ nouveau_codegen(int chipset, int type, struct tgsi_token tokens[], info.type = type; info.target = chipset; - info.bin.sourceRep = NV50_PROGRAM_IR_TGSI; + info.bin.sourceRep = PIPE_SHADER_IR_TGSI; info.bin.source = tokens; info.io.auxCBSlot = 15; diff --git a/src/gallium/drivers/nouveau/nv50/nv50_program.c b/src/gallium/drivers/nouveau/nv50/nv50_program.c index 76d06aeddf..92e73f8c12 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_program.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_program.c @@ -20,6 +20,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "pipe/p_defines.h" + #include "nv50/nv50_program.h" #include "nv50/nv50_context.h" @@ -331,7 +333,7 @@ nv50_program_translate(struct nv50_program *prog, uint16_t chipset, info->type = prog->type; info->target = chipset; - info->bin.sourceRep = NV50_PROGRAM_IR_TGSI; + info->bin.sourceRep = PIPE_SHADER_IR_TGSI; info->bin.source = (void *)prog->pipe.tokens; info->io.auxCBSlot = 15; diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c index 6cc518309c..27740bc87f 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c @@ -567,7 +567,7 @@ nvc0_program_translate(struct nvc0_program *prog, uint16_t chipset, info->type = prog->type; info->target = chipset; - info->bin.sourceRep = NV50_PROGRAM_IR_TGSI; + info->bin.sourceRep = PIPE_SHADER_IR_TGSI; info->bin.source = (void *)prog->pipe.tokens; #ifdef DEBUG |