wined3d: Implement support for projective textures in ps 2.0 and later

Fabian Bieler der.fabe at gmx.net
Fri Mar 23 05:46:09 CDT 2007


This patch implements pojective textures in ps 2.0 and later through an 
undocumented opcode control.

This fixes the flashlight in the dx9 path of Half-Life 2.
-------------- next part --------------
From 1b033b41f93c96f5b4459bca031e56126a38e3b3 Mon Sep 17 00:00:00 2001
From: Fabian Bieler <der.fabe at gmx.net>
Date: Fri, 23 Mar 2007 11:42:22 +0100
Subject: [PATCH] wined3d: Implement support for projective textures in ps 2.0 and later

---
 dlls/wined3d/baseshader.c      |    3 +++
 dlls/wined3d/glsl_shader.c     |    8 ++++++--
 dlls/wined3d/wined3d_private.h |    1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index 3508835..39bd1c8 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
@@ -931,6 +931,9 @@ void shader_trace_init(
                             default:
                                 TRACE("_(%u)", op);
                         }
+                    } else if (curOpcode->opcode == WINED3DSIO_TEX &&
+                               This->baseShader.hex_version >= WINED3DPS_VERSION(2,0)) {
+                        if(opcode_token & D3DSI_TEXLD_PROJECTED) TRACE("p");
                     }
 
                     /* Destination token */
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 598f589..e6c97c5 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1472,8 +1472,12 @@ void pshader_glsl_tex(SHADER_OPCODE_ARG* arg) {
         }
     } else {
         sampler_idx = arg->src[1] & WINED3DSP_REGNUM_MASK;
-        /* TODO: Handle D3DSI_TEXLD_PROJECTED... */
-        projected = FALSE;
+        if(arg->opcode_token & D3DSI_TEXLD_PROJECTED) {
+                projected = TRUE;
+                mask = WINED3DSP_WRITEMASK_3;
+        } else {
+            projected = FALSE;
+        }
     }
 
     sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 74a6b42..646e896 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1532,6 +1532,7 @@ typedef struct SHADER_BUFFER {
 /* Undocumented opcode controls */
 #define INST_CONTROLS_SHIFT 16
 #define INST_CONTROLS_MASK 0x00ff0000
+#define D3DSI_TEXLD_PROJECTED 0x00010000
 
 typedef enum COMPARISON_TYPE {
     COMPARISON_GT = 1,
-- 
1.4.4.1



More information about the wine-patches mailing list