Module: wine Branch: master Commit: ac8f8c02a6ab7118f0ad3e6c752a7601ab22773d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8f8c02a6ab7118f0ad3e6c75...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Oct 15 14:35:15 2010 +0200
d3dcompiler: Remove some stray tabs.
---
dlls/d3dcompiler_43/asmparser.c | 13 +++++++------ dlls/d3dcompiler_43/asmshader.y | 2 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index 8d65d04..789bdb5 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -161,8 +161,9 @@ static void asmparser_dcl_input_ps_2(struct asm_parser *This, DWORD usage, DWORD } }
-static void asmparser_dcl_input_unsupported(struct asm_parser *This, DWORD usage, DWORD num, - DWORD mod, const struct shader_reg *reg) { +static void asmparser_dcl_input_unsupported(struct asm_parser *This, + DWORD usage, DWORD num, DWORD mod, const struct shader_reg *reg) +{ asmparser_message(This, "Line %u: Input declaration unsupported in this shader version\n", This->line_no); set_parse_status(This, PARSE_ERR); } @@ -185,9 +186,9 @@ static void asmparser_dcl_sampler(struct asm_parser *This, DWORD samptype, } }
-static void asmparser_dcl_sampler_unsupported(struct asm_parser *This, DWORD samptype, - DWORD mod, DWORD regnum, - unsigned int line_no) { +static void asmparser_dcl_sampler_unsupported(struct asm_parser *This, + DWORD samptype, DWORD mod, DWORD regnum, unsigned int line_no) +{ asmparser_message(This, "Line %u: Sampler declaration unsupported in this shader version\n", This->line_no); set_parse_status(This, PARSE_ERR); } @@ -538,7 +539,7 @@ ns */ return; } /* Use the default handling */ - break; + break; case BWRITERSIO_TEXCOORD: /* texcoord/texcrd are two instructions present only in PS <= 1.3 and PS 1.4 respectively */ if(This->shader->version == BWRITERPS_VERSION(1, 4)) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index 5dc0914..4360d9f 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -1053,7 +1053,7 @@ dreg_name: REG_TEMP } | REG_CONSTINT { - asmparser_message(&asm_ctx, "Line %u: Register i%u is not a valid destination register\n", + asmparser_message(&asm_ctx, "Line %u: Register i%u is not a valid destination register\n", asm_ctx.line_no, $1); set_parse_status(&asm_ctx, PARSE_WARN); } diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index a5121fb..9584bd9 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -290,7 +290,7 @@ typedef void (*instr_writer)(struct bc_writer *This,
struct bytecode_backend { void (*header)(struct bc_writer *This, const struct bwriter_shader *shader, - struct bytecode_buffer *buffer); + struct bytecode_buffer *buffer); void (*end)(struct bc_writer *This, const struct bwriter_shader *shader, struct bytecode_buffer *buffer); void (*srcreg)(struct bc_writer *This, const struct shader_reg *reg,