[PATCH 5/5] d3dcompiler: Get rid of the BWRITER_COMPARISON_TYPE typedef.
Henri Verbeet
hverbeet at codeweavers.com
Mon Sep 30 02:40:43 CDT 2013
---
dlls/d3dcompiler_43/asmparser.c | 9 ++++-----
dlls/d3dcompiler_43/asmshader.y | 2 +-
dlls/d3dcompiler_43/d3dcompiler_private.h | 13 +++++++------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c
index c57343f..2d167de 100644
--- a/dlls/d3dcompiler_43/asmparser.c
+++ b/dlls/d3dcompiler_43/asmparser.c
@@ -501,11 +501,10 @@ static void asmparser_texreg2rgb(struct asm_parser *This, DWORD mod, DWORD shift
* go through asmparser_instr).
*/
-static void asmparser_instr(struct asm_parser *This, DWORD opcode,
- DWORD mod, DWORD shift,
- BWRITER_COMPARISON_TYPE comp,
- const struct shader_reg *dst,
- const struct src_regs *srcs, int expectednsrcs) {
+static void asmparser_instr(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift,
+ enum bwriter_comparison_type comp, const struct shader_reg *dst,
+ const struct src_regs *srcs, int expectednsrcs)
+{
struct instruction *instr;
unsigned int i;
BOOL firstreg = TRUE;
diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y
index 4109745..c0e0793 100644
--- a/dlls/d3dcompiler_43/asmshader.y
+++ b/dlls/d3dcompiler_43/asmshader.y
@@ -92,7 +92,7 @@ int asmshader_lex(void);
DWORD mod;
DWORD shift;
} modshift;
- BWRITER_COMPARISON_TYPE comptype;
+ enum bwriter_comparison_type comptype;
struct {
DWORD dclusage;
unsigned int regnum;
diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h
index d25b4e5..3489162 100644
--- a/dlls/d3dcompiler_43/d3dcompiler_private.h
+++ b/dlls/d3dcompiler_43/d3dcompiler_private.h
@@ -54,7 +54,8 @@ enum shader_type
ST_PIXEL
};
-typedef enum BWRITER_COMPARISON_TYPE {
+enum bwriter_comparison_type
+{
BWRITER_COMPARISON_NONE,
BWRITER_COMPARISON_GT,
BWRITER_COMPARISON_EQ,
@@ -62,7 +63,7 @@ typedef enum BWRITER_COMPARISON_TYPE {
BWRITER_COMPARISON_LT,
BWRITER_COMPARISON_NE,
BWRITER_COMPARISON_LE
-} BWRITER_COMPARISON_TYPE;
+};
struct constant {
DWORD regnum;
@@ -89,7 +90,7 @@ struct instruction {
DWORD opcode;
DWORD dstmod;
DWORD shift;
- BWRITER_COMPARISON_TYPE comptype;
+ enum bwriter_comparison_type comptype;
BOOL has_dst;
struct shader_reg dst;
struct shader_reg *src;
@@ -215,9 +216,9 @@ struct asmparser_backend {
void (*end)(struct asm_parser *This);
- void (*instr)(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift,
- BWRITER_COMPARISON_TYPE comp, const struct shader_reg *dst,
- const struct src_regs *srcs, int expectednsrcs);
+ void (*instr)(struct asm_parser *parser, DWORD opcode, DWORD mod, DWORD shift,
+ enum bwriter_comparison_type comp, const struct shader_reg *dst,
+ const struct src_regs *srcs, int expectednsrcs);
};
struct instruction *alloc_instr(unsigned int srcs) DECLSPEC_HIDDEN;
--
1.7.10.4
More information about the wine-patches
mailing list