November 2007 - Wine-commits

Juan Lang : wininet: Don't use HEAP_ZERO_MEMORY on memory that' s fully initialized.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 9adf83e90dbac23a122e16e51705d5fc83b15f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9adf83e90dbac23a122e16e51… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 14:58:14 2007 -0800 wininet: Don't use HEAP_ZERO_MEMORY on memory that's fully initialized. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0a23979..5f27bd2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3293,7 +3293,7 @@ static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR v len = origlen + valuelen + ((ch > 0) ? 2 : 0); - lpsztmp = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR)); + lpsztmp = HeapReAlloc(GetProcessHeap(), 0, lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR)); if (lpsztmp) { lphttpHdr->lpszValue = lpsztmp;

1 0

Andrew Talbot : urlmon: Constify some variables.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 509760922aa59a22606497f01a506f10c9a2e4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=509760922aa59a22606497f01… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 7 21:11:10 2007 +0000 urlmon: Constify some variables. --- dlls/urlmon/format.c | 4 ++-- dlls/urlmon/http.c | 2 +- dlls/urlmon/umon.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/format.c b/dlls/urlmon/format.c index 0a0a97d..fdc0083 100644 --- a/dlls/urlmon/format.c +++ b/dlls/urlmon/format.c @@ -43,7 +43,7 @@ typedef struct { LONG ref; } EnumFORMATETC; -static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, FORMATETC *rgfmtetc, UINT it); +static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, const FORMATETC *rgfmtetc, UINT it); #define ENUMF_THIS(iface) ICOM_THIS_MULTI(EnumFORMATETC, lpEnumFORMATETCVtbl, iface) @@ -158,7 +158,7 @@ static const IEnumFORMATETCVtbl EnumFORMATETCVtbl = { EnumFORMATETC_Clone }; -static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, FORMATETC *rgfmtetc, UINT it) +static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, const FORMATETC *rgfmtetc, UINT it) { EnumFORMATETC *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(EnumFORMATETC)); diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 89bdec3..46243e6 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -228,7 +228,7 @@ static void CALLBACK HTTPPROTOCOL_InternetStatusCallback( IInternetProtocolSink_ReportProgress(This->protocol_sink, ulStatusCode, (LPWSTR)lpvStatusInformation); } -static inline LPWSTR strndupW(LPWSTR string, int len) +static inline LPWSTR strndupW(LPCWSTR string, int len) { LPWSTR ret = NULL; if (string && diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 9d17afa..9cf1af3 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -183,7 +183,7 @@ static void Binding_CloseCacheDownload(Binding *This) This->pstrCache = 0; } -static HRESULT Binding_MoreCacheData(Binding *This, char *buf, DWORD dwBytes) +static HRESULT Binding_MoreCacheData(Binding *This, const char *buf, DWORD dwBytes) { DWORD written;

1 0

Lei Zhang : wininet: Initialize ftp sockets.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: f727e56d6d330b5ed5103f4d93d25d529c792bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f727e56d6d330b5ed5103f4d9… Author: Lei Zhang <thestig(a)google.com> Date: Wed Nov 7 22:33:21 2007 -0800 wininet: Initialize ftp sockets. --- dlls/wininet/ftp.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 8c0cc5d..39fbc90 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2049,6 +2049,9 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, lpwfs->hdr.destroy = FTP_CloseSessionHandle; lpwfs->hdr.lpfnStatusCB = hIC->hdr.lpfnStatusCB; lpwfs->download_in_progress = NULL; + lpwfs->sndSocket = -1; + lpwfs->lstnSocket = -1; + lpwfs->pasvSocket = -1; WININET_AddRef( &hIC->hdr ); lpwfs->lpAppInfo = hIC;

1 0

Juan Lang : wininet: Fix typo.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: b210e3a751cf3e505d5a82450c89c42a8ed9ccc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b210e3a751cf3e505d5a82450… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 7 14:34:49 2007 -0800 wininet: Fix typo. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a316fa4..328e151 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -245,7 +245,7 @@ static void HTTP_FixURL( LPWININETHTTPREQW lpwhr) } if(CSTR_EQUAL != CompareStringW( LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - lpwhr->lpszPath, strlenW(szHttp), szHttp, strlenW(szHttp) ) + lpwhr->lpszPath, strlenW(lpwhr->lpszPath), szHttp, strlenW(szHttp) ) && lpwhr->lpszPath[0] != '/') /* not an absolute path ?? --> fix it !! */ { WCHAR *fixurl = HeapAlloc(GetProcessHeap(), 0,

1 0

Stefan Dösinger : d3d9: Be less picky in the D3DFMT_X8L8V8U8 test.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 4454096db27e7560cce99367b45be3b24dd0894a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4454096db27e7560cce99367b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 6 00:11:19 2007 +0100 d3d9: Be less picky in the D3DFMT_X8L8V8U8 test. --- dlls/d3d9/tests/visual.c | 103 ++++++++++++++++------------------------------ 1 files changed, 35 insertions(+), 68 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6362b5c..2214783 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -323,13 +323,13 @@ typedef struct { } test_data_t; /* - * c7 mova ARGB mov ARGB - * -2.4 -2 0x00ffff00 -3 0x00ff0000 - * -1.6 -2 0x00ffff00 -2 0x00ffff00 - * -0.4 0 0x0000ffff -1 0x0000ff00 - * 0.4 0 0x0000ffff 0 0x0000ffff - * 1.6 2 0x00ff00ff 1 0x000000ff - * 2.4 2 0x00ff00ff 2 0x00ff00ff + * c7 rounded ARGB + * -2.4 -2 0x00ffff00 + * -1.6 -2 0x00ffff00 + * -0.4 0 0x0000ffff + * 0.4 0 0x0000ffff + * 1.6 2 0x00ff00ff + * 2.4 2 0x00ff00ff */ static void test_mova(IDirect3DDevice9 *device) { @@ -348,39 +348,14 @@ static void test_mova(IDirect3DDevice9 *device) 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ 0x0000ffff /* END */ }; - static const DWORD mov_test[] = { - 0xfffe0101, /* vs_1_1 */ - 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ - 0x00000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 1.0, 0.0, 0.0, 1.0 */ - 0x00000051, 0xa00f0001, 0x3f800000, 0x3f800000, 0x00000000, 0x3f800000, /* def c1, 1.0, 1.0, 0.0, 1.0 */ - 0x00000051, 0xa00f0002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, /* def c2, 0.0, 1.0, 0.0, 1.0 */ - 0x00000051, 0xa00f0003, 0x00000000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c3, 0.0, 1.0, 1.0, 1.0 */ - 0x00000051, 0xa00f0004, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, /* def c4, 0.0, 0.0, 1.0, 1.0 */ - 0x00000051, 0xa00f0005, 0x3f800000, 0x00000000, 0x3f800000, 0x3f800000, /* def c5, 1.0, 0.0, 1.0, 1.0 */ - 0x00000051, 0xa00f0006, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c6, 1.0, 1.0, 1.0, 1.0 */ - 0x00000001, 0xb0010000, 0xa0000007, /* mov a0.x, c7.x */ - 0x00000001, 0xd00f0000, 0xa0e42003, /* mov oD0, c[a0.x + 3] */ - 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ - 0x0000ffff /* END */ - }; - static const test_data_t test_data[2][6] = { - { - {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff0000}, - {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, - {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ff00}, - {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, - {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x000000ff}, - {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} - }, - { - {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, - {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, - {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, - {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, - {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff}, - {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} - } + static const test_data_t test_data[] = { + {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, + {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, + {{-0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, + {{ 0.4f, 0.0f, 0.0f, 0.0f}, 0x0000ffff}, + {{ 1.6f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff}, + {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} }; static const float quad[][3] = { @@ -397,51 +372,43 @@ static void test_mova(IDirect3DDevice9 *device) IDirect3DVertexDeclaration9 *vertex_declaration = NULL; IDirect3DVertexShader9 *mova_shader = NULL; - IDirect3DVertexShader9 *mov_shader = NULL; HRESULT hr; - int i, j; + int i; hr = IDirect3DDevice9_CreateVertexShader(device, mova_test, &mova_shader); ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_CreateVertexShader(device, mov_test, &mov_shader); - ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, mova_shader); + ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); ok(SUCCEEDED(hr), "SetVertexDeclaration failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, mov_shader); - ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); - for(j = 0; j < 2; ++j) + for (i = 0; i < (sizeof(test_data) / sizeof(test_data_t)); ++i) { - for (i = 0; i < (sizeof(test_data[0]) / sizeof(test_data_t)); ++i) - { - DWORD color; + DWORD color; - hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 7, test_data[j][i].in, 1); - ok(SUCCEEDED(hr), "SetVertexShaderConstantF failed (%08x)\n", hr); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 7, test_data[i].in, 1); + ok(SUCCEEDED(hr), "SetVertexShaderConstantF failed (%08x)\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "BeginScene failed (%08x)\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed (%08x)\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], 3 * sizeof(float)); - ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], 3 * sizeof(float)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "EndScene failed (%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed (%08x)\n", hr); - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Present failed (%08x)\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (%08x)\n", hr); - color = getPixelColor(device, 320, 240); - ok(color == test_data[j][i].out, "Expected color %08x, got %08x (for input %f, instruction %s)\n", - test_data[j][i].out, color, test_data[j][i].in[0], j == 0 ? "mov" : "mova"); + color = getPixelColor(device, 320, 240); + ok(color == test_data[i].out, "Expected color %08x, got %08x (for input %f)\n", test_data[i].out, color, test_data[i].in[0]); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0f, 0); - ok(SUCCEEDED(hr), "Clear failed (%08x)\n", hr); - } - hr = IDirect3DDevice9_SetVertexShader(device, mova_shader); - ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed (%08x)\n", hr); } hr = IDirect3DDevice9_SetVertexShader(device, NULL); @@ -2839,7 +2806,7 @@ static void x8l8v8u8_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); color = getPixelColor(device, 578, 430); - ok(color == 0x008262ca, "D3DFMT_X8L8V8U8 = 0x112131ca returns color %08x, expected 0x008262ca\n", color); + ok(color == 0x008262ca || color == 0x008363ca, "D3DFMT_X8L8V8U8 = 0x112131ca returns color %08x, expected 0x008262ca\n", color); hr = IDirect3DDevice9_SetPixelShader(device, shader2); ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed (%08x)\n", hr);

1 0

Stefan Dösinger : wined3d: Pass surface dirtification to the container.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 24ee003bfec32b6e02b738cb8e817539c1130f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ee003bfec32b6e02b738cb8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 3 16:41:13 2007 +0100 wined3d: Pass surface dirtification to the container. --- dlls/wined3d/surface.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7b25d18..1ee7b6f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3439,6 +3439,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DWORD flag, BOOL persistent) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + IWineD3DBaseTexture *texture; TRACE("(%p)->(%s, %s)\n", iface, flag == SFLAG_INSYSMEM ? "SFLAG_INSYSMEM" : flag == SFLAG_INDRAWABLE ? "SFLAG_INDRAWABLE" : "SFLAG_INTEXTURE", @@ -3446,9 +3447,23 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW /* TODO: For offscreen textures with fbo offscreen rendering the drawable is the same as the texture.*/ if(persistent) { + if((This->Flags & SFLAG_INTEXTURE) && !(flag & SFLAG_INTEXTURE)) { + if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&texture) == WINED3D_OK) { + TRACE("Passing to container\n"); + IWineD3DBaseTexture_SetDirty(texture, TRUE); + IWineD3DBaseTexture_Release(texture); + } + } This->Flags &= ~SFLAG_LOCATIONS; This->Flags |= flag; } else { + if((This->Flags & SFLAG_INTEXTURE) && (flag & SFLAG_INTEXTURE)) { + if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&texture) == WINED3D_OK) { + TRACE("Passing to container\n"); + IWineD3DBaseTexture_SetDirty(texture, TRUE); + IWineD3DBaseTexture_Release(texture); + } + } This->Flags &= ~flag; } }

1 0

Andrew Talbot : twain_32: Constify a variable.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 76255835019ecd3b9c398d4c05464d0221ec4044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76255835019ecd3b9c398d4c0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 7 21:11:07 2007 +0000 twain_32: Constify a variable. --- dlls/twain_32/twain32_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index b7db5d2..c04e9cf 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); /* A helper function that looks up a destination identity in the active source list */ -static activeDS *TWAIN_LookupSource (pTW_IDENTITY pDest) +static activeDS *TWAIN_LookupSource (const TW_IDENTITY *pDest) { activeDS *pSource;

1 0

Stefan Dösinger : wined3d: Remove the conditional from texdepth.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: aafcae4752f5806dded66a7c0490b9fd9152118d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aafcae4752f5806dded66a7c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Oct 28 00:02:14 2007 +0200 wined3d: Remove the conditional from texdepth. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4083d56..98cbcf8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2230,7 +2230,7 @@ void pshader_glsl_texdepth(SHADER_OPCODE_ARG* arg) { * too is irrelevant, since if x = 0, any y value < 1.0 (and > 1.0 is not allowed) results in a result * >= 1.0 or < 0.0 */ - shader_addline(arg->buffer, "gl_FragDepth = (%s.y == 0.0) ? 1.0 : clamp((%s.x / min(%s.y, 1.0)), 0.0, 1.0);\n", dst_param.reg_name, dst_param.reg_name, dst_param.reg_name); + shader_addline(arg->buffer, "gl_FragDepth = clamp((%s.x / min(%s.y, 1.0)), 0.0, 1.0);\n", dst_param.reg_name, dst_param.reg_name, dst_param.reg_name); } /** Process the WINED3DSIO_TEXM3X2DEPTH instruction in GLSL:

1 0

Stefan Dösinger : wined3d: Relative addressing offsets are limited to [-64; 63] in arb.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: fb0dde7b274fb3a4b2f0f911c9114ce8a832b98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0dde7b274fb3a4b2f0f911c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 7 19:57:49 2007 +0100 wined3d: Relative addressing offsets are limited to [-64; 63] in arb. --- dlls/wined3d/arb_program_shader.c | 25 +++++++++++++++++++++---- dlls/wined3d/baseshader.c | 9 +++++++++ dlls/wined3d/directx.c | 36 +++++++++++++++++++++++++++++++++++- dlls/wined3d/vertexshader.c | 29 +++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d_gl.h | 2 ++ 6 files changed, 95 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb0dde7b274fb3a4b2f0f…

1 0

Stefan Dösinger : wined3d: Get rid of the conditionals in the glsl lit implementation.
by Alexandre Julliard 08 Nov '07

08 Nov '07

Module: wine Branch: master Commit: 468309e055b5e14f6da919b173eb199954b65ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=468309e055b5e14f6da919b17… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Oct 28 21:21:24 2007 +0100 wined3d: Get rid of the conditionals in the glsl lit implementation. --- dlls/wined3d/glsl_shader.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 98cbcf8..c2da059 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1777,8 +1777,29 @@ void shader_glsl_lit(SHADER_OPCODE_ARG* arg) { shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_1, &src1_param); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_3, &src3_param); - shader_addline(arg->buffer, "vec4(1.0, (%s > 0.0 ? %s : 0.0), (%s > 0.0 ? ((%s > 0.0) ? pow(%s, clamp(%s, -128.0, 128.0)) : 0.0) : 0.0), 1.0)%s);\n", - src0_param.param_str, src0_param.param_str, src0_param.param_str, src1_param.param_str, src1_param.param_str, src3_param.param_str, dst_mask); + /* The sdk specifies the instruction like this + * dst.x = 1.0; + * if(src.x > 0.0) dst.y = src.x + * else dst.y = 0.0. + * if(src.x > 0.0 && src.y > 0.0) dst.z = pow(src.y, power); + * else dst.z = 0.0; + * dst.w = 1.0; + * + * Obviously that has quite a few conditionals in it which we don't like. So the first step is this: + * dst.x = 1.0 ... No further explanation needed + * dst.y = max(src.y, 0.0); ... If x < 0.0, use 0.0, otherwise x. Same as the conditional + * dst.z = x > 0.0 ? pow(max(y, 0.0), p) : 0; ... 0 ^ power is 0, and otherwise we use y anyway + * dst.w = 1.0. ... Nothing fancy. + * + * So we still have one conditional in there. So do this: + * dst.z = pow(max(0.0, src.y) * step(0.0, src.x), power); + * + * step(0.0, x) will return 1 if src.x > 0.0, and 0 otherwise. So if y is 0 we get pow(0.0 * 1.0, power), + * which sets dst.z to 0. If y > 0, but x = 0.0, we get pow(y * 0.0, power), which results in 0 too. + * if both x and y are > 0, we get pow(y * 1.0, power), as it is supposed to + */ + shader_addline(arg->buffer, "vec4(1.0, max(%s, 0.0), pow(max(0.0, %s) * step(0.0, %s), clamp(%s, -128.0, 128.0)), 1.0)%s);\n", + src0_param.param_str, src1_param.param_str, src0_param.param_str, src3_param.param_str, dst_mask); } /** Process the WINED3DSIO_DST instruction in GLSL:

1 0