Fabian Bieler : wined3d: Implement support for projective textures in
ps 2. 0 and later.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Mar 29 14:43:34 CDT 2007
Module: wine
Branch: master
Commit: 333de16fb6c7feff63914a50d9b8ce226836064a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=333de16fb6c7feff63914a50d9b8ce226836064a
Author: Fabian Bieler <der.fabe at gmx.net>
Date: Thu Mar 29 18:44:57 2007 +0200
wined3d: Implement support for projective textures in ps 2.0 and later.
---
dlls/wined3d/baseshader.c | 3 +++
dlls/wined3d/glsl_shader.c | 9 +++++++--
dlls/wined3d/wined3d_private_types.h | 3 +++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index 3446570..f4230d7 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
@@ -941,6 +941,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 & WINED3DSI_TEXLD_PROJECT) TRACE("p");
}
/* Destination token */
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 2508eaa..707c325 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1472,8 +1472,13 @@ 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 & WINED3DSI_TEXLD_PROJECT) {
+ /* ps 2.0 texldp instruction always divides by the fourth component. */
+ 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_types.h b/dlls/wined3d/wined3d_private_types.h
index 01f5d26..3550910 100644
--- a/dlls/wined3d/wined3d_private_types.h
+++ b/dlls/wined3d/wined3d_private_types.h
@@ -291,6 +291,9 @@ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE {
#define WINED3DSHADER_INSTRUCTION_PREDICATED (1 << 28)
+/* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */
+#define WINED3DSI_TEXLD_PROJECT 0x00010000
+
/** Shader version tokens, and shader end tokens **/
#define WINED3DPS_VERSION(major, minor) (0xFFFF0000 | ((major) << 8) | (minor))
More information about the wine-cvs
mailing list