May 2009 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Manage vs_compile_args in the backends.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: aad92c0780f7a0383db1736d6fbca6a8ce6b45ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad92c0780f7a0383db1736d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 21:06:37 2009 +0200 wined3d: Manage vs_compile_args in the backends. --- dlls/wined3d/arb_program_shader.c | 63 ++++++++++++++++++++----------- dlls/wined3d/glsl_shader.c | 74 +++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 9 +---- 3 files changed, 91 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aad92c0780f7a0383db17…

1 0

André Hentschel : winex11: Fix Ctrl+Tab translation.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: cc688148acef8d636bdaaa4e6ede264657364c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc688148acef8d636bdaaa4e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 27 19:55:23 2009 +0200 winex11: Fix Ctrl+Tab translation. --- dlls/user32/tests/input.c | 2 +- dlls/winex11.drv/keyboard.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 2ad3eae..00d344b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1276,7 +1276,7 @@ static void test_ToUnicode(void) state[VK_LCONTROL] |= HIGHEST_BIT; ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); - todo_wine ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); + ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); ok(ret == 1, "ToUnicode for CTRL + Return didn't return 1 (was %i)\n", ret); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 80f8445..ad41c84 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2679,7 +2679,8 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState if (e.state & ControlMask) { if (((keysym>=33) && (keysym < 'A')) || - ((keysym > 'Z') && (keysym < 'a'))) + ((keysym > 'Z') && (keysym < 'a')) || + (keysym == XK_Tab)) { lpChar[0] = 0; ret = 0;

1 0

Louis Lenders : wined3d: Fix CheckDeviceMultiSampleType when queried with D3DMULTISAMPLE_NONE.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 06936f04c04869b611bd91b335a94fd9e2ae7157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06936f04c04869b611bd91b33… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed May 27 17:29:46 2009 +0000 wined3d: Fix CheckDeviceMultiSampleType when queried with D3DMULTISAMPLE_NONE. --- dlls/d3d9/tests/device.c | 4 ++-- dlls/wined3d/directx.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 22f4234..f1d3595 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -173,12 +173,12 @@ static void test_checkdevicemultisampletype(void) hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE, D3DMULTISAMPLE_NONE, &qualityLevels); ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr); - todo_wine ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); + ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, FALSE, D3DMULTISAMPLE_NONE, &qualityLevels); ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr); - todo_wine ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); + ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels); cleanup: if (pD3d) IUnknown_Release( pD3d ); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6bad91e..eb78782 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1915,7 +1915,10 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceMultiSampleType(IWineD3D *iface, U /* TODO: handle Windowed, add more quality levels */ - if (WINED3DMULTISAMPLE_NONE == MultiSampleType) return WINED3D_OK; + if (WINED3DMULTISAMPLE_NONE == MultiSampleType) { + if(pQualityLevels) *pQualityLevels = 1; + return WINED3D_OK; + } /* By default multisampling is disabled right now as it causes issues * on some Nvidia driver versions and it doesn't work well in combination

1 0

Stefan Dösinger : wined3d: Emulate if(bool) in ARB shaders.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: e70c80add9942bab844e6db8a3a4ddbca6576762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70c80add9942bab844e6db8a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 27 18:23:59 2009 +0200 wined3d: Emulate if(bool) in ARB shaders. --- dlls/wined3d/arb_program_shader.c | 203 ++++++++++++++++++++++++++++++++----- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 180 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e70c80add9942bab844e6…

1 0

Peter Hedlund : kernel32: Mask out obsolete flags in GlobalAlloc.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 7d47feaebe2986b426adc21f0dd81e8bd0e86b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d47feaebe2986b426adc21f0… Author: Peter Hedlund <peter(a)peterandlinda.com> Date: Wed May 27 10:27:56 2009 -0700 kernel32: Mask out obsolete flags in GlobalAlloc. --- dlls/kernel32/heap.c | 3 ++ dlls/kernel32/tests/heap.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index c08fb51..c78c762 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -375,6 +375,9 @@ HGLOBAL WINAPI GlobalAlloc( pintern = HeapAlloc(GetProcessHeap(), 0, sizeof(GLOBAL32_INTERN)); if (pintern) { + /* Mask out obsolete flags */ + flags &= ~(GMEM_LOWER | GMEM_NOCOMPACT | GMEM_NOT_BANKED | GMEM_NOTIFY); + pintern->Magic = MAGIC_GLOBAL_USED; pintern->Flags = flags >> 8; pintern->LockCount = 0; diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 39517cc..19b4106 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -362,9 +362,58 @@ static void test_heap(void) GlobalFree(gbl); } +static void test_obsolete_flags(void) +{ + static struct { + UINT flags; + UINT globalflags; + } test_global_flags[] = { + {GMEM_FIXED | GMEM_NOTIFY, 0}, + {GMEM_FIXED | GMEM_DISCARDABLE, 0}, + {GMEM_MOVEABLE | GMEM_NOTIFY, 0}, + {GMEM_MOVEABLE | GMEM_DDESHARE, GMEM_DDESHARE}, + {GMEM_MOVEABLE | GMEM_NOT_BANKED, 0}, + {GMEM_MOVEABLE | GMEM_NODISCARD, 0}, + {GMEM_MOVEABLE | GMEM_DISCARDABLE, GMEM_DISCARDABLE}, + {GMEM_MOVEABLE | GMEM_DDESHARE | GMEM_DISCARDABLE | GMEM_LOWER | GMEM_NOCOMPACT | GMEM_NODISCARD | + GMEM_NOT_BANKED | GMEM_NOTIFY, GMEM_DDESHARE | GMEM_DISCARDABLE}, + }; + + unsigned int i; + HGLOBAL gbl; + UINT resultflags; + + UINT (WINAPI *pGlobalFlags)(HGLOBAL); + + pGlobalFlags = (void *) GetProcAddress(GetModuleHandleA("kernel32"), "GlobalFlags"); + + if (!pGlobalFlags) + { + win_skip("GlobalFlags is not available\n"); + return; + } + + for (i = 0; i < sizeof(test_global_flags)/sizeof(test_global_flags[0]); i++) + { + gbl = GlobalAlloc(test_global_flags[i].flags, 4); + ok(gbl != NULL, "GlobalAlloc failed\n"); + + SetLastError(MAGIC_DEAD); + resultflags = pGlobalFlags(gbl); + + ok( resultflags == test_global_flags[i].globalflags || + broken(resultflags == (test_global_flags[i].globalflags & ~GMEM_DDESHARE)), /* win9x */ + "%u: expected 0x%08x, but returned 0x%08x with %d\n", + i, test_global_flags[i].globalflags, resultflags, GetLastError() ); + + GlobalFree(gbl); + } +} + START_TEST(heap) { test_heap(); + test_obsolete_flags(); /* Test both short and very long blocks */ test_sized_HeapAlloc(1);

1 0

Stefan Dösinger : wined3d: Make find_gl_vshader backend specific.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 8763f6eac549be7f458cb579e2308bf11fa958dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8763f6eac549be7f458cb579e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 14:10:56 2009 +0200 wined3d: Make find_gl_vshader backend specific. --- dlls/wined3d/arb_program_shader.c | 70 ++++++++++++++++++++++++++++++++---- dlls/wined3d/baseshader.c | 7 ---- dlls/wined3d/glsl_shader.c | 70 ++++++++++++++++++++++++++++++++----- dlls/wined3d/vertexshader.c | 65 ---------------------------------- dlls/wined3d/wined3d_private.h | 3 -- 5 files changed, 123 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8763f6eac549be7f458cb…

1 0

Stefan Dösinger : wined3d: Manage ps_compiled_shader in the backends.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 814dd42f256eaa2fe6caf2c78ffdff1f9af138bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=814dd42f256eaa2fe6caf2c78… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 21:05:59 2009 +0200 wined3d: Manage ps_compiled_shader in the backends. --- dlls/wined3d/arb_program_shader.c | 64 ++++++++++++++++++++----------- dlls/wined3d/glsl_shader.c | 76 +++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 8 +--- 3 files changed, 94 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=814dd42f256eaa2fe6caf…

1 0

Stefan Dösinger : wined3d: Remove the forward declaration added in the last patch.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 732a9a15d59680e21897502e9afe2b3fefa6428b URL: http://source.winehq.org/git/wine.git/?a=commit;h=732a9a15d59680e21897502e9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 13:57:03 2009 +0200 wined3d: Remove the forward declaration added in the last patch. --- dlls/wined3d/arb_program_shader.c | 450 ++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 358 +++++++++++++++--------------- 2 files changed, 401 insertions(+), 407 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=732a9a15d59680e218975…

1 0

Henri Verbeet : wined3d: Remove the "declaration" parameter to IWineD3DDeviceImpl_CreateVertexShader().
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 13a05caa9744673d618bc00426f3bf21e72aa0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a05caa9744673d618bc0042… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 28 08:44:21 2009 +0200 wined3d: Remove the "declaration" parameter to IWineD3DDeviceImpl_CreateVertexShader(). Once upon a time this was used for creating fake vertex shader attribute semantics for d3d8 shaders. We don't need this anymore since device_stream_info_from_declaration() will use the vertex declaration's output slot to load the data, if present. That also avoids the potentially expensive matching of attribute semantics between vertex shader and declaration for d3d8. --- dlls/d3d10core/device.c | 2 +- dlls/d3d8/device.c | 7 ++----- dlls/d3d9/vertexshader.c | 2 +- dlls/wined3d/device.c | 7 +------ dlls/wined3d/vertexshader.c | 28 ---------------------------- include/wine/wined3d.idl | 4 ---- 6 files changed, 5 insertions(+), 45 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index de07db7..20e7c46 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1003,7 +1003,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i return hr; } - hr = IWineD3DDevice_CreateVertexShader(This->wined3d_device, NULL, + hr = IWineD3DDevice_CreateVertexShader(This->wined3d_device, shader_info.shader_code, &object->output_signature, &object->wined3d_shader, (IUnknown *)object); if (FAILED(hr)) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4b24ac8..6af8d1e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1726,7 +1726,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hrc = D3D_OK; IDirect3DVertexShader8Impl *object; - IWineD3DVertexDeclaration *wined3d_vertex_declaration; const DWORD *token = pDeclaration; DWORD handle; @@ -1783,13 +1782,11 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 *ppShader = ((IDirect3DVertexDeclaration8Impl *)object->vertex_declaration)->shader_handle = shader_handle; } - wined3d_vertex_declaration = ((IDirect3DVertexDeclaration8Impl *)object->vertex_declaration)->wined3d_vertex_declaration; - if (pFunction) { /* Usage is missing ... Use SetRenderState to set the sw vp render state in SetVertexShader */ - hrc = IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, wined3d_vertex_declaration, - pFunction, NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); + hrc = IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, pFunction, + NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); if (FAILED(hrc)) { diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index c138690..d7b680e 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -126,7 +126,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(LPDIRECT3DDEVICE9EX iface object->ref = 1; object->lpVtbl = &Direct3DVertexShader9_Vtbl; EnterCriticalSection(&d3d9_cs); - hrc= IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, NULL /* declaration */, pFunction, + hrc= IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, pFunction, NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 91a0266..b022755 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2329,8 +2329,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF(IWineD3D } static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *iface, - IWineD3DVertexDeclaration *vertex_declaration, const DWORD *pFunction, - const struct wined3d_shader_signature *output_signature, + const DWORD *pFunction, const struct wined3d_shader_signature *output_signature, IWineD3DVertexShader **ppVertexShader, IUnknown *parent) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -2355,10 +2354,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac TRACE("(%p) : Created vertex shader %p\n", This, *ppVertexShader); - if (vertex_declaration) { - IWineD3DVertexShader_FakeSemantics(*ppVertexShader, vertex_declaration); - } - hr = IWineD3DVertexShader_SetFunction(*ppVertexShader, pFunction, output_signature); if (FAILED(hr)) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index b8c56cc..99108a8 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -105,20 +105,6 @@ static void vshader_set_limits(IWineD3DVertexShaderImpl *This) } } -/* This is an internal function, - * used to create fake semantics for shaders - * that don't have them - d3d8 shaders where the declaration - * stores the register for each input - */ -static void vshader_set_input( - IWineD3DVertexShaderImpl* This, - unsigned int regnum, - BYTE usage, BYTE usage_idx) { - - This->attributes[regnum].usage = usage; - This->attributes[regnum].usage_idx = usage_idx; -} - static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_idx2) { if (usage_idx1 != usage_idx2) return FALSE; if (usage1 == usage2) return TRUE; @@ -320,19 +306,6 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader return WINED3D_OK; } -/* Preload semantics for d3d8 shaders */ -static void WINAPI IWineD3DVertexShaderImpl_FakeSemantics(IWineD3DVertexShader *iface, IWineD3DVertexDeclaration *vertex_declaration) { - IWineD3DVertexShaderImpl *This =(IWineD3DVertexShaderImpl *)iface; - IWineD3DVertexDeclarationImpl* vdecl = (IWineD3DVertexDeclarationImpl*)vertex_declaration; - - unsigned int i; - for (i = 0; i < vdecl->element_count; ++i) - { - const struct wined3d_vertex_declaration_element *e = &vdecl->elements[i]; - vshader_set_input(This, e->output_slot, e->usage, e->usage_idx); - } -} - /* Set local constants for d3d8 shaders */ static HRESULT WINAPI IWIneD3DVertexShaderImpl_SetLocalConstantsF(IWineD3DVertexShader *iface, UINT start_idx, const float *src_data, UINT count) { @@ -389,7 +362,6 @@ const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = /*** IWineD3DVertexShader methods ***/ IWineD3DVertexShaderImpl_GetDevice, IWineD3DVertexShaderImpl_GetFunction, - IWineD3DVertexShaderImpl_FakeSemantics, IWIneD3DVertexShaderImpl_SetLocalConstantsF }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7c875e4..48938cb 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2868,9 +2868,6 @@ interface IWineD3DVertexShader : IWineD3DBaseShader [out] void *data, [in, out] UINT *data_size ); - void FakeSemantics( - [in] IWineD3DVertexDeclaration *vertex_declaration - ); HRESULT SetLocalConstantsF( [in] UINT start_idx, [in] const float *src_data, @@ -3011,7 +3008,6 @@ interface IWineD3DDevice : IWineD3DBase [in] DWORD fvf ); HRESULT CreateVertexShader( - [in] IWineD3DVertexDeclaration *declaration, [in] const DWORD *function, [in] const struct wined3d_shader_signature *output_signature, [out] IWineD3DVertexShader **shader,

1 0

Stefan Dösinger : wined3d: Store the compile args in the compile context, not the shader.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 5865d9c01b2aed1ed7a2f5987f587de952cb2ad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5865d9c01b2aed1ed7a2f5987… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 13:27:54 2009 +0200 wined3d: Store the compile args in the compile context, not the shader. --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++++-------- dlls/wined3d/glsl_shader.c | 26 ++++++++++++++++++++------ dlls/wined3d/pixelshader.c | 2 -- dlls/wined3d/vertexshader.c | 2 -- dlls/wined3d/wined3d_private.h | 4 ---- 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4ace13b..db19fe5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -93,6 +93,9 @@ struct shader_arb_ctx_priv { /* GL_NV_vertex_program3 or GL_NV_fragment_program2 */ NV3 } target_version; + + const struct vs_compile_args *cur_vs_args; + const struct ps_compile_args *cur_ps_args; }; /******************************************************** @@ -543,7 +546,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if (((IWineD3DVertexShaderImpl *)This)->cur_args->swizzle_map & (1 << reg->idx)) *is_color = TRUE; + if (ctx->cur_vs_args->swizzle_map & (1 << reg->idx)) *is_color = TRUE; sprintf(register_name, "vertex.attrib[%u]", reg->idx); } break; @@ -606,7 +609,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction case WINED3DSPR_COLOROUT: if (reg->idx == 0) { - if(((IWineD3DPixelShaderImpl *)This)->cur_args->srgb_correction) + if(ctx->cur_ps_args->srgb_correction) { strcpy(register_name, "TMP_COLOR"); } @@ -739,6 +742,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD const char *tex_type; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; switch(sampler_type) { case WINED3DSTT_1D: @@ -754,10 +758,10 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD } if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - const IWineD3DPixelShaderImpl* const ps = (const IWineD3DPixelShaderImpl*)This; - if(ps->cur_args->np2_fixup & (1 << sampler_idx)) { - FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead).\n"); - } + if(priv->cur_ps_args->np2_fixup & (1 << sampler_idx)) + { + FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead).\n"); + } } break; @@ -787,9 +791,8 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *)ins->ctx->shader; gen_color_correction(buffer, dst_str, ins->dst[0].write_mask, - "one", "coefmul.x", ps->cur_args->color_fixup[sampler_idx]); + "one", "coefmul.x", priv->cur_ps_args->color_fixup[sampler_idx]); } } @@ -2128,6 +2131,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, /* Create the hw ARB shader */ memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.cur_ps_args = args; shader_addline(buffer, "!!ARBfp1.0\n"); if(GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) { shader_addline(buffer, "OPTION NV_fragment_program;\n"); @@ -2240,6 +2244,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, struct shader_arb_ctx_priv priv_ctx; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.cur_vs_args = args; /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f576e67..8eaffe8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -122,6 +122,11 @@ typedef struct { struct vs_compile_args vs_args; } glsl_program_key_t; +struct shader_glsl_ctx_priv { + const struct vs_compile_args *cur_vs_args; + const struct ps_compile_args *cur_ps_args; +}; + /* Extract a line from the info log. * Note that this modifies the source string. */ static char *get_info_log_line(char **ptr) @@ -1123,7 +1128,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* vertex shaders */ if (!pshader) { - if (((IWineD3DVertexShaderImpl *)This)->cur_args->swizzle_map & (1 << reg->idx)) *is_color = TRUE; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + if (priv->cur_vs_args->swizzle_map & (1 << reg->idx)) *is_color = TRUE; sprintf(register_name, "attrib%u", reg->idx); break; } @@ -1657,11 +1663,11 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->ctx->shader; - fixup = This->cur_args->color_fixup[sampler]; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + fixup = priv->cur_ps_args->color_fixup[sampler]; sampler_base = "Psampler"; - if(This->cur_args->np2_fixup & (1 << sampler)) { + if(priv->cur_ps_args->np2_fixup & (1 << sampler)) { if(bias) { FIXME("Biased sampling from NP2 textures is unsupported\n"); } else { @@ -4164,10 +4170,14 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, CONST DWORD *function = This->baseShader.function; const char *fragcolor; const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; + struct shader_glsl_ctx_priv priv_ctx; /* Create the hw GLSL shader object and assign it as the shader->prgId */ GLhandleARB shader_obj = GL_EXTCALL(glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB)); + memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.cur_ps_args = args; + shader_addline(buffer, "#version 120\n"); if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { @@ -4193,7 +4203,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, NULL); + shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); /* Pixel shaders < 2.0 place the resulting color in R0 implicitly */ if (reg_maps->shader_version.major < 2) @@ -4270,17 +4280,21 @@ static GLuint shader_glsl_generate_vshader(IWineD3DVertexShader *iface, const struct shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; + struct shader_glsl_ctx_priv priv_ctx; /* Create the hw GLSL shader program and assign it as the shader->prgId */ GLhandleARB shader_obj = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)); shader_addline(buffer, "#version 120\n"); + memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.cur_vs_args = args; + /* Base Declarations */ shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, NULL); /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, NULL); + shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, &priv_ctx); /* Unpack 3.0 outputs */ if (reg_maps->shader_version.major >= 3) shader_addline(buffer, "order_ps_input(OUT);\n"); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 839b9bb..f1966a1 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -358,11 +358,9 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps /* Generate the HW shader */ TRACE("(%p) : Generating hardware program\n", This); - This->cur_args = args; shader_buffer_init(&buffer); retval = device->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer, args); shader_buffer_free(&buffer); - This->cur_args = NULL; return retval; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 99108a8..9ae52f9 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -341,9 +341,7 @@ static GLuint vertexshader_compile(IWineD3DVertexShaderImpl *This, const struct /* Generate the HW shader */ TRACE("(%p) : Generating hardware program\n", This); shader_buffer_init(&buffer); - This->cur_args = args; ret = deviceImpl->shader_backend->shader_generate_vshader((IWineD3DVertexShader *)This, &buffer, args); - This->cur_args = NULL; shader_buffer_free(&buffer); return ret; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1698504..c830d35 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2687,8 +2687,6 @@ typedef struct IWineD3DVertexShaderImpl { UINT rel_offset; UINT recompile_count; - - const struct vs_compile_args *cur_args; } IWineD3DVertexShaderImpl; extern const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl; @@ -2728,8 +2726,6 @@ typedef struct IWineD3DPixelShaderImpl { unsigned char numbumpenvmatconsts; struct stb_const_desc luminanceconst[MAX_TEXTURES]; char vpos_uniform; - - const struct ps_compile_args *cur_args; } IWineD3DPixelShaderImpl; extern const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl;

1 0