February 2007 - Wine-commits

Stefan Dösinger : d3d8: Set WINED3DPRESENT_PARAMETERS. MultiSampleQuality to a valid pointer.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: d74712690ce676561e365bf9a133aa5acae201bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74712690ce676561e365bf9a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 13:52:57 2007 +0100 d3d8: Set WINED3DPRESENT_PARAMETERS.MultiSampleQuality to a valid pointer. --- dlls/d3d8/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c7e9e20..9197ee8 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -274,6 +274,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(LPDIRECT3DD static HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; WINED3DPRESENT_PARAMETERS localParameters; + DWORD dummy_dword = 0; TRACE("(%p) Relay pPresentationParameters(%p)\n", This, pPresentationParameters); /* FINDME: FIXME: */ localParameters.BackBufferWidth = &pPresentationParameters->BackBufferWidth; @@ -281,7 +282,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRE localParameters.BackBufferFormat = (WINED3DFORMAT *)&pPresentationParameters->BackBufferFormat; localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; - localParameters.MultiSampleQuality = NULL; /* D3d9 only */ + localParameters.MultiSampleQuality = &dummy_dword; /* D3d9 only */ localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed;

1 0

Stefan Dösinger : wined3d: Read offscreen render targets upside down when blitting them to a texture.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 20a07693b5c6feddab7560432d23c21a550dc7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a07693b5c6feddab7560432… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 13:51:55 2007 +0100 wined3d: Read offscreen render targets upside down when blitting them to a texture. --- dlls/wined3d/surface.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 57a5b8a..a42d4ef 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2492,6 +2492,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * rect.x1 = tmp; upsideDown = !upsideDown; } + if(!srcSwapchain) { + TRACE("Reading from an offscreen target\n"); + upsideDown = !upsideDown; + } if(rect.x2 - rect.x1 != srect.x2 - srect.x1) { stretchx = TRUE;

1 0

Stefan Dösinger : wined3d: Convert the full surface for now.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 1f32d6235e4f12cdf805469ff77a9c27db7e1744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f32d6235e4f12cdf805469ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 13:52:21 2007 +0100 wined3d: Convert the full surface for now. Until we have proper subrectangle handling for offscreen surfaces, surface conversion has to use the real surface sizes, and not the size of the opengl subrectangle that it is going to upload. Due to the power of 2 limitations the gl height may be bigger than the real surface height. If that is not the case, the uploading function will pick the correct parts from the converted surface data. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a42d4ef..333712d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1714,7 +1714,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { pitch = IWineD3DSurface_GetPitch(iface); if((convert != NO_CONVERSION) && This->resource.allocatedMemory) { - int height = This->glRect.bottom - This->glRect.top; + int height = This->currentDesc.Height; /* Stick to the alignment for the converted surface too, makes it easier to load the surface */ outpitch = width * bpp;

1 0

Stefan Dösinger : 6/10: WineD3D: rsq and rcp instructions may need a default swizzle in arb.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 2f96220b3e76b28bd1baa4f1d17cdbcea57617f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f96220b3e76b28bd1baa4f1d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 13:50:59 2007 +0100 6/10: WineD3D: rsq and rcp instructions may need a default swizzle in arb. ARB shaders need a swizzle for the RSQ and RCP instructions, while d3d shaders do not. The DirectX sdk says that the x component is used if no swizzle is given. --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++++++++++++ dlls/wined3d/vertexshader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4742447..083c812 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -881,6 +881,27 @@ void vshader_hw_mnxn(SHADER_OPCODE_ARG* arg) { } } +void vshader_hw_rsq_rcp(SHADER_OPCODE_ARG* arg) { + CONST SHADER_OPCODE* curOpcode = arg->opcode; + SHADER_BUFFER* buffer = arg->buffer; + DWORD dst = arg->dst; + DWORD src = arg->src[0]; + DWORD swizzle = (src & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; + + char tmpLine[256]; + + strcpy(tmpLine, curOpcode->glname); /* Opcode */ + vshader_program_add_param(arg, dst, FALSE, tmpLine); /* Destination */ + strcat(tmpLine, ","); + vshader_program_add_param(arg, src, TRUE, tmpLine); + if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) == swizzle) { + /* Dx sdk says .x is used if no swizzle is given */ + strcat(tmpLine, ".x"); + } + + shader_addline(buffer, "%s;\n", tmpLine); +} + /* TODO: merge with pixel shader */ /* Map the opcode 1-to-1 to the GL code */ void vshader_hw_map2gl(SHADER_OPCODE_ARG* arg) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index eeeb743..37c92f4 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -483,8 +483,8 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { {WINED3DSIO_SUB, "sub", "SUB", 1, 3, vshader_sub, vshader_hw_map2gl, shader_glsl_arith, 0, 0}, {WINED3DSIO_MAD, "mad", "MAD", 1, 4, vshader_mad, vshader_hw_map2gl, shader_glsl_mad, 0, 0}, {WINED3DSIO_MUL, "mul", "MUL", 1, 3, vshader_mul, vshader_hw_map2gl, shader_glsl_arith, 0, 0}, - {WINED3DSIO_RCP, "rcp", "RCP", 1, 2, vshader_rcp, vshader_hw_map2gl, shader_glsl_rcp, 0, 0}, - {WINED3DSIO_RSQ, "rsq", "RSQ", 1, 2, vshader_rsq, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, + {WINED3DSIO_RCP, "rcp", "RCP", 1, 2, vshader_rcp, vshader_hw_rsq_rcp,shader_glsl_rcp, 0, 0}, + {WINED3DSIO_RSQ, "rsq", "RSQ", 1, 2, vshader_rsq, vshader_hw_rsq_rcp,shader_glsl_map2gl, 0, 0}, {WINED3DSIO_DP3, "dp3", "DP3", 1, 3, vshader_dp3, vshader_hw_map2gl, shader_glsl_dot, 0, 0}, {WINED3DSIO_DP4, "dp4", "DP4", 1, 3, vshader_dp4, vshader_hw_map2gl, shader_glsl_dot, 0, 0}, {WINED3DSIO_MIN, "min", "MIN", 1, 3, vshader_min, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3a2ee8a..ba01c02 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1601,6 +1601,7 @@ extern void pshader_hw_texm3x3vspec(SHADER_OPCODE_ARG* arg); /* ARB vertex shader prototypes */ extern void vshader_hw_map2gl(SHADER_OPCODE_ARG* arg); extern void vshader_hw_mnxn(SHADER_OPCODE_ARG* arg); +extern void vshader_hw_rsq_rcp(SHADER_OPCODE_ARG* arg); /* GLSL helper functions */ extern void shader_glsl_add_instruction_modifiers(SHADER_OPCODE_ARG *arg);

1 0

Stefan Dösinger : wined3d: Test for supported queries.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: a41ba013b6a262758ab41053b798dea11f9f65a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41ba013b6a262758ab41053b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 13:51:24 2007 +0100 wined3d: Test for supported queries. This test contains a table of known supported / known unsupported queries. In theory wined3d could just report the queries it supports, but applications may make some assumtions regarding supported / unsupported queries and stop working if they find a query unexpectadely supported or unsupported. It also tests what is supposed to happen if an unsupported query is created. --- dlls/d3d9/tests/Makefile.in | 1 + dlls/d3d9/tests/query.c | 169 +++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 54 +++++++------- 3 files changed, 197 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a41ba013b6a262758ab41…

1 0

Stefan Dösinger : ddraw: Handle mipmapped mag filters by ignoring the mipmap parameter.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 3b3e86536619aa558afb8078a3af529c3c85e582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3e86536619aa558afb8078a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 13:49:34 2007 +0100 ddraw: Handle mipmapped mag filters by ignoring the mipmap parameter. --- dlls/ddraw/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ab77a26..c201df7 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2300,9 +2300,11 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, switch ((D3DTEXTUREFILTER) Value) { case D3DFILTER_NEAREST: + case D3DFILTER_LINEARMIPNEAREST: tex_mag = WINED3DTEXF_POINT; break; case D3DFILTER_LINEAR: + case D3DFILTER_LINEARMIPLINEAR: tex_mag = WINED3DTEXF_LINEAR; break; default:

1 0

Stefan Dösinger : wined3d: Restore the display mode when releasing a swapchain.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 8e84127aedd6b32eb4b76ea22a07f648342ae2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e84127aedd6b32eb4b76ea22… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 13:53:33 2007 +0100 wined3d: Restore the display mode when releasing a swapchain. --- dlls/wined3d/device.c | 1 + dlls/wined3d/swapchain.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a80c3e7..4bfc07d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1288,6 +1288,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic object->orig_width = GetSystemMetrics(SM_CXSCREEN); object->orig_height = GetSystemMetrics(SM_CYSCREEN); + object->orig_fmt = pixelformat_for_depth(GetDeviceCaps(hDc, BITSPIXEL) * GetDeviceCaps(hDc, PLANES)); /** MSDN: If Windowed is TRUE and either of the BackBufferWidth/Height values is zero, * then the corresponding dimension of the client area of the hDeviceWindow diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 52271df..e99e096 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -104,6 +104,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_GetParent(IWineD3DSwapChain *iface, /*IWineD3DSwapChain parts follow: */ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB_DESTROYSURFACEFN D3DCB_DestroyRenderTarget) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; + WINED3DDISPLAYMODE mode; /* release the ref to the front and back buffer parents */ if(This->frontBuffer) { @@ -123,6 +124,18 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB } } + /* Restore the screen resolution if we rendered in fullscreen + * This will restore the screen resolution to what it was before creating the swapchain. In case of d3d8 and d3d9 + * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution + * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params + */ + if(This->presentParms.Windowed == FALSE) { + mode.Width = This->orig_width; + mode.Height = This->orig_height; + mode.RefreshRate = 0; + mode.Format = This->orig_fmt; + IWineD3DDevice_SetDisplayMode((IWineD3DDevice *) This->wineD3DDevice, 0, &mode); + } DestroyContext(This->wineD3DDevice, This->context); HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c20532e..3a2ee8a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1318,6 +1318,7 @@ typedef struct IWineD3DSwapChainImpl BOOL wantsDepthStencilBuffer; D3DPRESENT_PARAMETERS presentParms; DWORD orig_width, orig_height; + WINED3DFORMAT orig_fmt; long prev_time, frames; /* Performance tracking */

1 0

Stefan Dösinger : wined3d: Remove empty texture stage applying loop.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 19baae31592cc3cbc6cc85c76d55d5e3770a362b URL: http://source.winehq.org/git/wine.git/?a=commit;h=19baae31592cc3cbc6cc85c76… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 13:48:47 2007 +0100 wined3d: Remove empty texture stage applying loop. --- dlls/wined3d/basetexture.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 9b9b5d7..c55ceda 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -444,25 +444,6 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface } state++; } - - for(i = 0 ;textureObjectTextureStates[i].state != - 1; i++) { - if(*state != textureStates[textureObjectTextureStates[i].state] ) { - /* apply the state */ - *state = textureStates[textureObjectTextureStates[i].state]; - switch (textureObjectTextureStates[i].function) { - case WINED3DTSS_ADDRESSW: - /* I'm not sure what to do if this is set as well as ADDRESSW on the sampler, how do they interact together? */ - break; - case WINED3DFUNC_UNIMPLEMENTED: /* unimplemented */ - TRACE("(%p) : stub\n", This); - break; - case WINED3DFUNC_NOTSUPPORTED: /* nop */ - TRACE("(%p) : function no supported by this opengl implementation\n", This); - break; - } - } - state++; - } }

1 0

Stefan Dösinger : ddraw: Handle mipmapped TEXTUREMIN render states.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: c3d3dcec819e863c36a1e24d6a863c5e7ae88c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d3dcec819e863c36a1e24d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 13:53:08 2007 +0100 ddraw: Handle mipmapped TEXTUREMIN render states. --- dlls/ddraw/device.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index c1ff5cd..ab77a26 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2317,6 +2317,7 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, case D3DRENDERSTATE_TEXTUREMIN: { WINED3DTEXTUREFILTERTYPE tex_min = WINED3DTEXF_NONE; + WINED3DTEXTUREFILTERTYPE tex_mip = WINED3DTEXF_NONE; switch ((D3DTEXTUREFILTER) Value) { @@ -2326,10 +2327,30 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, case D3DFILTER_LINEAR: tex_min = WINED3DTEXF_LINEAR; break; + case D3DFILTER_MIPNEAREST: + tex_min = WINED3DTEXF_NONE; + tex_mip = WINED3DTEXF_POINT; + break; + case D3DFILTER_MIPLINEAR: + tex_min = WINED3DTEXF_NONE; + tex_mip = WINED3DTEXF_LINEAR; + break; + case D3DFILTER_LINEARMIPNEAREST: + tex_min = WINED3DTEXF_POINT; + tex_mip = WINED3DTEXF_LINEAR; + break; + case D3DFILTER_LINEARMIPLINEAR: + tex_min = WINED3DTEXF_LINEAR; + tex_mip = WINED3DTEXF_LINEAR; + break; + default: - ERR("Unhandled texture mag %d !\n",Value); + ERR("Unhandled texture min %d !\n",Value); } + IWineD3DDevice_SetSamplerState(This->wineD3DDevice, + 0, WINED3DSAMP_MIPFILTER, + tex_mip); return IWineD3DDevice_SetSamplerState(This->wineD3DDevice, 0, WINED3DSAMP_MINFILTER, tex_min);

1 0

Stefan Dösinger : ddraw: Forward D3DRS_TEXTUREADDRESS* and D3DTSS_ADDRESS* to sampler states.
by Alexandre Julliard 15 Feb '07

15 Feb '07

Module: wine Branch: master Commit: 7c40f9aaa242607596ad67254479c3dc7045639f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c40f9aaa242607596ad67254… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 15 13:48:23 2007 +0100 ddraw: Forward D3DRS_TEXTUREADDRESS* and D3DTSS_ADDRESS* to sampler states. --- dlls/ddraw/device.c | 99 +++++++++++++++++++++++++++------------------------ 1 files changed, 52 insertions(+), 47 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 12455fd..c1ff5cd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2195,28 +2195,15 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, return hr; } + case D3DRENDERSTATE_TEXTUREADDRESS: case D3DRENDERSTATE_TEXTUREADDRESSU: + return IWineD3DDevice_GetSamplerState(This->wineD3DDevice, + 0, WINED3DSAMP_ADDRESSU, + Value); case D3DRENDERSTATE_TEXTUREADDRESSV: - case D3DRENDERSTATE_TEXTUREADDRESS: - { - WINED3DTEXTURESTAGESTATETYPE TexStageStateType; - - if (RenderStateType == D3DRENDERSTATE_TEXTUREADDRESS) - { - TexStageStateType = WINED3DTSS_ADDRESS; - } - else if (RenderStateType == D3DRENDERSTATE_TEXTUREADDRESSU) - { - TexStageStateType = WINED3DTSS_ADDRESSU; - } - else - { - TexStageStateType = WINED3DTSS_ADDRESSV; - } - return IWineD3DDevice_GetTextureStageState(This->wineD3DDevice, - 0, TexStageStateType, - Value); - } + return IWineD3DDevice_GetSamplerState(This->wineD3DDevice, + 0, WINED3DSAMP_ADDRESSV, + Value); default: /* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */ @@ -2348,29 +2335,19 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, tex_min); } + case D3DRENDERSTATE_TEXTUREADDRESS: + IWineD3DDevice_SetSamplerState(This->wineD3DDevice, + 0, WINED3DSAMP_ADDRESSV, + Value); + /* Drop through */ case D3DRENDERSTATE_TEXTUREADDRESSU: + return IWineD3DDevice_SetSamplerState(This->wineD3DDevice, + 0, WINED3DSAMP_ADDRESSU, + Value); case D3DRENDERSTATE_TEXTUREADDRESSV: - case D3DRENDERSTATE_TEXTUREADDRESS: - { - WINED3DTEXTURESTAGESTATETYPE TexStageStateType; - - if (RenderStateType == D3DRENDERSTATE_TEXTUREADDRESS) - { - TexStageStateType = WINED3DTSS_ADDRESS; - } - else if (RenderStateType == D3DRENDERSTATE_TEXTUREADDRESSU) - { - TexStageStateType = WINED3DTSS_ADDRESSU; - } - else - { - TexStageStateType = WINED3DTSS_ADDRESSV; - } - - return IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, - 0, TexStageStateType, - Value); - } + return IWineD3DDevice_SetSamplerState(This->wineD3DDevice, + 0, WINED3DSAMP_ADDRESSV, + Value); case D3DRENDERSTATE_TEXTUREMAPBLEND: { @@ -4020,11 +3997,23 @@ IDirect3DDeviceImpl_7_GetTextureStageState(IDirect3DDevice7 *iface, Stage, WINED3DSAMP_MAGFILTER, State); + + case D3DTSS_ADDRESS: + case D3DTSS_ADDRESSU: + return IWineD3DDevice_GetSamplerState(This->wineD3DDevice, + Stage, + WINED3DSAMP_ADDRESSU, + State); + case D3DTSS_ADDRESSV: + return IWineD3DDevice_GetSamplerState(This->wineD3DDevice, + Stage, + WINED3DSAMP_ADDRESSV, + State); default: return IWineD3DDevice_GetTextureStageState(This->wineD3DDevice, - Stage, - TexStageStateType, - State); + Stage, + TexStageStateType, + State); } } @@ -4103,12 +4092,28 @@ IDirect3DDeviceImpl_7_SetTextureStageState(IDirect3DDevice7 *iface, WINED3DSAMP_MAGFILTER, State); + case D3DTSS_ADDRESS: + IWineD3DDevice_SetSamplerState(This->wineD3DDevice, + Stage, + WINED3DSAMP_ADDRESSV, + State); + /* Drop through */ + case D3DTSS_ADDRESSU: + return IWineD3DDevice_SetSamplerState(This->wineD3DDevice, + Stage, + WINED3DSAMP_ADDRESSU, + State); + case D3DTSS_ADDRESSV: + return IWineD3DDevice_SetSamplerState(This->wineD3DDevice, + Stage, + WINED3DSAMP_ADDRESSV, + State); default: return IWineD3DDevice_SetTextureStageState(This->wineD3DDevice, - Stage, - TexStageStateType, - State); + Stage, + TexStageStateType, + State); } }

1 0