Stefan Dösinger : wined3d: Make the MAC ARBvp implementation happy about ARL.
Alexandre Julliard
julliard at winehq.org
Thu Jul 24 07:09:04 CDT 2008
Module: wine
Branch: master
Commit: 5a6b4e9f476237dc8b69cb84156f3a9dc2d69d8a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6b4e9f476237dc8b69cb84156f3a9dc2d69d8a
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Thu Jul 17 15:58:23 2008 -0500
wined3d: Make the MAC ARBvp implementation happy about ARL.
---
dlls/wined3d/arb_program_shader.c | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 22a8b55..2de05bf 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -1718,15 +1718,30 @@ void vshader_hw_map2gl(SHADER_OPCODE_ARG* arg) {
unsigned int i;
if ((curOpcode->opcode == WINED3DSIO_MOV && dst_regtype == WINED3DSPR_ADDR) || curOpcode->opcode == WINED3DSIO_MOVA) {
+ memset(tmpLine, 0, sizeof(tmpLine));
if(shader->rel_offset) {
- memset(tmpLine, 0, sizeof(tmpLine));
vshader_program_add_param(arg, src[0], TRUE, tmpLine);
shader_addline(buffer, "ADD TMP.x, %s, helper_const.z;\n", tmpLine);
shader_addline(buffer, "ARL A0.x, TMP.x;\n");
- return;
} else {
- strcpy(tmpLine, "ARL");
+ /* Apple's ARB_vertex_program implementation does not accept an ARL source argument
+ * with more than one component. Thus replicate the first source argument over all
+ * 4 components. For example, .xyzw -> .x (or better: .xxxx), .zwxy -> .z, etc)
+ */
+ DWORD parm = src[0] & ~(WINED3DVS_SWIZZLE_MASK);
+ if((src[0] & WINED3DVS_X_W) == WINED3DVS_X_W) {
+ parm |= WINED3DVS_X_W | WINED3DVS_Y_W | WINED3DVS_Z_W | WINED3DVS_W_W;
+ } else if((src[0] & WINED3DVS_X_Z) == WINED3DVS_X_Z) {
+ parm |= WINED3DVS_X_Z | WINED3DVS_Y_Z | WINED3DVS_Z_Z | WINED3DVS_W_Z;
+ } else if((src[0] & WINED3DVS_X_Y) == WINED3DVS_X_Y) {
+ parm |= WINED3DVS_X_Y | WINED3DVS_Y_Y | WINED3DVS_Z_Y | WINED3DVS_W_Y;
+ } else if((src[0] & WINED3DVS_X_X) == WINED3DVS_X_X) {
+ parm |= WINED3DVS_X_X | WINED3DVS_Y_X | WINED3DVS_Z_X | WINED3DVS_W_X;
+ }
+ vshader_program_add_param(arg, parm, TRUE, tmpLine);
+ shader_addline(buffer, "ARL A0.x, %s;\n", tmpLine);
}
+ return;
} else
strcpy(tmpLine, curOpcode->glname);
More information about the wine-cvs
mailing list