wine-commits November 2008

wine-commits@winehq.org

2 participants
734 discussions

Stefan Dösinger : wined3d: Add the ability to duplicate GL pixel shaders.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: 0bf32b12f5a97045c4c2785260961e53184c29ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf32b12f5a97045c4c278526… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 24 11:55:50 2008 +0100 wined3d: Add the ability to duplicate GL pixel shaders. Some stateblock parameters have to be compiled into the GL pixel shader code, like lines for pixelformat fixups. This leads to problems when applications switch those settings, requiring a recompilation of the shader. This patch enables wined3d to have multiple GL shaders for a D3D shader(pixel shaders only so far) to handle this more efficiently. --- dlls/wined3d/arb_program_shader.c | 116 +++++++++---------------------- dlls/wined3d/baseshader.c | 3 +- dlls/wined3d/glsl_shader.c | 111 ++++++++++++------------------- dlls/wined3d/pixelshader.c | 134 ++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 21 +++--- 5 files changed, 134 insertions(+), 251 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf32b12f5a97045c4c27…

1 0

Stefan Dösinger : wined3d: Store shader IDs in the vs and ps impl structures.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: aed9305c7859ce09271214d5eaae8ab81dd14eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aed9305c7859ce09271214d5e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 20 13:27:42 2008 +0100 wined3d: Store shader IDs in the vs and ps impl structures. --- dlls/wined3d/arb_program_shader.c | 43 ++++++++++++++++++++++-------------- dlls/wined3d/glsl_shader.c | 26 +++++++++++++-------- dlls/wined3d/wined3d_private.h | 7 +++++- 3 files changed, 48 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aed9305c7859ce0927121…

1 0

Stefan Dösinger : wined3d: Pass some stateblock values around directly.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: dd8905543ba0052adc7d26a0b14595aea5bad4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8905543ba0052adc7d26a0b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 20 02:55:17 2008 +0100 wined3d: Pass some stateblock values around directly. This was suggested by Ivan quite a while ago, and we need it to better handle conflicting texture format corrections and similar stateblock value changes which until now required a recompilation of the entire shader --- dlls/wined3d/arb_program_shader.c | 4 ++- dlls/wined3d/glsl_shader.c | 4 ++- dlls/wined3d/pixelshader.c | 53 ++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 12 +++++++- 4 files changed, 52 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5c6e29f..20e731b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1895,8 +1895,10 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { } if (usePS) { + struct ps_compile_args compile_args; TRACE("Using pixel shader\n"); - pixelshader_compile(This->stateBlock->pixelShader); + find_ps_compile_args((IWineD3DPixelShaderImpl *) This->stateBlock->pixelShader, This->stateBlock, &compile_args); + pixelshader_compile(This->stateBlock->pixelShader, &compile_args); priv->current_fprogram_id = ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.prgId; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d850ba8..92a6a36 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3234,7 +3234,9 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use vshader_id = 0; } if(use_ps) { - pixelshader_compile(pshader); + struct ps_compile_args compile_args; + find_ps_compile_args((IWineD3DPixelShaderImpl*)This->stateBlock->pixelShader, This->stateBlock, &compile_args); + pixelshader_compile(pshader, &compile_args); pshader_id = ((IWineD3DBaseShaderImpl*)pshader)->baseShader.prgId; } else { pshader_id = 0; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index cb5d227..1ce2849 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -384,13 +384,12 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_SetFunction(IWineD3DPixelShader *i return WINED3D_OK; } -HRESULT pixelshader_compile(IWineD3DPixelShader *iface) { +HRESULT pixelshader_compile(IWineD3DPixelShader *iface, struct ps_compile_args *args) { IWineD3DPixelShaderImpl *This =(IWineD3DPixelShaderImpl *)iface; IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; CONST DWORD *function = This->baseShader.function; UINT i, sampler; - IWineD3DBaseTextureImpl *texture; HRESULT hr; TRACE("(%p) : function %p\n", iface, function); @@ -399,15 +398,13 @@ HRESULT pixelshader_compile(IWineD3DPixelShader *iface) { * changed. */ if (This->baseShader.is_compiled) { - char srgbenabled = deviceImpl->stateBlock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0; for(i = 0; i < This->baseShader.num_sampled_samplers; i++) { sampler = This->baseShader.sampled_samplers[i]; - texture = (IWineD3DBaseTextureImpl *) deviceImpl->stateBlock->textures[sampler]; - if(texture && texture->baseTexture.shader_conversion_group != This->baseShader.sampled_format[sampler]) { + if(args->format_conversion[sampler] != This->baseShader.sampled_format[sampler]) { WARN("Recompiling shader %p due to format change on sampler %d\n", This, sampler); WARN("Old format group %s, new is %s\n", debug_d3dformat(This->baseShader.sampled_format[sampler]), - debug_d3dformat(texture->baseTexture.shader_conversion_group)); + debug_d3dformat(args->format_conversion[sampler])); goto recompile; } } @@ -415,7 +412,7 @@ HRESULT pixelshader_compile(IWineD3DPixelShader *iface) { /* TODO: Check projected textures */ /* TODO: Check texture types(2D, Cube, 3D) */ - if(srgbenabled != This->srgb_enabled && This->srgb_mode_hardcoded) { + if(args->srgb_correction != This->srgb_enabled && This->srgb_mode_hardcoded) { WARN("Recompiling shader because srgb correction is different and hardcoded\n"); goto recompile; } @@ -433,17 +430,8 @@ HRESULT pixelshader_compile(IWineD3DPixelShader *iface) { } } if(This->baseShader.hex_version >= WINED3DPS_VERSION(3,0)) { - if(((IWineD3DDeviceImpl *) This->baseShader.device)->strided_streams.u.s.position_transformed) { - if(This->vertexprocessing != pretransformed) { - WARN("Recompiling shader because pretransformed vertices are provided, which wasn't the case before\n"); - goto recompile; - } - } else if(!use_vs((IWineD3DDeviceImpl *) This->baseShader.device) && - This->vertexprocessing != fixedfunction) { - WARN("Recompiling shader because fixed function vp is in use, which wasn't the case before\n"); - goto recompile; - } else if(This->vertexprocessing != vertexshader) { - WARN("Recompiling shader because vertex shaders are in use, which wasn't the case before\n"); + if(args->vp_mode != This->vertexprocessing) { + WARN("Recompiling shader because the vertex processing mode changed\n"); goto recompile; } } @@ -515,3 +503,32 @@ const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl = IWineD3DPixelShaderImpl_GetDevice, IWineD3DPixelShaderImpl_GetFunction }; + +void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct ps_compile_args *args) { + UINT i, sampler; + IWineD3DBaseTextureImpl *tex; + + args->srgb_correction = stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0; + + memset(args->format_conversion, 0, sizeof(args->format_conversion)); + for(i = 0; i < shader->baseShader.num_sampled_samplers; i++) { + sampler = shader->baseShader.sampled_samplers[i]; + tex = (IWineD3DBaseTextureImpl *) stateblock->textures[sampler]; + if(!tex) { + args->format_conversion[sampler] = WINED3DFMT_UNKNOWN; + continue; + } + args->format_conversion[sampler] = tex->baseTexture.shader_conversion_group; + } + if(shader->baseShader.hex_version >= WINED3DPS_VERSION(3,0)) { + if(((IWineD3DDeviceImpl *) shader->baseShader.device)->strided_streams.u.s.position_transformed) { + args->vp_mode = pretransformed; + } else if(use_vs((IWineD3DDeviceImpl *) shader->baseShader.device)) { + args->vp_mode = vertexshader; + } else { + args->vp_mode = fixedfunction; + } + } else { + args->vp_mode = vertexshader; + } +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 015d7c0..847d11d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2337,6 +2337,15 @@ struct stb_const_desc { UINT const_num; }; +/* Stateblock dependent parameters which have to be hardcoded + * into the shader code + */ +struct ps_compile_args { + BOOL srgb_correction; + WINED3DFORMAT format_conversion[MAX_FRAGMENT_SAMPLERS]; + enum vertexprocessing_mode vp_mode; +}; + typedef struct IWineD3DPixelShaderImpl { /* IUnknown parts */ const IWineD3DPixelShaderVtbl *lpVtbl; @@ -2369,7 +2378,8 @@ typedef struct IWineD3DPixelShaderImpl { extern const SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[]; extern const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl; -HRESULT pixelshader_compile(IWineD3DPixelShader *iface); +HRESULT pixelshader_compile(IWineD3DPixelShader *iface, struct ps_compile_args *args); +void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImpl *stateblock, struct ps_compile_args *args); /* sRGB correction constants */ static const float srgb_cmp = 0.0031308;

1 0

Stefan Dösinger : wined3d: Make the shader backend call CompileShader.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: ff767f4984198e85477c0aee3fa49844caae6a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff767f4984198e85477c0aee3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 24 11:52:12 2008 +0100 wined3d: Make the shader backend call CompileShader. A number of considerations contribute to this: 1) The shader backend knows best which shader(s) it needs. GLSL needs both, arb only one 2) The shader backend may pass some parameters to the compilation code(e.g. which pixel format fixup to use) 3) The structures used in (2) are different in vs and ps, so a baseshader::Compile won't work 4) The structures in (2) are wined3d-private structures, so having a public method in the vtable won't work(its a bad idea anyway). --- dlls/wined3d/arb_program_shader.c | 10 ++++------ dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 15 +++++++++++++-- dlls/wined3d/pixelshader.c | 37 ++++++++++++++++++++++++------------- dlls/wined3d/state.c | 8 -------- dlls/wined3d/vertexshader.c | 3 +-- dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d_interface.h | 8 ++------ 8 files changed, 47 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff767f4984198e85477c0…

1 0

Maarten Lankhorst : msvcrt: Add CDECL to all cdecl functions.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: 83045e5cc888944c73491fd931d20ec438faff8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=83045e5cc888944c73491fd93… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 3 00:08:22 2008 -0700 msvcrt: Add CDECL to all cdecl functions. --- dlls/msvcrt/data.c | 2 +- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/msvcrt.h | 160 +++++++++++++++++++++++++------------------------- 3 files changed, 82 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83045e5cc888944c73491…

1 0

Maarten Lankhorst : ntdll: Make 64-bits wine only able to load amd64 binaries.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: 269600bbed6a72be8e78273fd39bd79a8690bfb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=269600bbed6a72be8e78273fd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 25 09:30:17 2008 +0100 ntdll: Make 64-bits wine only able to load amd64 binaries. --- dlls/ntdll/virtual.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c9503de..8d97e2c 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1038,13 +1038,18 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz /* check the architecture */ +#ifdef __x86_64__ + if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64) +#else if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_I386) +#endif { MESSAGE("Trying to load PE image for unsupported architecture ("); switch (nt->FileHeader.Machine) { case IMAGE_FILE_MACHINE_UNKNOWN: MESSAGE("Unknown"); break; case IMAGE_FILE_MACHINE_I860: MESSAGE("I860"); break; + case IMAGE_FILE_MACHINE_I386: MESSAGE("I386"); break; case IMAGE_FILE_MACHINE_R3000: MESSAGE("R3000"); break; case IMAGE_FILE_MACHINE_R4000: MESSAGE("R4000"); break; case IMAGE_FILE_MACHINE_R10000: MESSAGE("R10000"); break;

1 0

Maarten Lankhorst : winebuild: Use ms-abi for delayed load stubs.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: 1fcc33451a6b2b64761b8141aedfbb54c4f4dc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcc33451a6b2b64761b8141a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 24 12:01:21 2008 +0100 winebuild: Use ms-abi for delayed load stubs. --- tools/winebuild/import.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 4f6b5ba..2698430 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -977,10 +977,10 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tpushq %%rcx\n" ); output( "\tpushq %%r8\n" ); output( "\tpushq %%r9\n" ); - output( "\tsubq $8,%%rsp\n" ); - output( "\tmovq %%r11,%%rdi\n" ); + output( "\tsubq $32,%%rsp\n" ); + output( "\tmovq %%r11,%%rcx\n" ); output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output( "\taddq $8,%%rsp\n" ); + output( "\taddq $32,%%rsp\n" ); output( "\tpopq %%r9\n" ); output( "\tpopq %%r8\n" ); output( "\tpopq %%rcx\n" );

1 0

Maarten Lankhorst : includes: Add win64 calling convention.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: 6a704d6f724bf28b0f276ded0bf9855e2eff0494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a704d6f724bf28b0f276ded0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 25 09:09:47 2008 +0100 includes: Add win64 calling convention. --- include/msvcrt/process.h | 6 ++++-- include/windef.h | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index 92cbd22..c630671 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -41,9 +41,11 @@ typedef unsigned short wchar_t; # else # error You need to define __stdcall for your compiler # endif -# else /* __i386__ */ +# elif defined(__x86_64__) && defined (__GNUC__) +# define __stdcall __attribute__((ms_abi)) +# else # define __stdcall -# endif /* __i386__ */ +# endif #endif /* __stdcall */ #ifdef __cplusplus diff --git a/include/windef.h b/include/windef.h index fd3d423..8c0a0bb 100644 --- a/include/windef.h +++ b/include/windef.h @@ -62,6 +62,8 @@ extern "C" { # else # error You need to define __stdcall for your compiler # endif +# elif defined(__x86_64__) && defined (__GNUC__) +# define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall # endif /* __i386__ */ @@ -74,6 +76,8 @@ extern "C" { # else # define __cdecl __attribute__((__cdecl__)) # endif +# elif defined(__x86_64__) && defined (__GNUC__) +# define __cdecl __attribute__((ms_abi)) # elif !defined(_MSC_VER) # define __cdecl # endif

1 0

Huw Davies : ole32: Defer releasing the delegate interfaces until after we return from an OnClose notification .
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: 8355eeaa2191423f2bf8ec3355f99a04a104cece URL: http://source.winehq.org/git/wine.git/?a=commit;h=8355eeaa2191423f2bf8ec335… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 24 15:56:08 2008 +0000 ole32: Defer releasing the delegate interfaces until after we return from an OnClose notification. --- dlls/ole32/defaulthandler.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index ae36201..5c6f9b2 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -71,6 +71,12 @@ enum storage_state storage_state_loaded }; +enum object_state +{ + object_state_not_running, + object_state_running +}; + /**************************************************************************** * DefaultHandler * @@ -123,6 +129,7 @@ struct DefaultHandler IPersistStorage *pPSDelegate; /* IDataObject delegate */ IDataObject *pDataDelegate; + enum object_state object_state; /* connection cookie for the advise on the delegate OLE object */ DWORD dwAdvConn; @@ -452,7 +459,7 @@ static void DefaultHandler_Stop(DefaultHandler *This) if (This->dataAdviseHolder) DataAdviseHolder_OnDisconnect(This->dataAdviseHolder); - release_delegates(This); + This->object_state = object_state_not_running; } /************************************************************************ @@ -478,6 +485,7 @@ static HRESULT WINAPI DefaultHandler_Close( hr = IOleObject_Close(This->pOleDelegate, dwSaveOption); DefaultHandler_Stop(This); + release_delegates(This); return hr; } @@ -1305,11 +1313,15 @@ static HRESULT WINAPI DefaultHandler_Run( if (object_is_running(This)) return S_OK; + release_delegates(This); + hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER, &IID_IOleObject, (void **)&This->pOleDelegate); if (FAILED(hr)) return hr; + This->object_state = object_state_running; + hr = IOleObject_Advise(This->pOleDelegate, (IAdviseSink *)&This->lpvtblIAdviseSink, &This->dwAdvConn); @@ -1348,7 +1360,10 @@ static HRESULT WINAPI DefaultHandler_Run( hr = DataAdviseHolder_OnConnect(This->dataAdviseHolder, This->pDataDelegate); if (FAILED(hr)) + { DefaultHandler_Stop(This); + release_delegates(This); + } return hr; } @@ -1365,7 +1380,7 @@ static BOOL WINAPI DefaultHandler_IsRunning( TRACE("()\n"); - if (This->pOleDelegate) + if (This->object_state == object_state_running) return TRUE; else return FALSE; @@ -1943,6 +1958,7 @@ static DefaultHandler* DefaultHandler_Construct( This->pOleDelegate = NULL; This->pPSDelegate = NULL; This->pDataDelegate = NULL; + This->object_state = object_state_not_running; This->dwAdvConn = 0; This->storage = NULL; @@ -1956,6 +1972,7 @@ static void DefaultHandler_Destroy( { /* release delegates */ DefaultHandler_Stop(This); + release_delegates(This); HeapFree( GetProcessHeap(), 0, This->containerApp ); This->containerApp = NULL;

1 0

Alexandre Julliard : ntdll: Add support for virtual write watches.
by Alexandre Julliard 25 Nov '08

25 Nov '08

Module: wine Branch: master Commit: af8bb2e9222a79cc6ef2fa22c4eac75122eac5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8bb2e9222a79cc6ef2fa22c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 25 12:07:35 2008 +0100 ntdll: Add support for virtual write watches. --- dlls/kernel32/tests/virtual.c | 2 +- dlls/ntdll/virtual.c | 142 +++++++++++++++++++++++++++++++++++----- include/wine/server_protocol.h | 1 + server/protocol.def | 1 + 4 files changed, 128 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af8bb2e9222a79cc6ef2f…

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
74
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 November 2008