ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dcompiler: Get rid of the BWRITER_COMPARISON_TYPE typedef.

This commit is contained in:
Henri Verbeet 2013-09-30 09:40:43 +02:00 committed by Alexandre Julliard
parent c174a993b0
commit 1b6e9d245c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/d3dcompiler_43/asmparser.c
View File

@ -501,11 +501,10 @@ static void asmparser_texreg2rgb(struct asm_parser *This, DWORD mod, DWORD shift
* go through asmparser_instr). * go through asmparser_instr).
*/ */
static void asmparser_instr(struct asm_parser *This, DWORD opcode, static void asmparser_instr(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift,
DWORD mod, DWORD shift, enum bwriter_comparison_type comp, const struct shader_reg *dst,
BWRITER_COMPARISON_TYPE comp, const struct src_regs *srcs, int expectednsrcs)
const struct shader_reg *dst, {
const struct src_regs *srcs, int expectednsrcs) {
struct instruction *instr; struct instruction *instr;
unsigned int i; unsigned int i;
BOOL firstreg = TRUE; BOOL firstreg = TRUE;

2
dlls/d3dcompiler_43/asmshader.y
View File

@ -92,7 +92,7 @@ int asmshader_lex(void);
DWORD mod; DWORD mod;
DWORD shift; DWORD shift;
} modshift; } modshift;
BWRITER_COMPARISON_TYPE comptype; enum bwriter_comparison_type comptype;
struct { struct {
DWORD dclusage; DWORD dclusage;
unsigned int regnum; unsigned int regnum;

13
dlls/d3dcompiler_43/d3dcompiler_private.h
View File

@ -54,7 +54,8 @@ enum shader_type
ST_PIXEL ST_PIXEL
}; };
typedef enum BWRITER_COMPARISON_TYPE { enum bwriter_comparison_type
{
BWRITER_COMPARISON_NONE, BWRITER_COMPARISON_NONE,
BWRITER_COMPARISON_GT, BWRITER_COMPARISON_GT,
BWRITER_COMPARISON_EQ, BWRITER_COMPARISON_EQ,
@ -62,7 +63,7 @@ typedef enum BWRITER_COMPARISON_TYPE {
BWRITER_COMPARISON_LT, BWRITER_COMPARISON_LT,
BWRITER_COMPARISON_NE, BWRITER_COMPARISON_NE,
BWRITER_COMPARISON_LE BWRITER_COMPARISON_LE
} BWRITER_COMPARISON_TYPE; };
struct constant { struct constant {
DWORD regnum; DWORD regnum;
@ -89,7 +90,7 @@ struct instruction {
DWORD opcode; DWORD opcode;
DWORD dstmod; DWORD dstmod;
DWORD shift; DWORD shift;
BWRITER_COMPARISON_TYPE comptype; enum bwriter_comparison_type comptype;
BOOL has_dst; BOOL has_dst;
struct shader_reg dst; struct shader_reg dst;
struct shader_reg *src; struct shader_reg *src;
@ -215,9 +216,9 @@ struct asmparser_backend {
void (*end)(struct asm_parser *This); void (*end)(struct asm_parser *This);
void (*instr)(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift, void (*instr)(struct asm_parser *parser, DWORD opcode, DWORD mod, DWORD shift,
BWRITER_COMPARISON_TYPE comp, const struct shader_reg *dst, enum bwriter_comparison_type comp, const struct shader_reg *dst,
const struct src_regs *srcs, int expectednsrcs); const struct src_regs *srcs, int expectednsrcs);
}; };
struct instruction *alloc_instr(unsigned int srcs) DECLSPEC_HIDDEN; struct instruction *alloc_instr(unsigned int srcs) DECLSPEC_HIDDEN;