d3dx9_36: Simplify instr_ps_1_0123_texld.

Gerald Pfeifer gerald at pfeifer.com
Sat Aug 21 04:33:07 CDT 2010


I'm submitting this based on confirmation by Matteo Bruni who agreed
to drop the WARN, cf.
http://www.winehq.org/pipermail/wine-devel/2010-August/086011.html

Gerald

---
 dlls/d3dx9_36/bytecodewriter.c |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c
index 07f96e7..e7bd8a5 100644
--- a/dlls/d3dx9_36/bytecodewriter.c
+++ b/dlls/d3dx9_36/bytecodewriter.c
@@ -1035,7 +1035,7 @@ static const struct bytecode_backend vs_1_x_backend = {
 static void instr_ps_1_0123_texld(struct bc_writer *This,
                                   const struct instruction *instr,
                                   struct bytecode_buffer *buffer) {
-    DWORD idx, srcidx;
+    DWORD idx;
     struct shader_reg reg;
     DWORD swizzlemask;
 
@@ -1074,17 +1074,6 @@ static void instr_ps_1_0123_texld(struct bc_writer *This,
         /* map the temp dstreg to the ps_1_3 texture temporary register */
         This->funcs->dstreg(This, &instr->dst, buffer, instr->shift, instr->dstmod);
     } else if(instr->src[0].type == BWRITERSPR_TEMP) {
-        if(instr->src[0].regnum == T0_REG) {
-            srcidx = 0;
-        } else if(instr->src[0].regnum == T1_REG) {
-            srcidx = 1;
-        } else if(instr->src[0].regnum == T2_REG) {
-            srcidx = 2;
-        } else if(instr->src[0].regnum == T3_REG) {
-            srcidx = 3;
-        } else {
-            WARN("Invalid address data source register r%u\n", instr->src[0].regnum);
-        }
 
         swizzlemask = (3 << BWRITERVS_SWIZZLE_SHIFT) |
             (3 << (BWRITERVS_SWIZZLE_SHIFT + 2)) |
-- 
1.6.6.2



More information about the wine-patches mailing list