August 2008 - Wine-commits - list.winehq.org

Paul Vriens : quartz/tests: Use CreateFileA instead of CreateFileW to please win9x.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 5bef4b05dd00f17bc28dc9d75096c7a0f09597b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bef4b05dd00f17bc28dc9d75… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 28 08:55:43 2008 +0200 quartz/tests: Use CreateFileA instead of CreateFileW to please win9x. --- dlls/quartz/tests/filtergraph.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e39097b..0867d27 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -27,6 +27,7 @@ #include "dshow.h" #include "control.h" +static const CHAR fileA[] = "test.avi"; static const WCHAR file[] = {'t','e','s','t','.','a','v','i',0}; IGraphBuilder* pgraph; @@ -143,7 +144,7 @@ static void test_render_run(void) if (!createfiltergraph()) return; - h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + h = CreateFileA(fileA, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (h != INVALID_HANDLE_VALUE) { CloseHandle(h); renderfile();

1 0

Lei Zhang : regedit: Fix typo in commit c6d01ac847edc2ad02ef02c7a0ead7a833539c3c.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: faf9c55eb8fe296b508476a20f1899ce4c645409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf9c55eb8fe296b508476a20… Author: Lei Zhang <thestig(a)google.com> Date: Wed Aug 27 15:00:53 2008 -0700 regedit: Fix typo in commit c6d01ac847edc2ad02ef02c7a0ead7a833539c3c. --- programs/regedit/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 1091d8d..3186a37 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -549,7 +549,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCTSTR keyPath, LPCTSTR highli errCode = RegEnumValueW(hKey, index, valName, &valNameLen, NULL, &valType, valBuf, &valSize); if (errCode != ERROR_SUCCESS) goto done; valBuf[valSize] = 0; - if (valName && highlightValueW && lstrcmpW(valName, highlightValueW)) + if (valName && highlightValueW && !lstrcmpW(valName, highlightValueW)) bSelected = TRUE; AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize, bSelected); }

1 0

Stefan Dösinger : wined3d: Silence some format spam.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: ec4955630e9eebc2ac6706786d949f2f60279266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4955630e9eebc2ac6706786… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 25 09:25:24 2008 -0500 wined3d: Silence some format spam. --- dlls/ddraw/ddraw.c | 3 ++- dlls/wined3d/directx.c | 14 ++++++++++++++ dlls/wined3d/utils.c | 7 ++++++- include/wine/wined3d_types.h | 2 ++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 73982ed..436846c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -880,8 +880,9 @@ IDirectDrawImpl_GetFourCCCodes(IDirectDraw7 *iface, { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); WINED3DFORMAT formats[] = { - WINED3DFMT_YUY2, WINED3DFMT_UYVY, + WINED3DFMT_YUY2, WINED3DFMT_UYVY, WINED3DFMT_YV12, WINED3DFMT_DXT1, WINED3DFMT_DXT2, WINED3DFMT_DXT3, WINED3DFMT_DXT4, WINED3DFMT_DXT5, + WINED3DFMT_ATI2N, WINED3DFMT_NVHU, WINED3DFMT_NVHS }; DWORD count = 0, i, outsize; HRESULT hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 53ea543..d269406 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2323,6 +2323,9 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINE } TRACE_(d3d_caps)("[FAILED]\n"); return FALSE; + case WINED3DFMT_YV12: + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; /* Not supported */ case WINED3DFMT_A16B16G16R16: @@ -2397,6 +2400,17 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINE TRACE_(d3d_caps)("[FAILED]\n"); return FALSE; + case WINED3DFMT_NVHU: + case WINED3DFMT_NVHS: + /* These formats seem to be similar to the HILO formats in GL_NV_texture_shader. NVHU + * is said to be GL_UNSIGNED_HILO16, NVHS GL_SIGNED_HILO16. Rumours say that d3d computes + * a 3rd channel similarly to D3DFMT_CxV8U8(So NVHS could be called D3DFMT_CxV16U16). + * ATI refused to support formats which can easilly be emulated with pixel shaders, so + * Applications have to deal with not having NVHS and NVHU. + */ + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; + case WINED3DFMT_UNKNOWN: return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 119f526..c0e1ccf 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -44,7 +44,7 @@ static const StaticPixelFormatDesc formats[] = { /* FourCC formats, kept here to have WINED3DFMT_R8G8B8(=20) at position 20 */ {WINED3DFMT_UYVY ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,0 ,0 ,TRUE }, {WINED3DFMT_YUY2 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,0 ,0 ,TRUE }, - {WINED3DFMT_YV12 ,0x0 ,0x0 ,0x0 ,0x0 ,1/*?*/ ,0 ,0 ,TRUE }, + {WINED3DFMT_YV12 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,0 ,0 ,TRUE }, {WINED3DFMT_DXT1 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,0 ,0 ,TRUE }, {WINED3DFMT_DXT2 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,0 ,0 ,TRUE }, {WINED3DFMT_DXT3 ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,0 ,0 ,TRUE }, @@ -114,6 +114,8 @@ static const StaticPixelFormatDesc formats[] = { {WINED3DFMT_Q16W16V16U16,0x0 ,0x0 ,0x0 ,0x0 ,8 ,0 ,0 ,FALSE }, /* Vendor-specific formats */ {WINED3DFMT_ATI2N ,0x0 ,0x0 ,0x0 ,0x0 ,1 ,0 ,0 ,TRUE }, + {WINED3DFMT_NVHU ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,0 ,0 ,TRUE }, + {WINED3DFMT_NVHS ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,0 ,0 ,TRUE }, }; typedef struct { @@ -528,6 +530,7 @@ const char* debug_d3dformat(WINED3DFORMAT fmt) { FMT_TO_STR(WINED3DFMT_A2W10V10U10); FMT_TO_STR(WINED3DFMT_UYVY); FMT_TO_STR(WINED3DFMT_YUY2); + FMT_TO_STR(WINED3DFMT_YV12); FMT_TO_STR(WINED3DFMT_DXT1); FMT_TO_STR(WINED3DFMT_DXT2); FMT_TO_STR(WINED3DFMT_DXT3); @@ -558,6 +561,8 @@ const char* debug_d3dformat(WINED3DFORMAT fmt) { FMT_TO_STR(WINED3DFMT_A32B32G32R32F); FMT_TO_STR(WINED3DFMT_CxV8U8); FMT_TO_STR(WINED3DFMT_ATI2N); + FMT_TO_STR(WINED3DFMT_NVHU); + FMT_TO_STR(WINED3DFMT_NVHS); #undef FMT_TO_STR default: { diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index bf35b9f..5b722e7 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -305,6 +305,8 @@ typedef enum _WINED3DFORMAT { /* Vendor specific formats */ WINED3DFMT_ATI2N = WINEMAKEFOURCC('A', 'T', 'I', '2'), + WINED3DFMT_NVHU = WINEMAKEFOURCC('N', 'V', 'H', 'U'), + WINED3DFMT_NVHS = WINEMAKEFOURCC('N', 'V', 'H', 'S'), WINED3DFMT_FORCE_DWORD = 0xFFFFFFFF } WINED3DFORMAT;

1 0

Stefan Dösinger : wined3d: Handle projected textures properly in arbfp and atifs.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: af8d268a39207a1180feca79e0f402f604ee9734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8d268a39207a1180feca79e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Aug 23 15:41:51 2008 -0500 wined3d: Handle projected textures properly in arbfp and atifs. GL_ARB_fragment_program and GL_ATI_fragment_shader can disable projected textures properly, and they can also handle D3DTTFF_PROJECTED | D3DTTFF_COUNT3 properly. --- dlls/wined3d/arb_program_shader.c | 24 ++++++++++--- dlls/wined3d/ati_fragment_shader.c | 32 ++++++++++++------ dlls/wined3d/glsl_shader.c | 5 ++- dlls/wined3d/nvidia_texture_shader.c | 6 ++- dlls/wined3d/state.c | 7 +++- dlls/wined3d/utils.c | 59 ++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 3 +- 7 files changed, 86 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af8d268a39207a1180fec…

1 0

Paul Vriens : oleaut32/tests: Skip some tests on win9x.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 1cfb958a2e68a0a65cc8939138769cede0fc7a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cfb958a2e68a0a65cc893913… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 27 21:23:21 2008 +0200 oleaut32/tests: Skip some tests on win9x. --- dlls/oleaut32/tests/typelib.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 868470d..23bc85d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -585,6 +585,7 @@ static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, LPCWSTR base, BOOL WCHAR buf[128]; HKEY hkey; BOOL ret = TRUE; + DWORD res; memcpy(buf, typelibW, sizeof(typelibW)); StringFromGUID2(uid, buf + lstrlenW(buf), 40); @@ -597,8 +598,16 @@ static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, LPCWSTR base, BOOL wsprintfW(buf + lstrlenW(buf), formatW, maj, min ); - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, buf, 0, NULL, 0, - KEY_WRITE, NULL, &hkey, NULL) != ERROR_SUCCESS) + SetLastError(0xdeadbeef); + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, buf, 0, NULL, 0, + KEY_WRITE, NULL, &hkey, NULL); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("W-calls are not implemented\n"); + return FALSE; + } + + if (res != ERROR_SUCCESS) { trace("RegCreateKeyExW failed\n"); return FALSE;

1 0

Paul Vriens : rpcrt4/tests: Skip ok check for win9x.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 00662a190d3ab589a0a63b14898e12d647578e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00662a190d3ab589a0a63b148… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Aug 28 08:23:24 2008 +0200 rpcrt4/tests: Skip ok check for win9x. --- dlls/rpcrt4/tests/server.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 0bf84d5..78a8bff 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1295,7 +1295,10 @@ server(void) iptcp_status = RpcServerUseProtseqEp(iptcp, 20, port, NULL); ok(iptcp_status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_ip_tcp) failed with status %ld\n", iptcp_status); np_status = RpcServerUseProtseqEp(np, 0, pipe, NULL); - ok(np_status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_np) failed with status %ld\n", np_status); + if (np_status == RPC_S_PROTSEQ_NOT_SUPPORTED) + skip("Protocol sequence ncacn_np is not supported\n"); + else + ok(np_status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_np) failed with status %ld\n", np_status); pRpcServerRegisterIfEx = (void *)GetProcAddress(GetModuleHandle("rpcrt4.dll"), "RpcServerRegisterIfEx"); if (pRpcServerRegisterIfEx)

1 0

Stefan Dösinger : wined3d: Remove BaseTexture:: UnBindTexture.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 750973cec5140cad410b8f5ab4341e151a000e1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=750973cec5140cad410b8f5ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 13:31:39 2008 -0500 wined3d: Remove BaseTexture::UnBindTexture. --- dlls/wined3d/basetexture.c | 21 --------------------- dlls/wined3d/cubetexture.c | 7 ------- dlls/wined3d/texture.c | 7 ------- dlls/wined3d/volumetexture.c | 7 ------- dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d_interface.h | 8 -------- 6 files changed, 0 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=750973cec5140cad410b8…

1 0

Stefan Dösinger : wined3d: Remove some more junk code.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: a580325a47abe42e078978aaf79a5efc7a575d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a580325a47abe42e078978aaf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 13:33:11 2008 -0500 wined3d: Remove some more junk code. --- dlls/wined3d/device.c | 10 ---------- dlls/wined3d/pixelshader.c | 8 -------- dlls/wined3d/state.c | 22 ---------------------- dlls/wined3d/vertexshader.c | 18 ------------------ 4 files changed, 0 insertions(+), 58 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a569e96..e199ad1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2172,10 +2172,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR ENTER_GL(); -#if 0 - IWineD3DImpl_CheckGraphicsMemory(); -#endif - { /* Set a default viewport */ WINED3DVIEWPORT vp; vp.X = 0; @@ -7589,12 +7585,6 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW This->stateBlock->streamSource[streamNumber] = 0; } } -#if 0 /* TODO: Manage internal tracking properly so that 'this shouldn't happen' */ - else { /* This shouldn't happen */ - FIXME("Calling application has released the device before relasing all the resources bound to the device\n"); - } -#endif - } } break; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 3a55df7..29cd368 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -34,14 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define GLINFO_LOCATION ((IWineD3DDeviceImpl *) This->baseShader.device)->adapter->gl_info -#if 0 /* Must not be 1 in cvs version */ -# define PSTRACE(A) TRACE A -# define TRACE_VSVECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w) -#else -# define PSTRACE(A) -# define TRACE_VSVECTOR(name) -#endif - #define GLNAME_REQUIRE_GLSL ((const char *)1) static HRESULT WINAPI IWineD3DPixelShaderImpl_QueryInterface(IWineD3DPixelShader *iface, REFIID riid, LPVOID *ppobj) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 22b0e7b..c53f398 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4185,28 +4185,6 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte } } -#if 0 /* FOG ----------------------------------------------*/ - if (sd->u.s.fog.lpData || sd->u.s.fog.VBO) { - /* TODO: fog*/ - if (GL_SUPPORT(EXT_FOG_COORD) { - glEnableClientState(GL_FOG_COORDINATE_EXT); - (GL_EXTCALL)(FogCoordPointerEXT)( - WINED3D_ATR_GLTYPE(sd->u.s.fog.dwType), - sd->u.s.fog.dwStride, - sd->u.s.fog.lpData + stateblock->loadBaseVertexIndex * sd->u.s.fog.dwStride); - } else { - /* don't bother falling back to 'slow' as we don't support software FOG yet. */ - /* FIXME: fixme once */ - TRACE("Hardware support for FOG is not avaiable, FOG disabled.\n"); - } - } else { - if (GL_SUPPRT(EXT_FOR_COORD) { - /* make sure fog is disabled */ - glDisableClientState(GL_FOG_COORDINATE_EXT); - } - } -#endif - /* Point Size ----------------------------------------------*/ if (sd->u.s.pSize.lpData || sd->u.s.pSize.VBO) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 5fab988..928b97d 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -34,24 +34,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define GLINFO_LOCATION ((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info -/* Shader debugging - Change the following line to enable debugging of software - vertex shaders */ -#if 0 /* Musxt not be 1 in cvs version */ -# define VSTRACE(A) TRACE A -# define TRACE_VSVECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w) -#else -# define VSTRACE(A) -# define TRACE_VSVECTOR(name) -#endif - -/** - * NVIDIA: DX8 Vertex Shader to NV Vertex Program - * http://developer.nvidia.com/view.asp?IO=vstovp - * - * NVIDIA: Memory Management with VAR - * http://developer.nvidia.com/view.asp?IO=var_memory_management - */ - /* TODO: Vertex and Pixel shaders are almost identical, the only exception being the way that some of the data is looked up or the availability of some of the data i.e. some instructions are only valid for pshaders and some for vshaders because of this the bulk of the software pipeline can be shared between pixel and vertex shaders... and it wouldn't surprise me if the program can be cross compiled using a large body of shared code */

1 0

Stefan Dösinger : wined3d: Replace a #if 0 with if(0).
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 4635315655661ae9d7d463b09146b6546efa6b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4635315655661ae9d7d463b09… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 13:38:14 2008 -0500 wined3d: Replace a #if 0 with if(0). --- dlls/wined3d/utils.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 3cce302..119f526 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -375,12 +375,12 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) 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(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; + } } if(!GL_SUPPORT(NV_TEXTURE_SHADER)) {

1 0

Stefan Dösinger : wined3d: Handle projected+bump mapped textures in atifs.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: acc893c5cf52fde43b90e6001d9a1cf8f4944c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc893c5cf52fde43b90e6001… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 13:47:41 2008 -0500 wined3d: Handle projected+bump mapped textures in atifs. --- dlls/wined3d/ati_fragment_shader.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 667a95c..7707a2a 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -312,11 +312,16 @@ static GLuint gen_ati_shader(struct texture_stage_op op[MAX_TEXTURES], WineD3D_G GL_EXTCALL(glSampleMapATI(GL_REG_0_ATI + stage, GL_TEXTURE0_ARB + stage, GL_SWIZZLE_STR_ATI)); - TRACE("glPassTexCoordATI(GL_REG_%d_ATI, GL_TEXTURE_%d_ARB, GL_SWIZZLE_STR_ATI)\n", - stage + 1, stage + 1); + if(op[stage + 1].projected == proj_none) { + swizzle = GL_SWIZZLE_STR_ATI; + } else { + swizzle = GL_SWIZZLE_STQ_DQ_ATI; + } + TRACE("glPassTexCoordATI(GL_REG_%d_ATI, GL_TEXTURE_%d_ARB, %s)\n", + stage + 1, stage + 1, debug_swizzle(swizzle)); GL_EXTCALL(glPassTexCoordATI(GL_REG_0_ATI + stage + 1, GL_TEXTURE0_ARB + stage + 1, - GL_SWIZZLE_STR_ATI)); + swizzle)); /* We need GL_REG_5_ATI as a temporary register to swizzle the bump matrix. So we run into * issues if we're bump mapping on stage 4 or 5

1 0