wine-commits September 2007

wine-commits@winehq.org

7 participants
787 discussions

Vitaliy Margolen : dinput: Make default dead zone configurable.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: ac3668a0575d92bb8d1c47d4518e99e7d65b987e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3668a0575d92bb8d1c47d45… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Sep 24 19:34:38 2007 -0600 dinput: Make default dead zone configurable. --- dlls/dinput/joystick_linuxinput.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 37ae4a7..4b7b003 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -58,6 +58,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winreg.h" #include "dinput.h" #include "dinput_private.h" @@ -391,21 +392,35 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm JoystickImpl* newDevice; LPDIDATAFORMAT df = NULL; int i, idx = 0; + char buffer[MAX_PATH+16]; + HKEY hkey, appkey; + LONG def_deadzone = -1; newDevice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(JoystickImpl)); if (!newDevice) return NULL; - newDevice->base.lpVtbl = jvt; - newDevice->base.ref = 1; - memcpy(&newDevice->base.guid, rguid, sizeof(*rguid)); - InitializeCriticalSection(&newDevice->base.crit); - newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); - newDevice->joyfd = -1; - newDevice->base.dinput = dinput; - newDevice->joydev = &joydevs[index]; + newDevice->base.lpVtbl = jvt; + newDevice->base.ref = 1; + newDevice->base.guid = *rguid; + newDevice->base.dinput = dinput; + newDevice->joyfd = -1; + newDevice->joydev = &joydevs[index]; #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION - newDevice->ff_state = FF_STATUS_STOPPED; + newDevice->ff_state = FF_STATUS_STOPPED; #endif + InitializeCriticalSection(&newDevice->base.crit); + newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); + + /* get options */ + get_app_key(&hkey, &appkey); + + if (!get_config_key(hkey, appkey, "DefaultDeadZone", buffer, MAX_PATH)) + { + def_deadzone = atoi(buffer); + TRACE("setting default deadzone to: %d\n", def_deadzone); + } + if (appkey) RegCloseKey(appkey); + if (hkey) RegCloseKey(hkey); /* Create copy of default data format */ if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIJoystick2.dwSize))) goto failed; @@ -427,7 +442,8 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm newDevice->props[idx].lMin = 0; newDevice->props[idx].lMax = 0xffff; newDevice->props[idx].lSaturation = 0; - newDevice->props[idx].lDeadZone = MulDiv(newDevice->joydev->axes[i].flat, 0xffff, + newDevice->props[idx].lDeadZone = def_deadzone >= 0 ? def_deadzone : + MulDiv(newDevice->joydev->axes[i].flat, 0xffff, newDevice->props[idx].lDevMax - newDevice->props[idx].lDevMin); df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numAxes++) | DIDFT_ABSAXIS;

1 0

Vitaliy Margolen : dinput: Add a helper function to open configuration registry keys.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 8ff85c08b6bbf45b58fbbc1d374f5e1c051eda2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ff85c08b6bbf45b58fbbc1d3… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Sep 24 19:34:32 2007 -0600 dinput: Add a helper function to open configuration registry keys. --- dlls/dinput/device.c | 35 +++++++++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/joystick_linux.c | 21 ++------------------- 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d1c94fc..170d8fd 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -218,6 +218,41 @@ void _dump_DIDATAFORMAT(const DIDATAFORMAT *df) { } /****************************************************************************** + * Get the default and the app-specific config keys. + */ +BOOL get_app_key(HKEY *defkey, HKEY *appkey) +{ + char buffer[MAX_PATH+16]; + DWORD len; + + *appkey = 0; + + /* @@ Wine registry key: HKCU\Software\Wine\DirectInput */ + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\DirectInput", defkey)) + *defkey = 0; + + len = GetModuleFileNameA(0, buffer, MAX_PATH); + if (len && len < MAX_PATH) + { + HKEY tmpkey; + + /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\DirectInput */ + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey)) + { + char *p, *appname = buffer; + if ((p = strrchr(appname, '/'))) appname = p + 1; + if ((p = strrchr(appname, '\\'))) appname = p + 1; + strcat(appname, "\\DirectInput"); + + if (RegOpenKeyA(tmpkey, appname, appkey)) appkey = 0; + RegCloseKey(tmpkey); + } + } + + return *defkey || *appkey; +} + +/****************************************************************************** * Get a config key from either the app-specific or the default config */ DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index b855c1b..edd1f4b 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -72,6 +72,7 @@ struct IDirectInputDevice2AImpl DataFormat data_format; /* user data format and wine to user format converter */ }; +extern BOOL get_app_key(HKEY*, HKEY*); extern DWORD get_config_key(HKEY, HKEY, const char*, char*, DWORD); /* Routines to do DataFormat / WineFormat conversions */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 0f821de..000837d 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -269,28 +269,11 @@ static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN static HRESULT setup_dinput_options(JoystickImpl * device) { char buffer[MAX_PATH+16]; - HKEY hkey, appkey = 0; - DWORD len; + HKEY hkey, appkey; buffer[MAX_PATH]='\0'; - /* @@ Wine registry key: HKCU\Software\Wine\DirectInput */ - if (RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\DirectInput", &hkey)) hkey = 0; - - len = GetModuleFileNameA( 0, buffer, MAX_PATH ); - if (len && len < MAX_PATH) { - HKEY tmpkey; - /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\DirectInput */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey )) - { - char *p, *appname = buffer; - if ((p = strrchr( appname, '/' ))) appname = p + 1; - if ((p = strrchr( appname, '\\' ))) appname = p + 1; - strcat( appname, "\\DirectInput" ); - if (RegOpenKeyA( tmpkey, appname, &appkey )) appkey = 0; - RegCloseKey( tmpkey ); - } - } + get_app_key(&hkey, &appkey); /* get options */

1 0

Vitaliy Margolen : dinput: Move get_config_key to a common place.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 319097f563bcb610c2eb8a1d1b0e4448fd07f92b URL: http://source.winehq.org/git/wine.git/?a=commit;h=319097f563bcb610c2eb8a1d1… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Sep 24 19:34:27 2007 -0600 dinput: Move get_config_key to a common place. --- dlls/dinput/device.c | 16 ++++++++++++++++ dlls/dinput/device_private.h | 2 ++ dlls/dinput/joystick_linux.c | 16 ---------------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 10e31cd..d1c94fc 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -32,6 +32,7 @@ #include "wine/unicode.h" #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "winuser.h" #include "winerror.h" #include "dinput.h" @@ -216,6 +217,21 @@ void _dump_DIDATAFORMAT(const DIDATAFORMAT *df) { } } +/****************************************************************************** + * Get a config key from either the app-specific or the default config + */ +DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, + char *buffer, DWORD size ) +{ + if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) + return 0; + + if (defkey && !RegQueryValueExA( defkey, name, 0, NULL, (LPBYTE)buffer, &size )) + return 0; + + return ERROR_FILE_NOT_FOUND; +} + /* Conversion between internal data buffer and external data buffer */ void fill_DataFormat(void *out, const void *in, const DataFormat *df) { int i; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 6686577..b855c1b 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -72,6 +72,8 @@ struct IDirectInputDevice2AImpl DataFormat data_format; /* user data format and wine to user format converter */ }; +extern DWORD get_config_key(HKEY, HKEY, const char*, char*, DWORD); + /* Routines to do DataFormat / WineFormat conversions */ extern void fill_DataFormat(void *out, const void *in, const DataFormat *df) ; extern HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index e15e32e..0f821de 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -263,22 +263,6 @@ static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN } /* - * Get a config key from either the app-specific or the default config - */ - -static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, - char *buffer, DWORD size ) -{ - if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) - return 0; - - if (defkey && !RegQueryValueExA( defkey, name, 0, NULL, (LPBYTE)buffer, &size )) - return 0; - - return ERROR_FILE_NOT_FOUND; -} - -/* * Setup the dinput options. */

1 0

Dan Hipschman : widl: Clean up write_conf_or_var_desc with string_of_type.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: bb3275ce97c44346879ae8a2759d64f92af4e47a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3275ce97c44346879ae8a27… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Sep 24 19:17:46 2007 -0700 widl: Clean up write_conf_or_var_desc with string_of_type. --- tools/widl/typegen.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 288de10..06ebd4f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -575,7 +575,6 @@ static size_t write_conf_or_var_desc(FILE *file, const type_t *structure, const type_t *correlation_variable = NULL; unsigned char correlation_variable_type; unsigned char param_type = 0; - const char *param_type_string = NULL; size_t offset = 0; const var_t *var; @@ -602,46 +601,34 @@ static size_t write_conf_or_var_desc(FILE *file, const type_t *structure, case RPC_FC_CHAR: case RPC_FC_SMALL: param_type = RPC_FC_SMALL; - param_type_string = "FC_SMALL"; break; case RPC_FC_BYTE: case RPC_FC_USMALL: param_type = RPC_FC_USMALL; - param_type_string = "FC_USMALL"; break; case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_ENUM16: param_type = RPC_FC_SHORT; - param_type_string = "FC_SHORT"; break; case RPC_FC_USHORT: param_type = RPC_FC_USHORT; - param_type_string = "FC_USHORT"; break; case RPC_FC_LONG: case RPC_FC_ENUM32: param_type = RPC_FC_LONG; - param_type_string = "FC_LONG"; break; case RPC_FC_ULONG: param_type = RPC_FC_ULONG; - param_type_string = "FC_ULONG"; break; case RPC_FC_RP: case RPC_FC_UP: case RPC_FC_OP: case RPC_FC_FP: if (sizeof(void *) == 4) /* FIXME */ - { param_type = RPC_FC_LONG; - param_type_string = "FC_LONG"; - } else - { param_type = RPC_FC_HYPER; - param_type_string = "FC_HYPER"; - } break; default: error("write_conf_or_var_desc: conformance variable type not supported 0x%x\n", @@ -649,7 +636,7 @@ static size_t write_conf_or_var_desc(FILE *file, const type_t *structure, } print_file(file, 2, "0x%x, /* Corr desc: %s */\n", - RPC_FC_NORMAL_CONFORMANCE | param_type, param_type_string); + RPC_FC_NORMAL_CONFORMANCE | param_type, string_of_type(param_type)); print_file(file, 2, "0x%x, /* %s */\n", operator_type, operator_string); print_file(file, 2, "NdrFcShort(0x%x), /* offset = %d */\n", offset, offset);

1 0

Alexandre Julliard : ole32/tests: Remove test that tries to create a huge file on Windows.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 2b5376cbc1da8c83e2fe8392e9cdde52daca59f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5376cbc1da8c83e2fe8392e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 25 11:38:31 2007 +0200 ole32/tests: Remove test that tries to create a huge file on Windows. --- dlls/ole32/tests/storage32.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e6c3542..2349add 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -314,9 +314,6 @@ static void test_storage_stream(void) ok(r==S_OK, "failed to seek stream\n"); r = IStream_SetSize(stm,p); ok(r==S_OK, "failed to set pos\n"); - p.u.HighPart = 1; - r = IStream_SetSize(stm,p); - ok(r==STG_E_INVALIDFUNCTION, "setting to invalid pos should fail with STG_E_INVALIDFUNCTION instead of error 0x%08x\n", r); pos.QuadPart = 10; r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); ok(r==S_OK, "failed to seek stream\n");

1 0

Stefan Dösinger : wined3d: Add modifier handling to cnd in arb.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 84fc6ca3904a39b2723e7192e568157d7ed3b916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fc6ca3904a39b2723e7192e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 5 16:08:48 2007 +0200 wined3d: Add modifier handling to cnd in arb. --- dlls/wined3d/arb_program_shader.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6a19c73..2bb5448 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -824,13 +824,14 @@ void pshader_hw_cnd(SHADER_OPCODE_ARG* arg) { char dst_wmask[20]; char dst_name[50]; char src_name[3][50]; + BOOL sat = (arg->dst & WINED3DSP_DSTMOD_MASK) & WINED3DSPDM_SATURATE; + DWORD shift = (arg->dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; /* FIXME: support output modifiers */ /* Handle output register */ pshader_get_register_name(arg->dst, dst_name); shader_arb_get_write_mask(arg, arg->dst, dst_wmask); - strcat(dst_name, dst_wmask); /* Generate input register names (with modifiers) */ pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src_name[0]); @@ -840,11 +841,14 @@ void pshader_hw_cnd(SHADER_OPCODE_ARG* arg) { /* The coissue flag changes the semantic of the cnd instruction in <= 1.3 shaders */ if (shader->baseShader.hex_version <= WINED3DPS_VERSION(1, 3) && arg->opcode_token & WINED3DSI_COISSUE) { - shader_addline(buffer, "MOV %s, %s;\n", dst_name, src_name[1]); + shader_addline(buffer, "MOV%s %s%s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[1]); } else { shader_addline(buffer, "ADD TMP, -%s, coefdiv.x;\n", src_name[0]); - shader_addline(buffer, "CMP %s, TMP, %s, %s;\n", dst_name, src_name[1], src_name[2]); + shader_addline(buffer, "CMP%s %s%s, TMP, %s, %s;\n", + sat ? "_SAT" : "", dst_name, dst_wmask, src_name[1], src_name[2]); } + if (shift != 0) + pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); } void pshader_hw_cmp(SHADER_OPCODE_ARG* arg) {

1 0

Stefan Dösinger : wined3d: Implement WINED3DSI_TEXLD_BIAS in arb.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: c2c7b1df914dcb56114887f78ce6cf62f373ffd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c7b1df914dcb56114887f78… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 5 16:18:54 2007 +0200 wined3d: Implement WINED3DSI_TEXLD_BIAS in arb. --- dlls/wined3d/arb_program_shader.c | 34 +++++++++++++++++++++------------- 1 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fc543d6..6a19c73 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -486,7 +486,7 @@ static void vshader_program_add_param(SHADER_OPCODE_ARG *arg, const DWORD param, } } -static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const char *dst_str, const char *coord_reg, BOOL projected) { +static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const char *dst_str, const char *coord_reg, BOOL projected, BOOL bias) { SHADER_BUFFER* buffer = arg->buffer; DWORD sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; const char *tex_type; @@ -513,7 +513,12 @@ static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const ch tex_type = ""; } - if (projected) { + if (bias) { + /* Shouldn't be possible, but let's check for it */ + if(projected) FIXME("Biased and Projected texture sampling\n"); + /* TXB takes the 4th component of the source vector automatically, as d3d. Nothing more to do */ + shader_addline(buffer, "TXB %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); + } else if (projected) { shader_addline(buffer, "TXP %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); } else { shader_addline(buffer, "TEX %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); @@ -965,7 +970,7 @@ void pshader_hw_tex(SHADER_OPCODE_ARG* arg) { DWORD* src = arg->src; SHADER_BUFFER* buffer = arg->buffer; DWORD hex_version = This->baseShader.hex_version; - BOOL projected = FALSE; + BOOL projected = FALSE, bias = FALSE; char reg_dest[40]; char reg_coord[40]; @@ -1014,8 +1019,11 @@ void pshader_hw_tex(SHADER_OPCODE_ARG* arg) { if(arg->opcode_token & WINED3DSI_TEXLD_PROJECT) { projected = TRUE; } + if(arg->opcode_token & WINED3DSI_TEXLD_BIAS) { + bias = TRUE; + } } - shader_hw_sample(arg, reg_sampler_code, reg_dest, reg_coord, projected); + shader_hw_sample(arg, reg_sampler_code, reg_dest, reg_coord, projected, bias); } void pshader_hw_texcoord(SHADER_OPCODE_ARG* arg) { @@ -1054,7 +1062,7 @@ void pshader_hw_texreg2ar(SHADER_OPCODE_ARG* arg) { shader_addline(buffer, "MOV TMP.r, T%u.a;\n", reg2); shader_addline(buffer, "MOV TMP.g, T%u.r;\n", reg2); flags = reg1 < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg1][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(arg, reg1, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED); + shader_hw_sample(arg, reg1, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); } void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { @@ -1072,7 +1080,7 @@ void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { shader_addline(buffer, "MOV TMP.r, T%u.g;\n", reg2); shader_addline(buffer, "MOV TMP.g, T%u.b;\n", reg2); flags = reg1 < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg1][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(arg, reg1, dst_str, "TMP", FALSE); + shader_hw_sample(arg, reg1, dst_str, "TMP", FALSE, FALSE); } void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { @@ -1110,7 +1118,7 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { shader_addline(buffer, "ADD TMP.rg, TMP, %s;\n", reg_coord); } - shader_hw_sample(arg, reg_dest_code, reg_coord, "TMP", FALSE); + shader_hw_sample(arg, reg_dest_code, reg_coord, "TMP", FALSE, FALSE); } else { DWORD tf; if(reg_dest_code < MAX_TEXTURES) { @@ -1119,7 +1127,7 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { tf = 0; } /* Without a bump matrix loaded, just sample with the unmodified coordinates */ - shader_hw_sample(arg, reg_dest_code, reg_coord, reg_coord, tf & WINED3DTTFF_PROJECTED); + shader_hw_sample(arg, reg_dest_code, reg_coord, reg_coord, tf & WINED3DTTFF_PROJECTED, FALSE); } } @@ -1147,7 +1155,7 @@ void pshader_hw_texm3x2tex(SHADER_OPCODE_ARG* arg) { pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0_name); shader_addline(buffer, "DP3 TMP.y, T%u, %s;\n", reg, src0_name); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(arg, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED); + shader_hw_sample(arg, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); } void pshader_hw_texm3x3pad(SHADER_OPCODE_ARG* arg) { @@ -1180,7 +1188,7 @@ void pshader_hw_texm3x3tex(SHADER_OPCODE_ARG* arg) { /* Sample the texture using the calculated coordinates */ sprintf(dst_str, "T%u", reg); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(arg, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED); + shader_hw_sample(arg, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; } @@ -1216,7 +1224,7 @@ void pshader_hw_texm3x3vspec(SHADER_OPCODE_ARG* arg) { /* Sample the texture using the calculated coordinates */ sprintf(dst_str, "T%u", reg); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(arg, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED); + shader_hw_sample(arg, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; } @@ -1253,7 +1261,7 @@ void pshader_hw_texm3x3spec(SHADER_OPCODE_ARG* arg) { /* Sample the texture using the calculated coordinates */ sprintf(dst_str, "T%u", reg); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(arg, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED); + shader_hw_sample(arg, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; } @@ -1297,7 +1305,7 @@ void pshader_hw_texdp3tex(SHADER_OPCODE_ARG* arg) { shader_addline(buffer, "DP3 TMP.x, T%u, %s;\n", sampler_idx, src0); sprintf(dst_str, "T%u", sampler_idx); - shader_hw_sample(arg, sampler_idx, dst_str, "TMP", FALSE /* Only one coord, can't be projected */); + shader_hw_sample(arg, sampler_idx, dst_str, "TMP", FALSE /* Only one coord, can't be projected */, FALSE); } /** Process the WINED3DSIO_TEXDP3 instruction in ARB:

1 0

Stefan Dösinger : wined3d: Add support for some unimplemented instructions to arb shaders.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: 9531a108971f519a791b56137f52108f5fb81080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9531a108971f519a791b56137… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 25 01:00:27 2007 +0200 wined3d: Add support for some unimplemented instructions to arb shaders. --- dlls/wined3d/arb_program_shader.c | 78 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 8 ++-- dlls/wined3d/wined3d_private.h | 4 ++ 3 files changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d534bb5..fc543d6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1283,6 +1283,84 @@ void pshader_hw_texdepth(SHADER_OPCODE_ARG* arg) { shader_addline(buffer, "MAX result.depth, TMP.x, 0.0;\n", dst_name, dst_name); } +/** Process the WINED3DSIO_TEXDP3TEX instruction in ARB: + * Take a 3-component dot product of the TexCoord[dstreg] and src, + * then perform a 1D texture lookup from stage dstregnum, place into dst. */ +void pshader_hw_texdp3tex(SHADER_OPCODE_ARG* arg) { + SHADER_BUFFER* buffer = arg->buffer; + DWORD sampler_idx = arg->dst & WINED3DSP_REGNUM_MASK; + char src0[50]; + char dst_str[8]; + + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0); + shader_addline(buffer, "MOV TMP, 0.0;\n"); + shader_addline(buffer, "DP3 TMP.x, T%u, %s;\n", sampler_idx, src0); + + sprintf(dst_str, "T%u", sampler_idx); + shader_hw_sample(arg, sampler_idx, dst_str, "TMP", FALSE /* Only one coord, can't be projected */); +} + +/** Process the WINED3DSIO_TEXDP3 instruction in ARB: + * Take a 3-component dot product of the TexCoord[dstreg] and src. */ +void pshader_hw_texdp3(SHADER_OPCODE_ARG* arg) { + char src0[50]; + char dst_str[50]; + char dst_mask[6]; + DWORD dstreg = arg->dst & WINED3DSP_REGNUM_MASK; + SHADER_BUFFER* buffer = arg->buffer; + + /* Handle output register */ + pshader_get_register_name(arg->dst, dst_str); + shader_arb_get_write_mask(arg, arg->dst, dst_mask); + + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0); + shader_addline(buffer, "DP3 %s%s, T%u, %s;\n", dst_str, dst_mask, dstreg, src0); + + /* TODO: Handle output modifiers */ +} + +/** Process the WINED3DSIO_TEXM3X3 instruction in ARB + * Perform the 3rd row of a 3x3 matrix multiply */ +void pshader_hw_texm3x3(SHADER_OPCODE_ARG* arg) { + SHADER_BUFFER* buffer = arg->buffer; + char dst_str[50]; + char dst_mask[6]; + char src0[50]; + DWORD dst_reg = arg->dst & WINED3DSP_REGNUM_MASK; + + pshader_get_register_name(arg->dst, dst_str); + shader_arb_get_write_mask(arg, arg->dst, dst_mask); + + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0); + shader_addline(buffer, "DP3 TMP.z, T%u, %s;\n", dst_reg, src0); + shader_addline(buffer, "MOV %s%s, TMP;\n", dst_str, dst_mask); + + /* TODO: Handle output modifiers */ +} + +/** Process the WINED3DSIO_TEXM3X2DEPTH instruction in ARB: + * Last row of a 3x2 matrix multiply, use the result to calculate the depth: + * Calculate tmp0.y = TexCoord[dstreg] . src.xyz; (tmp0.x has already been calculated) + * depth = (tmp0.y == 0.0) ? 1.0 : tmp0.x / tmp0.y + */ +void pshader_hw_texm3x2depth(SHADER_OPCODE_ARG* arg) { + SHADER_BUFFER* buffer = arg->buffer; + DWORD dst_reg = arg->dst & WINED3DSP_REGNUM_MASK; + char src0[50]; + + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0); + shader_addline(buffer, "DP3 TMP.y, T%u, %s;\n", dst_reg, src0); + + /* How to deal with the special case dst_name.g == 0? if r != 0, then + * the r * (1 / 0) will give infinity, which is clamped to 1.0, the correct + * result. But if r = 0.0, then 0 * inf = 0, which is incorrect. + */ + shader_addline(buffer, "RCP TMP.y, TMP.y;\n"); + shader_addline(buffer, "MUL TMP.x, TMP.x, TMP.y;\n"); + shader_addline(buffer, "MIN TMP.x, TMP.x, one.r;\n"); + shader_addline(buffer, "MAX result.depth, TMP.x, 0.0;\n"); +} + /** Handles transforming all WINED3DSIO_M?x? opcodes for Vertex shaders to ARB_vertex_program codes */ void vshader_hw_mnxn(SHADER_OPCODE_ARG* arg) { diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 02704d1..24c025d 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -238,10 +238,10 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_TEXM3x3SPEC, "texm3x3spec", "undefined", 1, 3, pshader_hw_texm3x3spec, pshader_glsl_texm3x3spec, WINED3DPS_VERSION(1,0), WINED3DPS_VERSION(1,3)}, {WINED3DSIO_TEXM3x3VSPEC, "texm3x3vspec", "undefined", 1, 2, pshader_hw_texm3x3vspec, pshader_glsl_texm3x3vspec, WINED3DPS_VERSION(1,0), WINED3DPS_VERSION(1,3)}, {WINED3DSIO_TEXM3x3TEX, "texm3x3tex", "undefined", 1, 2, pshader_hw_texm3x3tex, pshader_glsl_texm3x3tex, WINED3DPS_VERSION(1,0), WINED3DPS_VERSION(1,3)}, - {WINED3DSIO_TEXDP3TEX, "texdp3tex", GLNAME_REQUIRE_GLSL, 1, 2, NULL, pshader_glsl_texdp3tex, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(1,3)}, - {WINED3DSIO_TEXM3x2DEPTH, "texm3x2depth", GLNAME_REQUIRE_GLSL, 1, 2, NULL, pshader_glsl_texm3x2depth, WINED3DPS_VERSION(1,3), WINED3DPS_VERSION(1,3)}, - {WINED3DSIO_TEXDP3, "texdp3", GLNAME_REQUIRE_GLSL, 1, 2, NULL, pshader_glsl_texdp3, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(1,3)}, - {WINED3DSIO_TEXM3x3, "texm3x3", GLNAME_REQUIRE_GLSL, 1, 2, NULL, pshader_glsl_texm3x3, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(1,3)}, + {WINED3DSIO_TEXDP3TEX, "texdp3tex", NULL, 1, 2, pshader_hw_texdp3tex, pshader_glsl_texdp3tex, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(1,3)}, + {WINED3DSIO_TEXM3x2DEPTH, "texm3x2depth", GLNAME_REQUIRE_GLSL, 1, 2, pshader_hw_texm3x2depth, pshader_glsl_texm3x2depth, WINED3DPS_VERSION(1,3), WINED3DPS_VERSION(1,3)}, + {WINED3DSIO_TEXDP3, "texdp3", NULL, 1, 2, pshader_hw_texdp3, pshader_glsl_texdp3, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(1,3)}, + {WINED3DSIO_TEXM3x3, "texm3x3", NULL, 1, 2, pshader_hw_texm3x3, pshader_glsl_texm3x3, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(1,3)}, {WINED3DSIO_TEXDEPTH, "texdepth", NULL, 1, 1, pshader_hw_texdepth, pshader_glsl_texdepth, WINED3DPS_VERSION(1,4), WINED3DPS_VERSION(1,4)}, {WINED3DSIO_BEM, "bem", "undefined", 1, 3, pshader_hw_bem, pshader_glsl_bem, WINED3DPS_VERSION(1,4), WINED3DPS_VERSION(1,4)}, {WINED3DSIO_DSX, "dsx", NULL, 1, 2, NULL, shader_glsl_map2gl, WINED3DPS_VERSION(2,1), -1}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 67edc0a..8844ffa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1782,6 +1782,10 @@ extern void pshader_hw_texm3x3spec(SHADER_OPCODE_ARG* arg); extern void pshader_hw_texm3x3vspec(SHADER_OPCODE_ARG* arg); extern void pshader_hw_texdepth(SHADER_OPCODE_ARG* arg); extern void pshader_hw_texkill(SHADER_OPCODE_ARG* arg); +extern void pshader_hw_texdp3tex(SHADER_OPCODE_ARG* arg); +extern void pshader_hw_texdp3(SHADER_OPCODE_ARG* arg); +extern void pshader_hw_texm3x3(SHADER_OPCODE_ARG* arg); +extern void pshader_hw_texm3x2depth(SHADER_OPCODE_ARG* arg); /* ARB vertex shader prototypes */ extern void vshader_hw_map2gl(SHADER_OPCODE_ARG* arg);

1 0

Stefan Dösinger : wined3d: Improve projected texture handling in arb.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: de534a41a41319cb9363733ac31ae5a2cf4662f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de534a41a41319cb9363733ac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 4 17:47:05 2007 +0200 wined3d: Improve projected texture handling in arb. --- dlls/wined3d/arb_program_shader.c | 77 ++++++++++++++++++++++++++++++------ 1 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3ceffe7..d534bb5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -486,10 +486,7 @@ static void vshader_program_add_param(SHADER_OPCODE_ARG *arg, const DWORD param, } } -static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const char *dst_str, const char *coord_reg, BOOL projective) { - IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; - +static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const char *dst_str, const char *coord_reg, BOOL projected) { SHADER_BUFFER* buffer = arg->buffer; DWORD sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; const char *tex_type; @@ -516,7 +513,7 @@ static void shader_hw_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const ch tex_type = ""; } - if (projective && deviceImpl->stateBlock->textureState[sampler_idx][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED) { + if (projected) { shader_addline(buffer, "TXP %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); } else { shader_addline(buffer, "TEX %s, %s, texture[%u], %s;\n", dst_str, coord_reg, sampler_idx, tex_type); @@ -962,11 +959,13 @@ void pshader_hw_texkill(SHADER_OPCODE_ARG* arg) { void pshader_hw_tex(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD dst = arg->dst; DWORD* src = arg->src; SHADER_BUFFER* buffer = arg->buffer; DWORD hex_version = This->baseShader.hex_version; + BOOL projected = FALSE; char reg_dest[40]; char reg_coord[40]; @@ -991,7 +990,32 @@ void pshader_hw_tex(SHADER_OPCODE_ARG* arg) { else reg_sampler_code = src[1] & WINED3DSP_REGNUM_MASK; - shader_hw_sample(arg, reg_sampler_code, reg_dest, reg_coord, TRUE); + /* projection flag: + * 1.1, 1.2, 1.3: Use WINED3DTSS_TEXTURETRANSFORMFLAGS + * 1.4: Use WINED3DSPSM_DZ or WINED3DSPSM_DW on src[0] + * 2.0+: Use WINED3DSI_TEXLD_PROJECT on the opcode + */ + if(hex_version < WINED3DPS_VERSION(1,4)) { + DWORD flags = 0; + if(reg_sampler_code < MAX_TEXTURES) { + flags = deviceImpl->stateBlock->textureState[reg_sampler_code][WINED3DTSS_TEXTURETRANSFORMFLAGS]; + } + if (flags & WINED3DTTFF_PROJECTED) { + projected = TRUE; + } + } else if(hex_version < WINED3DPS_VERSION(2,0)) { + DWORD src_mod = arg->src[0] & WINED3DSP_SRCMOD_MASK; + if (src_mod == WINED3DSPSM_DZ) { + projected = TRUE; + } else if(src_mod == WINED3DSPSM_DW) { + projected = TRUE; + } + } else { + if(arg->opcode_token & WINED3DSI_TEXLD_PROJECT) { + projected = TRUE; + } + } + shader_hw_sample(arg, reg_sampler_code, reg_dest, reg_coord, projected); } void pshader_hw_texcoord(SHADER_OPCODE_ARG* arg) { @@ -1018,6 +1042,9 @@ void pshader_hw_texcoord(SHADER_OPCODE_ARG* arg) { void pshader_hw_texreg2ar(SHADER_OPCODE_ARG* arg) { SHADER_BUFFER* buffer = arg->buffer; + IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; + DWORD flags; DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; DWORD reg2 = arg->src[0] & WINED3DSP_REGNUM_MASK; @@ -1026,12 +1053,16 @@ void pshader_hw_texreg2ar(SHADER_OPCODE_ARG* arg) { sprintf(dst_str, "T%u", reg1); shader_addline(buffer, "MOV TMP.r, T%u.a;\n", reg2); shader_addline(buffer, "MOV TMP.g, T%u.r;\n", reg2); - shader_hw_sample(arg, reg1, dst_str, "TMP", TRUE); + flags = reg1 < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg1][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; + shader_hw_sample(arg, reg1, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED); } void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { SHADER_BUFFER* buffer = arg->buffer; + IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; + DWORD flags; DWORD reg1 = arg->dst & WINED3DSP_REGNUM_MASK; DWORD reg2 = arg->src[0] & WINED3DSP_REGNUM_MASK; @@ -1040,7 +1071,8 @@ void pshader_hw_texreg2gb(SHADER_OPCODE_ARG* arg) { sprintf(dst_str, "T%u", reg1); shader_addline(buffer, "MOV TMP.r, T%u.g;\n", reg2); shader_addline(buffer, "MOV TMP.g, T%u.b;\n", reg2); - shader_hw_sample(arg, reg1, dst_str, "TMP", TRUE); + flags = reg1 < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg1][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; + shader_hw_sample(arg, reg1, dst_str, "TMP", FALSE); } void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { @@ -1080,8 +1112,14 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { shader_hw_sample(arg, reg_dest_code, reg_coord, "TMP", FALSE); } else { + DWORD tf; + if(reg_dest_code < MAX_TEXTURES) { + tf = ((IWineD3DDeviceImpl*) This->baseShader.device)->stateBlock->textureState[reg_dest_code][WINED3DTSS_TEXTURETRANSFORMFLAGS]; + } else { + tf = 0; + } /* Without a bump matrix loaded, just sample with the unmodified coordinates */ - shader_hw_sample(arg, reg_dest_code, reg_coord, reg_coord, TRUE); + shader_hw_sample(arg, reg_dest_code, reg_coord, reg_coord, tf & WINED3DTTFF_PROJECTED); } } @@ -1097,6 +1135,9 @@ void pshader_hw_texm3x2pad(SHADER_OPCODE_ARG* arg) { void pshader_hw_texm3x2tex(SHADER_OPCODE_ARG* arg) { + IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; + DWORD flags; DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; SHADER_BUFFER* buffer = arg->buffer; char dst_str[8]; @@ -1105,7 +1146,8 @@ void pshader_hw_texm3x2tex(SHADER_OPCODE_ARG* arg) { sprintf(dst_str, "T%u", reg); pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0_name); shader_addline(buffer, "DP3 TMP.y, T%u, %s;\n", reg, src0_name); - shader_hw_sample(arg, reg, dst_str, "TMP", TRUE); + flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; + shader_hw_sample(arg, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED); } void pshader_hw_texm3x3pad(SHADER_OPCODE_ARG* arg) { @@ -1124,6 +1166,8 @@ void pshader_hw_texm3x3pad(SHADER_OPCODE_ARG* arg) { void pshader_hw_texm3x3tex(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; + DWORD flags; DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; SHADER_BUFFER* buffer = arg->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; @@ -1135,13 +1179,16 @@ void pshader_hw_texm3x3tex(SHADER_OPCODE_ARG* arg) { /* Sample the texture using the calculated coordinates */ sprintf(dst_str, "T%u", reg); - shader_hw_sample(arg, reg, dst_str, "TMP", TRUE); + flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; + shader_hw_sample(arg, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED); current_state->current_row = 0; } void pshader_hw_texm3x3vspec(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; + DWORD flags; DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; SHADER_BUFFER* buffer = arg->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; @@ -1168,13 +1215,16 @@ void pshader_hw_texm3x3vspec(SHADER_OPCODE_ARG* arg) { /* Sample the texture using the calculated coordinates */ sprintf(dst_str, "T%u", reg); - shader_hw_sample(arg, reg, dst_str, "TMP", TRUE); + flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; + shader_hw_sample(arg, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED); current_state->current_row = 0; } void pshader_hw_texm3x3spec(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; + DWORD flags; DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; DWORD reg3 = arg->src[1] & WINED3DSP_REGNUM_MASK; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; @@ -1202,7 +1252,8 @@ void pshader_hw_texm3x3spec(SHADER_OPCODE_ARG* arg) { /* Sample the texture using the calculated coordinates */ sprintf(dst_str, "T%u", reg); - shader_hw_sample(arg, reg, dst_str, "TMP", TRUE); + flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; + shader_hw_sample(arg, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED); current_state->current_row = 0; }

1 0

Stefan Dösinger : wined3d: Put V8U8 back into the UNKNOWN format group.
by Alexandre Julliard 25 Sep '07

25 Sep '07

Module: wine Branch: master Commit: bf9cc30aacf84798422b2ba2862a889d2128f403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9cc30aacf84798422b2ba28… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 24 16:16:31 2007 +0200 wined3d: Put V8U8 back into the UNKNOWN format group. --- dlls/wined3d/arb_program_shader.c | 7 ++++++- dlls/wined3d/utils.c | 33 ++++++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4d404d6..3ceffe7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -598,10 +598,15 @@ static void shader_arb_color_correction(SHADER_OPCODE_ARG* arg) { case WINED3DFMT_V16U16: if(GL_SUPPORT(NV_TEXTURE_SHADER) || (GL_SUPPORT(ATI_ENVMAP_BUMPMAP) && fmt == WINED3DFMT_V8U8)) { - /* The 3rd channel returns 1.0 in d3d, but 0.0 in gl. Fix this while we're at it :-) */ +#if 0 + /* The 3rd channel returns 1.0 in d3d, but 0.0 in gl. Fix this while we're at it :-) + * disabled until an application that needs it is found because it causes unneeded + * shader recompilation in some game + */ if(strlen(writemask) >= 4) { shader_addline(arg->buffer, "MOV %s.%c, one.z;\n", reg, writemask[3]); } +#endif } else { /* Correct the sign, but leave the blue as it is - it was loaded correctly already * ARB shaders are a bit picky wrt writemasks and swizzles. If we're free to scale diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4765ae5..bd1d7d3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -230,18 +230,33 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) gl_info->gl_formats[dst].conversion_group= WINED3DFMT_UNKNOWN; } - /* V8U8 and V16U16 are always tidied up in the pixel shader - blue is set to 1.0. - * They can't be switched with other formats, but they can be switched with each other, - * except if GL_ATI_envmap_bumpmap is supported. In this case, V8U8 uses the gl native format, - * but V16U16 is converted. + /* V8U8 is supported natively by GL_ATI_envmap_bumpmap and GL_NV_texture_shader. + * V16U16 is only supported by GL_NV_texture_shader. The formats need fixup if + * their extensions are not available. + * + * In theory, V8U8 and V16U16 need a fixup of the undefined blue channel. OpenGL + * returns 0.0 when sampling from it, DirectX 1.0. This is disabled until we find + * an application that needs this because it causes performance problems due to + * shader recompiling in some games. */ - dst = getFmtIdx(WINED3DFMT_V8U8); - gl_info->gl_formats[dst].conversion_group = WINED3DFMT_V8U8; - dst = getFmtIdx(WINED3DFMT_V16U16); - if(!GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + if(!GL_SUPPORT(ATI_ENVMAP_BUMPMAP) && !GL_SUPPORT(NV_TEXTURE_SHADER2)) { + /* signed -> unsigned fixup */ + dst = getFmtIdx(WINED3DFMT_V8U8); gl_info->gl_formats[dst].conversion_group = WINED3DFMT_V8U8; - } else { + dst = getFmtIdx(WINED3DFMT_V16U16); + gl_info->gl_formats[dst].conversion_group = WINED3DFMT_V8U8; + } else if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + /* signed -> unsigned fixup */ + dst = getFmtIdx(WINED3DFMT_V16U16); gl_info->gl_formats[dst].conversion_group = WINED3DFMT_V16U16; + } else { + /* Blue = 1.0 fixup, disabled for now */ +#if 0 + dst = getFmtIdx(WINED3DFMT_V8U8); + gl_info->gl_formats[dst].conversion_group = WINED3DFMT_V8U8; + dst = getFmtIdx(WINED3DFMT_V16U16); + gl_info->gl_formats[dst].conversion_group = WINED3DFMT_V8U8; +#endif } if(!GL_SUPPORT(NV_TEXTURE_SHADER)) {

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2007