OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nv50/ir: Replace NV50_PROGRAM_IR_* by PIPE_SHADER_IR_*

Browse Source 
Signed-off-by: Pierre Moreau <pierre.morrow@free.fr>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Pierre Moreau
2017-05-06 23:47:23 +02:00
committed by Ilia Mirkin
parent 8fe5949b08
commit 27ad060c6e
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
View File

@@ -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:

7
src/gallium/drivers/nouveau/codegen/nv50_ir_driver.h
View File

@@ -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;

2
src/gallium/drivers/nouveau/nouveau_compiler.c
View File

@@ -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;

4
src/gallium/drivers/nouveau/nv50/nv50_program.c
View File

@@ -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;

2
src/gallium/drivers/nouveau/nvc0/nvc0_program.c
View File

@@ -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