February 2008 - Wine-Commits

Stefan Dösinger : wined3d: Recreate the contexts on _Reset.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: dcf08f01ed064732ada4ee618a16772b88cd4e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf08f01ed064732ada4ee618… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 5 00:05:26 2008 +0100 wined3d: Recreate the contexts on _Reset. --- dlls/wined3d/device.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 41af108..9d16156 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6776,6 +6776,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE BOOL DisplayModeChanged = FALSE; WINED3DDISPLAYMODE mode; IWineD3DBaseShaderImpl *shader; + IWineD3DSurfaceImpl *target; TRACE("(%p)\n", This); hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **) &swapchain); @@ -6846,6 +6847,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE } This->shader_backend->shader_destroy_depth_blt(iface); + while(This->numContexts) { + DestroyContext(This, This->contexts[0]); + } + This->activeContext = NULL; + HeapFree(GetProcessHeap(), 0, swapchain->context); + swapchain->context = NULL; + swapchain->num_contexts = 0; + if(pPresentationParameters->Windowed) { mode.Width = swapchain->orig_width; mode.Height = swapchain->orig_height; @@ -6910,6 +6919,22 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE swapchain->presentParms.Windowed = pPresentationParameters->Windowed; } + /* Recreate the primary swapchain's context */ + swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); + if(swapchain->backBuffer) { + target = (IWineD3DSurfaceImpl *) swapchain->backBuffer[0]; + } else { + target = (IWineD3DSurfaceImpl *) swapchain->frontBuffer; + } + swapchain->context[0] = CreateContext(This, target, swapchain->win_handle, FALSE, + &swapchain->presentParms); + swapchain->num_contexts = 1; + This->activeContext = swapchain->context[0]; + + /* All done. There is no need to reload resources or shaders, this will happen automatically on the + * first use + */ + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Move vertex buffer vbo creation to PreLoad.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: e7393a8a11c909e6ef8e817a944ba02d57417fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7393a8a11c909e6ef8e817a9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 8 22:54:54 2008 +0100 wined3d: Move vertex buffer vbo creation to PreLoad. --- dlls/wined3d/device.c | 91 +-------------------------------------- dlls/wined3d/vertexbuffer.c | 88 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 91 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7393a8a11c909e6ef8e8…

1 0

Stefan Dösinger : wined3d: Move the float format check to the big switch statement.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: b813398467bcb34d314e078afc71da3dc7e55661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b813398467bcb34d314e078af… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 4 00:31:52 2008 +0100 wined3d: Move the float format check to the big switch statement. --- dlls/wined3d/directx.c | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e4d8da2..622c17e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1929,23 +1929,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } - if (GL_SUPPORT(ARB_TEXTURE_FLOAT)) { - - BOOL half_pixel_support = GL_SUPPORT(ARB_HALF_FLOAT_PIXEL); - - switch (CheckFormat) { - case WINED3DFMT_R16F: - case WINED3DFMT_A16B16G16R16F: - if (!half_pixel_support) break; - case WINED3DFMT_R32F: - case WINED3DFMT_A32B32G32R32F: - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - default: - break; /* Avoid compiler warnings */ - } - } - /* This format is nothing special and it is supported perfectly. * However, ati and nvidia driver on windows do not mark this format as * supported (tested with the dxCapsViewer) and pretending to @@ -2046,10 +2029,8 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; /***** - * Float formats: Not supported right now + * WINED3DFMT_CxV8U8: Not supported right now */ - case WINED3DFMT_G16R16F: - case WINED3DFMT_G32R32F: case WINED3DFMT_CxV8U8: TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ return WINED3DERR_NOTAVAILABLE; @@ -2060,6 +2041,31 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ return WINED3DERR_NOTAVAILABLE; + /* Floating point formats */ + case WINED3DFMT_R16F: + case WINED3DFMT_A16B16G16R16F: + if(GL_SUPPORT(ARB_HALF_FLOAT_PIXEL)) { + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; + } else { + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + } + case WINED3DFMT_R32F: + case WINED3DFMT_A32B32G32R32F: + if (GL_SUPPORT(ARB_TEXTURE_FLOAT)) { + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; + } else { + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + } + + case WINED3DFMT_G16R16F: + case WINED3DFMT_G32R32F: + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + /* ATI instancing hack: Although ATI cards do not support Shader Model 3.0, they support * instancing. To query if the card supports instancing CheckDeviceFormat with the special format * MAKEFOURCC('I','N','S','T') is used. Should a (broken) app check for this provide a proper return value.

1 0

Stefan Dösinger : wined3d: Fix dxtn format check.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: bbeedca67e7a508fac3ca064b734ebe3a9d2b212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbeedca67e7a508fac3ca064b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 4 00:26:06 2008 +0100 wined3d: Fix dxtn format check. We can't return WINED3D_OK straight away because we have yet to check the other flags, like sRGB correction. --- dlls/wined3d/directx.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7312f9c..e4d8da2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1903,20 +1903,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3DERR_NOTAVAILABLE; } - if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { - switch (CheckFormat) { - case WINED3DFMT_DXT1: - case WINED3DFMT_DXT2: - case WINED3DFMT_DXT3: - case WINED3DFMT_DXT4: - case WINED3DFMT_DXT5: - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - default: - break; /* Avoid compiler warnings */ - } - } - /* Check for supported sRGB formats (Texture loading and framebuffer) */ if (Usage & WINED3DUSAGE_QUERY_SRGBREAD) { if(!GL_SUPPORT(EXT_TEXTURE_SRGB)) { @@ -2035,14 +2021,19 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt WARN_(d3d_caps)("[FAILED]\n"); return WINED3DERR_NOTAVAILABLE; - /***** - * DXTN Formats: Handled above - * WINED3DFMT_DXT1 - * WINED3DFMT_DXT2 - * WINED3DFMT_DXT3 - * WINED3DFMT_DXT4 - * WINED3DFMT_DXT5 - */ + case WINED3DFMT_DXT1: + case WINED3DFMT_DXT2: + case WINED3DFMT_DXT3: + case WINED3DFMT_DXT4: + case WINED3DFMT_DXT5: + if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; + } else { + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + } + /***** * Odd formats - not supported

1 0

Stefan Dösinger : wined3d: Correct the srgb reading check.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 9d9a640127585c63053d3d0a3914c2897e1dd517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9a640127585c63053d3d0a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 4 00:23:46 2008 +0100 wined3d: Correct the srgb reading check. --- dlls/wined3d/directx.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index afd012a..7312f9c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1918,7 +1918,11 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } /* Check for supported sRGB formats (Texture loading and framebuffer) */ - if (GL_SUPPORT(EXT_TEXTURE_SRGB) && (Usage & WINED3DUSAGE_QUERY_SRGBREAD)) { + if (Usage & WINED3DUSAGE_QUERY_SRGBREAD) { + if(!GL_SUPPORT(EXT_TEXTURE_SRGB)) { + TRACE_(d3d_caps)("[FAILED] GL_EXT_texture_sRGB not supported\n"); + } + switch (CheckFormat) { case WINED3DFMT_A8R8G8B8: case WINED3DFMT_X8R8G8B8: @@ -1931,7 +1935,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt case WINED3DFMT_DXT4: case WINED3DFMT_DXT5: TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; + break; /* Continue with checking other flags */ default: TRACE_(d3d_caps)("[FAILED] Gamma texture format %s not supported.\n", debug_d3dformat(CheckFormat));

1 0

Stefan Dösinger : d3d9/tests: Accept the rejection of non-standard fixed function attrib types.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: b6ecb56eefea776d440264b63f9a921cb20fc3d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ecb56eefea776d440264b63… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 4 23:35:07 2008 +0100 d3d9/tests: Accept the rejection of non-standard fixed function attrib types. --- dlls/d3d9/tests/visual.c | 67 ++++++++++++++++++++++++++++++---------------- 1 files changed, 44 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6ecb56eefea776d44026…

1 0

Stefan Dösinger : d3d9/tests: Be less picky about X8L8V8U8 precision.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 334e1600f270ac6faa2c92e59a77ecfef3e51562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=334e1600f270ac6faa2c92e59… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 1 02:29:32 2008 +0100 d3d9/tests: Be less picky about X8L8V8U8 precision. --- dlls/d3d9/tests/visual.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7277e37..9f9e54f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3079,7 +3079,8 @@ 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 || color == 0x008363ca, "D3DFMT_X8L8V8U8 = 0x112131ca returns color %08x, expected 0x008262ca\n", color); + ok(color == 0x008262ca || color == 0x008363ca || color == 0x008362ca, + "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: Some texture transform test corrections.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 8daf8322ba09ddf5fa6daf4d31069189efa837a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8daf8322ba09ddf5fa6daf4d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 1 01:52:17 2008 +0100 wined3d: Some texture transform test corrections. --- dlls/d3d9/tests/visual.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5396556..7277e37 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2365,7 +2365,9 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, 5 * sizeof(float)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); - /* What does this mean? Not sure... */ + /* D3DTFF_COUNT1 does not work on Nvidia drivers. It behaves like D3DTTFF_DISABLE. On ATI drivers + * it behaves like COUNT2 because normal textures require 2 coords + */ IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT1); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetTextureStageState failed (%08x)\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad4, 5 * sizeof(float)); @@ -2398,9 +2400,11 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) color = getPixelColor(device, 160, 120); ok(color == 0x00000000, "quad 2 has color %08x, expected 0x0000000\n", color); color = getPixelColor(device, 480, 120); - ok(color == 0x00ff8000 || color == 0x00fe7f00, "quad 3 has color %08x, expected 0x00ff8000\n", color); + ok(color == 0x00ff8000 || color == 0x00fe7f00 || color == 0x00000000, + "quad 3 has color %08x, expected 0x00ff8000\n", color); color = getPixelColor(device, 480, 360); - ok(color == 0x0033cc00 || color == 0x0032cb00, "quad 4 has color %08x, expected 0x0033cc00\n", color); + ok(color == 0x0033cc00 || color == 0x0032cb00 || color == 0x00FF0000 || color == 0x00FE0000, + "quad 4 has color %08x, expected 0x0033cc00\n", color); IDirect3DTexture9_Release(texture); @@ -2479,9 +2483,9 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) 1.0, 0.0, 0.1, 1.0, 1.0, 1.0 }; float mat[16] = {1.0, 0.0, 0.0, 0.0, - 0.0, 0.0, 1.0, 0.0, - 0.0, 1.0, 0.0, 0.0, - 0.0, 0.0, 0.0, 1.0}; + 0.0, 0.0, 1.0, 0.0, + 0.0, 1.0, 0.0, 0.0, + 0.0, 0.0, 0.0, 1.0}; hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed with %s\n", DXGetErrorString9(hr)); @@ -2498,7 +2502,8 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) /* Now disable the w coordinate. Does that change the input, or the output. The coordinates * are swapped by the matrix. If it changes the input, the v coord will be missing(green), * otherwise the w will be missing(blue). - * turns out that the blue color is missing, so it is an output modification + * turns out that on nvidia cards the blue color is missing, so it is an output modification. + * On ATI cards the COUNT2 is ignored, and it behaves in the same way as COUNT3. */ IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2); ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed (%08x)\n", hr); @@ -2515,7 +2520,9 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, 5 * sizeof(float)); ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); - /* D3DTTFF_COUNT1. Set a NULL matrix, and count1, pass in all values as 1.0 */ + /* D3DTTFF_COUNT1. Set a NULL matrix, and count1, pass in all values as 1.0. Nvidia has count1 == + * disable. ATI extends it up to the amount of values needed for the volume texture + */ memset(mat, 0, sizeof(mat)); hr = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0, (D3DMATRIX *) mat); ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform failed with %s\n", DXGetErrorString9(hr)); @@ -2535,11 +2542,12 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) color = getPixelColor(device, 160, 360); ok(color == 0x00ffffff, "quad 1 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x00ffff00, "quad 2 has color %08x, expected 0x00ffff00\n", color); + ok(color == 0x00ffff00 /* NV*/ || color == 0x00ffffff /* ATI */, + "quad 2 has color %08x, expected 0x00ffff00\n", color); color = getPixelColor(device, 480, 120); ok(color == 0x000000ff, "quad 3 has color %08x, expected 0x000000ff\n", color); color = getPixelColor(device, 480, 360); - ok(color == 0x00ffffff, "quad 4 has color %08x, expected 0x00ffffff\n", color); + ok(color == 0x00ffffff || color == 0x0000ff00, "quad 4 has color %08x, expected 0x00ffffff\n", color); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff303030, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %s\n", DXGetErrorString9(hr));

1 0

Stefan Dösinger : wined3d: D3DTADDRESS_WRAP on conditional NP2 textures clamps to edge.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 635daf8b5d15a6211360aef315b447ca5e610ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=635daf8b5d15a6211360aef31… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 1 01:16:45 2008 +0100 wined3d: D3DTADDRESS_WRAP on conditional NP2 textures clamps to edge. Conditional NP2 textures in Direct3D do not support D3DTADDRESS_WRAP texture addressing. Similarly, GL_ARB_texture_rectangle textures do not support GL_REPEAT. This patch adds a test which shows that _WRAP clamps to the texture edge and implements that. --- dlls/d3d9/tests/visual.c | 119 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/basetexture.c | 6 ++ 2 files changed, 125 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e3c22d3..5396556 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6057,6 +6057,124 @@ static void test_vshader_float16(IDirect3DDevice9 *device) IDirect3DVertexBuffer9_Release(buffer); } +static void conditional_np2_repeat_test(IDirect3DDevice9 *device) +{ + D3DCAPS9 caps; + IDirect3DTexture9 *texture; + HRESULT hr; + D3DLOCKED_RECT rect; + unsigned int x, y; + DWORD *dst, color; + const float quad[] = { + -1.0, -1.0, 0.1, -0.2, -0.2, + 1.0, -1.0, 0.1, 1.2, -0.2, + -1.0, 1.0, 0.1, -0.2, 1.2, + 1.0, 1.0, 0.1, 1.2, 1.2 + }; + memset(&caps, 0, sizeof(caps)); + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps failed hr=%s\n", DXGetErrorString9(hr)); + if(!(caps.TextureCaps & D3DPTEXTURECAPS_POW2)) { + /* NP2 conditional requires the POW2 flag. Check that while we're at it */ + ok((caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL) == 0, + "Card has conditional NP2 support without power of two restriction set\n"); + skip("Card has unconditional pow2 support, skipping conditional NP2 tests\n"); + return; + } else if(!(caps.TextureCaps & D3DPTEXTURECAPS_POW2)) { + skip("No conditional NP2 support, skipping conditional NP2 tests\n"); + return; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_CreateTexture(device, 10, 10, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed hr=%s\n", DXGetErrorString9(hr)); + + memset(&rect, 0, sizeof(rect)); + hr = IDirect3DTexture9_LockRect(texture, 0, &rect, NULL, 0); + ok(hr == D3D_OK, "IDirect3DTexture9_LockRect failed hr=%s\n", DXGetErrorString9(hr)); + for(y = 0; y < 10; y++) { + for(x = 0; x < 10; x++) { + dst = (DWORD *) ((BYTE *) rect.pBits + y * rect.Pitch + x * sizeof(DWORD)); + if(x == 0 || x == 9 || y == 0 || y == 9) { + *dst = 0x00ff0000; + } else { + *dst = 0x000000ff; + } + } + } + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(hr == D3D_OK, "IDirect3DTexture9_UnlockRect failed hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSU, D3DTADDRESS_WRAP); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_ADDRESSV, D3DTADDRESS_WRAP); + ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed hr=%s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(float) * 5); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed hr=%s\n", DXGetErrorString9(hr)); + } + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + + color = getPixelColor(device, 1, 1); + ok(color == 0x00ff0000, "NP2: Pixel 1, 1 has color %08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 639, 479); + ok(color == 0x00ff0000, "NP2: Pixel 639, 479 has color %08x, expected 0x00ff0000\n", color); + + color = getPixelColor(device, 135, 101); + ok(color == 0x00ff0000, "NP2: Pixel 135, 101 has color %08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 140, 101); + ok(color == 0x00ff0000, "NP2: Pixel 140, 101 has color %08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 135, 105); + ok(color == 0x00ff0000, "NP2: Pixel 135, 105 has color %08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 140, 105); + ok(color == 0x000000ff, "NP2: Pixel 140, 105 has color %08x, expected 0x000000ff\n", color); + + color = getPixelColor(device, 135, 376); + ok(color == 0x00ff0000, "NP2: Pixel 135, 376 has color %08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 140, 376); + ok(color == 0x000000ff, "NP2: Pixel 140, 376 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 135, 379); + ok(color == 0x00ff0000, "NP2: Pixel 135, 379 has color %08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 140, 379); + ok(color == 0x00ff0000, "NP2: Pixel 140, 379 has color %08x, expected 0x00ff0000\n", color); + + color = getPixelColor(device, 500, 101); + ok(color == 0x00ff0000, "NP2: Pixel 500, 101 has color %08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 504, 101); + ok(color == 0x00ff0000, "NP2: Pixel 504, 101 has color %08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 500, 105); + ok(color == 0x000000ff, "NP2: Pixel 500, 105 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 504, 105); + ok(color == 0x00ff0000, "NP2: Pixel 504, 105 has color %08x, expected 0x00ff0000\n", color); + + color = getPixelColor(device, 500, 376); + ok(color == 0x000000ff, "NP2: Pixel 500, 376 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 504, 376); + ok(color == 0x00ff0000, "NP2: Pixel 504, 376 has color %08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 500, 380); + ok(color == 0x00ff0000, "NP2: Pixel 500, 380 has color %08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 504, 380); + ok(color == 0x00ff0000, "NP2: Pixel 504, 380 has color %08x, expected 0x00ff0000\n", color); + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed hr=%s\n", DXGetErrorString9(hr)); + IDirect3DTexture9_Release(texture); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -6138,6 +6256,7 @@ START_TEST(visual) texture_transform_flags_test(device_ptr); autogen_mipmap_test(device_ptr); fixed_function_decl_test(device_ptr); + conditional_np2_repeat_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) { diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 8015f7d..34b6cba 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -374,6 +374,12 @@ static inline void apply_wrap(const GLint textureDimensions, const DWORD state, if(textureDimensions==GL_TEXTURE_CUBE_MAP_ARB) { /* Cubemaps are always set to clamp, regardless of the sampler state. */ wrapParm = GL_CLAMP_TO_EDGE; + } else if(textureDimensions==GL_TEXTURE_RECTANGLE_ARB) { + if(state == WINED3DTADDRESS_WRAP) { + wrapParm = GL_CLAMP_TO_EDGE; + } else { + wrapParm = stateLookup[WINELOOKUP_WARPPARAM][state - minLookup[WINELOOKUP_WARPPARAM]]; + } } else { wrapParm = stateLookup[WINELOOKUP_WARPPARAM][state - minLookup[WINELOOKUP_WARPPARAM]]; }

1 0

Stefan Dösinger : wined3d: Update the gl rectangle when adjusting surface sizes.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 08391b82c1b8a162c8e9c24a771a6a2e8a8ec3f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08391b82c1b8a162c8e9c24a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 27 21:26:07 2008 +0100 wined3d: Update the gl rectangle when adjusting surface sizes. --- dlls/wined3d/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c159674..ff99201 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6795,6 +6795,11 @@ static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAM while (surface->pow2Width < pPresentationParameters->BackBufferWidth) surface->pow2Width <<= 1; while (surface->pow2Height < pPresentationParameters->BackBufferHeight) surface->pow2Height <<= 1; } + surface->glRect.left = 0; + surface->glRect.top = 0; + surface->glRect.right = surface->pow2Width; + surface->glRect.bottom = surface->pow2Height; + if(surface->glDescription.textureName) { ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); ENTER_GL();

1 0