April 2008 - Wine-Commits - list.winehq.org

Stefan Dösinger : ddraw: Pass the NULL rectangle to IDirectDrawSurface::Unlock.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 2e26c176ec61a25856a0a426074a667c803bf87c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e26c176ec61a25856a0a4260… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 22:47:26 2008 +0100 ddraw: Pass the NULL rectangle to IDirectDrawSurface::Unlock. --- dlls/ddraw/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 08852d4..dc4ff47 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -175,7 +175,7 @@ static DWORD getPixelColor(IDirect3DDevice7 *device, UINT x, UINT y) * really important for these tests */ ret = ((DWORD *) ddsd.lpSurface)[0] & 0x00ffffff; - hr = IDirectDrawSurface7_Unlock(surf, &rectToLock); + hr = IDirectDrawSurface7_Unlock(surf, NULL); if(FAILED(hr)) { trace("Can't unlock the offscreen surface, hr=%08x\n", hr); @@ -971,7 +971,7 @@ static DWORD D3D1_getPixelColor(IDirectDraw *DirectDraw1, IDirectDrawSurface *Su * really important for these tests */ ret = ((DWORD *) ddsd.lpSurface)[0] & 0x00ffffff; - hr = IDirectDrawSurface_Unlock(surf, &rectToLock); + hr = IDirectDrawSurface_Unlock(surf, NULL); if(FAILED(hr)) { trace("Can't unlock the offscreen surface, hr=%08x\n", hr);

1 0

Stefan Dösinger : ddraw: Add a D3D7 cube map test.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: ab7630fbe373426f00d1083f54325eac9499fbfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7630fbe373426f00d1083f5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 22:36:27 2008 +0100 ddraw: Add a D3D7 cube map test. The DirectDraw cube mapping interface has a few pitfalls. So far we have a test testing the surface enumeration, this adds a rendering test. So far everything used in the test works. --- dlls/ddraw/tests/visual.c | 155 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 155 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 580bf88..08852d4 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1915,6 +1915,160 @@ static void p8_primary_test() if(window) DestroyWindow(window); } +static void cubemap_test(IDirect3DDevice7 *device) +{ + IDirect3D7 *d3d; + IDirectDraw7 *ddraw; + IDirectDrawSurface7 *cubemap, *surface; + D3DDEVICEDESC7 d3dcaps; + HRESULT hr; + DWORD color; + DDSURFACEDESC2 ddsd; + DDBLTFX DDBltFx; + DDSCAPS2 caps; + static float quad[] = { + -1.0, -1.0, 0.1, 1.0, 0.0, 0.0, /* Lower left */ + 0.0, -1.0, 0.1, 1.0, 0.0, 0.0, + -1.0, 0.0, 0.1, 1.0, 0.0, 0.0, + 0.0, 0.0, 0.1, 1.0, 0.0, 0.0, + + 0.0, -1.0, 0.1, 0.0, 1.0, 0.0, /* Lower right */ + 1.0, -1.0, 0.1, 0.0, 1.0, 0.0, + 0.0, 0.0, 0.1, 0.0, 1.0, 0.0, + 1.0, 0.0, 0.1, 0.0, 1.0, 0.0, + + 0.0, 0.0, 0.1, 0.0, 0.0, 1.0, /* upper right */ + 1.0, 0.0, 0.1, 0.0, 0.0, 1.0, + 0.0, 1.0, 0.1, 0.0, 0.0, 1.0, + 1.0, 1.0, 0.1, 0.0, 0.0, 1.0, + + -1.0, 0.0, 0.1, -1.0, 0.0, 0.0, /* Upper left */ + 0.0, 0.0, 0.1, -1.0, 0.0, 0.0, + -1.0, 1.0, 0.1, -1.0, 0.0, 0.0, + 0.0, 1.0, 0.1, -1.0, 0.0, 0.0, + }; + + memset(&DDBltFx, 0, sizeof(DDBltFx)); + DDBltFx.dwSize = sizeof(DDBltFx); + + memset(&d3dcaps, 0, sizeof(d3dcaps)); + hr = IDirect3DDevice7_GetCaps(device, &d3dcaps); + ok(hr == D3D_OK, "IDirect3DDevice7_GetCaps returned %08x\n", hr); + if(!(d3dcaps.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("No cubemap support\n"); + return; + } + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr); + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(hr == D3D_OK, "IDirect3DDevice7_GetDirect3D returned %08x\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **) &ddraw); + ok(hr == D3D_OK, "IDirect3D7_QueryInterface returned %08x\n", hr); + IDirect3D7_Release(d3d); + + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX; + ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_TEXTUREMANAGE; + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + ddsd.ddpfPixelFormat.dwRGBBitCount = 32; + ddsd.ddpfPixelFormat.dwRBitMask = 0x00FF0000; + ddsd.ddpfPixelFormat.dwGBitMask = 0x0000FF00; + ddsd.ddpfPixelFormat.dwBBitMask = 0x000000FF; + + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &cubemap, NULL); + ok(hr == DD_OK, "IDirectDraw7_CreateSurface returned %08x\n", hr); + IDirectDraw7_Release(ddraw); + + /* Positive X */ + DDBltFx.dwFillColor = 0x00ff0000; + hr = IDirectDrawSurface7_Blt(cubemap, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_TEXTURE; + caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEX; + hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); + DDBltFx.dwFillColor = 0x0000ffff; + hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEZ; + hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); + DDBltFx.dwFillColor = 0x0000ff00; + hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEZ; + hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); + DDBltFx.dwFillColor = 0x000000ff; + hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEY; + hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); + DDBltFx.dwFillColor = 0x00ffff00; + hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEY; + hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); + ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); + DDBltFx.dwFillColor = 0x00ff00ff; + hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + hr = IDirect3DDevice7_SetTexture(device, 0, cubemap); + ok(hr == DD_OK, "IDirect3DDevice7_SetTexture returned %08x\n", hr); + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == DD_OK, "IDirect3DDevice7_SetTextureStageState returned %08x\n", hr); + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == DD_OK, "IDirect3DDevice7_SetTextureStageState returned %08x\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == DD_OK, "IDirect3DDevice7_BeginScene returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEX1, quad + 0 * 6, 4, 0); + ok(hr == DD_OK, "IDirect3DDevice7_DrawPrimitive returned %08x\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEX1, quad + 4 * 6, 4, 0); + ok(hr == DD_OK, "IDirect3DDevice7_DrawPrimitive returned %08x\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEX1, quad + 8 * 6, 4, 0); + ok(hr == DD_OK, "IDirect3DDevice7_DrawPrimitive returned %08x\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEX1, quad + 12* 6, 4, 0); + ok(hr == DD_OK, "IDirect3DDevice7_DrawPrimitive returned %08x\n", hr); + + hr = IDirect3DDevice7_EndScene(device); + ok(hr == DD_OK, "IDirect3DDevice7_EndScene returned %08x\n", hr); + } + hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == DD_OK, "IDirect3DDevice7_SetTextureStageState returned %08x\n", hr); + + color = getPixelColor(device, 160, 360); /* lower left quad - positivex */ + ok(color == 0x00ff0000, "DDSCAPS2_CUBEMAP_POSITIVEX has color 0x%08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 160, 120); /* upper left quad - negativex */ + ok(color == 0x0000ffff, "DDSCAPS2_CUBEMAP_NEGATIVEX has color 0x%08x, expected 0x0000ffff\n", color); + color = getPixelColor(device, 480, 360); /* lower right quad - positivey */ + ok(color == 0x00ff00ff, "DDSCAPS2_CUBEMAP_POSITIVEY has color 0x%08x, expected 0x00ff00ff\n", color); + color = getPixelColor(device, 480, 120); /* upper right quad - positivez */ + ok(color == 0x000000ff, "DDSCAPS2_CUBEMAP_POSITIVEZ has color 0x%08x, expected 0x000000ff\n", color); + hr = IDirect3DDevice7_SetTexture(device, 0, NULL); + ok(hr == DD_OK, "IDirect3DDevice7_SetTexture returned %08x\n", hr); + IDirectDrawSurface7_Release(cubemap); +} + START_TEST(visual) { HRESULT hr; @@ -1961,6 +2115,7 @@ START_TEST(visual) offscreen_test(Direct3DDevice); alpha_test(Direct3DDevice); rhw_zero_test(Direct3DDevice); + cubemap_test(Direct3DDevice); releaseObjects(); /* release DX7 interfaces to test D3D1 */

1 0

Stefan Dösinger : d3d9: Make the shading test even more precision tolerant.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 685d14818c33f1952612ca36ed76fef9397ea9fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=685d14818c33f1952612ca36e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 13:56:56 2008 +0100 d3d9: Make the shading test even more precision tolerant. This is needed on both windows and wine, seems to be a hardware thing. --- dlls/d3d9/tests/visual.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index da4d7ab..418e92c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1,6 +1,6 @@ /* * Copyright 2005, 2007 Henri Verbeet - * Copyright (C) 2007 Stefan D�singer(for CodeWeavers) + * Copyright (C) 2007-2008 Stefan D�singer(for CodeWeavers) * Copyright (C) 2008 Jason Green(for TransGaming) * * This library is free software; you can redistribute it and/or @@ -6426,12 +6426,12 @@ static void shademode_test(IDirect3DDevice9 *device) r = (color0 & 0x00ff0000) >> 16; g = (color0 & 0x0000ff00) >> 8; b = (color0 & 0x000000ff); - ok(r >= 0x0d && r <= 0x0e && g == 0xca && b >= 0x27 && b <= 0x28, + ok(r >= 0x0c && r <= 0x0e && g == 0xca && b >= 0x27 && b <= 0x28, "GOURAUD shading has color0 %08x, expected 0x000dca28\n", color0); r = (color1 & 0x00ff0000) >> 16; g = (color1 & 0x0000ff00) >> 8; b = (color1 & 0x000000ff); - ok(r == 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, + ok(r >= 0x0c && r <= 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, "GOURAUD shading has color1 %08x, expected 0x000d45c7\n", color1); color0_gouraud = color0; @@ -6444,12 +6444,12 @@ static void shademode_test(IDirect3DDevice9 *device) r = (color0 & 0x00ff0000) >> 16; g = (color0 & 0x0000ff00) >> 8; b = (color0 & 0x000000ff); - ok(r >= 0x0d && r <= 0x0e && g == 0xca && b >= 0x27 && b <= 0x28, + ok(r >= 0x0c && r <= 0x0e && g == 0xca && b >= 0x27 && b <= 0x28, "PHONG shading has color0 %08x, expected 0x000dca28\n", color0); r = (color1 & 0x00ff0000) >> 16; g = (color1 & 0x0000ff00) >> 8; b = (color1 & 0x000000ff); - ok(r == 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, + ok(r >= 0x0c && r <= 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, "PHONG shading has color1 %08x, expected 0x000d45c7\n", color1); ok(color0 == color0_gouraud, "difference between GOURAUD and PHONG shading detected: %08x %08x\n",

1 0

Stefan Dösinger : wined3d: Update copyright lines.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: b1d8af7926554c363223b062af47fd206df1f601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d8af7926554c363223b062a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 02:36:13 2008 +0100 wined3d: Update copyright lines. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/baseshader.c | 1 + dlls/wined3d/basetexture.c | 1 + dlls/wined3d/context.c | 2 +- dlls/wined3d/cubetexture.c | 1 + dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 1 + dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/indexbuffer.c | 1 + dlls/wined3d/pixelshader.c | 1 + dlls/wined3d/query.c | 3 +-- dlls/wined3d/state.c | 2 +- dlls/wined3d/stateblock.c | 1 + dlls/wined3d/surface.c | 2 +- dlls/wined3d/surface_base.c | 2 +- dlls/wined3d/swapchain.c | 1 + dlls/wined3d/texture.c | 1 + dlls/wined3d/utils.c | 1 + dlls/wined3d/vertexbuffer.c | 1 + dlls/wined3d/vertexshader.c | 1 + dlls/wined3d/wined3d_main.c | 1 + 22 files changed, 22 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1d8af7926554c363223b…

1 0

Stefan Dösinger : wined3d: Implement TSSARGTEMP with register combiners.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: bd68237096eb7731239359a2b4941163be015f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd68237096eb7731239359a2b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 13:55:59 2008 +0100 wined3d: Implement TSSARGTEMP with register combiners. --- dlls/wined3d/baseshader.c | 6 +++- dlls/wined3d/state.c | 34 ++++++++++------------------- dlls/wined3d/utils.c | 46 ++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 43 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd68237096eb773123935…

1 0

Stefan Dösinger : wined3d: Do not report pixel shaders if not supported.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 0f1c2370b11d913c862ce8dc151f5392e8bf5eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f1c2370b11d913c862ce8dc1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 1 16:02:10 2008 +0200 wined3d: Do not report pixel shaders if not supported. --- dlls/wined3d/arb_program_shader.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8868dac..e372cdc 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2049,13 +2049,17 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_info */ none_shader_backend.shader_get_caps(devtype, gl_info, pCaps); - pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); - TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); - pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF); + if(GL_SUPPORT(ARB_VERTEX_PROGRAM)) { + pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); + TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); + pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF); + } - pCaps->PixelShaderVersion = WINED3DPS_VERSION(1,4); - pCaps->PixelShader1xMaxValue = 8.0; - TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); + if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) { + pCaps->PixelShaderVersion = WINED3DPS_VERSION(1,4); + pCaps->PixelShader1xMaxValue = 8.0; + TRACE_(d3d_caps)("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); + } } static void shader_arb_load_init(void) {

1 0

Stefan Dösinger : wined3d: Prepare the atifs shader generator for temp register support.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 8f9a14e312a382be1c7e33720c92eecb5165a8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9a14e312a382be1c7e33720… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 00:41:07 2008 +0100 wined3d: Prepare the atifs shader generator for temp register support. --- dlls/wined3d/ati_fragment_shader.c | 249 ++++++++++++++++++++++-------------- 1 files changed, 152 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f9a14e312a382be1c7e3…

1 0

Stefan Dösinger : wined3d: Implement D3DTA_TEMP in the GL_ATI_fragment_shader codepath.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 287f60a2b20902d5e3b12b5236927e8faf929623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287f60a2b20902d5e3b12b523… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 29 23:55:09 2008 +0100 wined3d: Implement D3DTA_TEMP in the GL_ATI_fragment_shader codepath. --- dlls/wined3d/ati_fragment_shader.c | 78 +++++++++++++++++++++++++++++++++++- dlls/wined3d/baseshader.c | 9 ++++ dlls/wined3d/directx.c | 11 +---- dlls/wined3d/utils.c | 3 + dlls/wined3d/wined3d_private.h | 3 + 5 files changed, 94 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index d483c22..cd6f892 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -208,13 +208,73 @@ static GLuint register_for_arg(DWORD arg, WineD3D_GL_Info *gl_info, unsigned int return ret; } +static GLuint find_tmpreg(struct texture_stage_op op[MAX_TEXTURES]) { + int lowest_read = -1; + int lowest_write = -1; + int i; + BOOL tex_used[MAX_TEXTURES]; + + memset(tex_used, 0, sizeof(tex_used)); + for(i = 0; i < MAX_TEXTURES; i++) { + if(op[i].cop == WINED3DTOP_DISABLE) { + break; + } + + if(lowest_read == -1 && + (op[i].carg1 == WINED3DTA_TEMP || op[i].carg2 == WINED3DTA_TEMP || op[i].carg0 == WINED3DTA_TEMP || + op[i].aarg1 == WINED3DTA_TEMP || op[i].aarg2 == WINED3DTA_TEMP || op[i].aarg0 == WINED3DTA_TEMP)) { + lowest_read = i; + } + + if(lowest_write == -1 && op[i].dst == WINED3DTA_TEMP) { + lowest_write = i; + } + + if(op[i].carg1 == WINED3DTA_TEXTURE || op[i].carg2 == WINED3DTA_TEXTURE || op[i].carg0 == WINED3DTA_TEXTURE || + op[i].aarg1 == WINED3DTA_TEXTURE || op[i].aarg2 == WINED3DTA_TEXTURE || op[i].aarg0 == WINED3DTA_TEXTURE) { + tex_used[i] = TRUE; + } + } + + /* Temp reg not read? We don't need it, return GL_NONE */ + if(lowest_read == -1) return GL_NONE; + + if(lowest_write >= lowest_read) { + FIXME("Temp register read before beeing written\n"); + } + + if(lowest_write == -1) { + /* This needs a test. Maybe we are supposed to return 0.0/0.0/0.0/0.0, or fail drawprim, or whatever */ + FIXME("Temp register read without beeing written\n"); + return GL_REG_1_ATI; + } else if(lowest_write >= 1) { + /* If we're writing to the temp reg at earliest in stage 1, we can use register 1 for the temp result. + * there may be texture data stored in reg 1, but we do not need it any longer since stage 1 already + * read it + */ + return GL_REG_1_ATI; + } else { + /* Search for a free texture register. We have 6 registers available. GL_REG_0_ATI is already used + * for the regular result + */ + for(i = 1; i < 6; i++) { + if(!tex_used[i]) { + return GL_REG_0_ATI + i; + } + } + /* What to do here? Report it in ValidateDevice? */ + FIXME("Could not find a register for the temporary register\n"); + return 0; + } +} + static GLuint gen_ati_shader(struct texture_stage_op op[MAX_TEXTURES], WineD3D_GL_Info *gl_info) { GLuint ret = GL_EXTCALL(glGenFragmentShadersATI(1)); unsigned int stage; GLuint arg0, arg1, arg2, extrarg; GLuint dstmod, argmod0, argmod1, argmod2, argmodextra; GLuint swizzle; - GLuint tmparg = -1; + GLuint tmparg = find_tmpreg(op); GLuint dstreg; if(!ret) { @@ -358,7 +418,16 @@ static GLuint gen_ati_shader(struct texture_stage_op op[MAX_TEXTURES], WineD3D_G break; } - dstreg = GL_REG_0_ATI; + if(op[stage].dst == WINED3DTA_TEMP) { + /* If we're writing to D3DTA_TEMP, but never reading from it we don't have to write there in the first place. + * skip the entire stage, this saves some GPU time + */ + if(tmparg == GL_NONE) continue; + + dstreg = tmparg; + } else { + dstreg = GL_REG_0_ATI; + } arg0 = register_for_arg(op[stage].carg0, gl_info, stage, &argmod0, tmparg); arg1 = register_for_arg(op[stage].carg1, gl_info, stage, &argmod1, tmparg); @@ -803,6 +872,9 @@ static void init_state_table() { ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_ALPHAARG0)].apply = set_tex_op_atifs; ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_ALPHAARG0)].representative = rep; + ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_RESULTARG)].apply = set_tex_op_atifs; + ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_RESULTARG)].representative = rep; + ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT00)].apply = set_bumpmat; ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT01)].apply = set_bumpmat; ATIFSStateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT10)].apply = set_bumpmat; @@ -942,6 +1014,8 @@ static void shader_atifs_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_in WARN("but GL_ATI_fragment_shader limits this to 6\n"); caps->MaxSimultaneousTextures = 6; } + + caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; } static void shader_atifs_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer) { diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 678b119..4bb1ee7 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1169,6 +1169,15 @@ static void shader_none_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_inf pCaps->VertexShaderVersion = 0; pCaps->PixelShaderVersion = 0; pCaps->PixelShader1xMaxValue = 0.0; + + /* The caps below can be supported but aren't handled yet in utils.c 'd3dta_to_combiner_input', disable them until support is fixed */ +#if 0 + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) + pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; + if (GL_SUPPORT(NV_REGISTER_COMBINERS2)) + pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_PERSTAGECONSTANT; +#endif + } #undef GLINFO_LOCATION diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6baf8d3..8cb8ca6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2791,14 +2791,6 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, if(GL_SUPPORT(EXT_BLEND_EQUATION_SEPARATE) && GL_SUPPORT(EXT_BLEND_FUNC_SEPARATE)) pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_SEPARATEALPHABLEND; -/* The caps below can be supported but aren't handled yet in utils.c 'd3dta_to_combiner_input', disable them until support is fixed */ -#if 0 - if (GL_SUPPORT(NV_REGISTER_COMBINERS)) - pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_TSSARGTEMP; - if (GL_SUPPORT(NV_REGISTER_COMBINERS2)) - pCaps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_PERSTAGECONSTANT; -#endif - pCaps->RasterCaps = WINED3DPRASTERCAPS_DITHER | WINED3DPRASTERCAPS_PAT | WINED3DPRASTERCAPS_WFOG | @@ -3089,6 +3081,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, shader_backend = select_shader_backend(Adapter, DeviceType); shader_backend->shader_get_caps(DeviceType, &GLINFO_LOCATION, &shader_caps); + /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ + pCaps->PrimitiveMiscCaps |= shader_caps.PrimitiveMiscCaps; + /* This takes care for disabling vertex shader or pixel shader caps while leaving the other one enabled. * Ignore shader model capabilities if disabled in config */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d0285df..f55ca14 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3271,6 +3271,7 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct texture_stage_op op[M op[i].carg0 = op[i].carg1 = op[i].carg2 = 0xffffffff; op[i].aarg0 = op[i].aarg1 = op[i].aarg2 = 0xffffffff; op[i].color_correction = WINED3DFMT_UNKNOWN; + op[i].dst = 0xffffffff; i++; break; } @@ -3344,6 +3345,8 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct texture_stage_op op[M } else { op[i].projected = proj_none; } + + op[i].dst = stateblock->textureState[i][WINED3DTSS_RESULTARG]; } /* Clear unsupported stages */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3f4910..0044bab 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -259,6 +259,8 @@ typedef struct SHADER_BUFFER { } SHADER_BUFFER; struct shader_caps { + DWORD PrimitiveMiscCaps; + DWORD TextureOpCaps; DWORD MaxTextureBlendStages; DWORD MaxSimultaneousTextures; @@ -730,6 +732,7 @@ struct texture_stage_op DWORD carg1, carg2, carg0; DWORD aarg1, aarg2, aarg0; WINED3DFORMAT color_correction; + DWORD dst; enum projection_types projected; };

1 0

Stefan Dösinger : d3d9: Add a test for temporary results.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: 20a2afe6aacaac5596bf58e1e9b4a60bcd3bb606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a2afe6aacaac5596bf58e1e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 1 16:00:20 2008 +0200 d3d9: Add a test for temporary results. --- dlls/d3d9/tests/visual.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 20f3b4e..da4d7ab 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8561,6 +8561,82 @@ out: } } +static void tssargtemp_test(IDirect3DDevice9 *device) +{ + HRESULT hr; + DWORD color; + static const struct vertex quad[] = { + {-1.0, -1.0, 0.1, 0x00ff0000}, + { 1.0, -1.0, 0.1, 0x00ff0000}, + {-1.0, 1.0, 0.1, 0x00ff0000}, + { 1.0, 1.0, 0.1, 0x00ff0000} + }; + D3DCAPS9 caps; + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps failed with %s\n", DXGetErrorString9(hr)); + if(!(caps.PrimitiveMiscCaps & D3DPMISCCAPS_TSSARGTEMP)) { + skip("D3DPMISCCAPS_TSSARGTEMP not supported\n"); + return; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLORARG1, D3DTA_TFACTOR); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_RESULTARG, D3DTA_TEMP); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTextureStageState(device, 2, D3DTSS_COLOROP, D3DTOP_ADD); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 2, D3DTSS_COLORARG1, D3DTA_CURRENT); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 2, D3DTSS_COLORARG2, D3DTA_TEMP); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetTextureStageState(device, 3, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0x0000ff00); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF 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_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed with %s\n", DXGetErrorString9(hr)); + } + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 320, 240); + ok(color == 0x00FFFF00, "TSSARGTEMP test returned color 0x%08x, expected 0x00FFFF00\n", color); + + /* Set stage 1 back to default */ + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_RESULTARG, D3DTA_CURRENT); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 2, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetTextureStageState(device, 3, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -8654,6 +8730,7 @@ START_TEST(visual) skip("No two sided stencil support\n"); } pointsize_test(device_ptr); + tssargtemp_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) {

1 0

Alexandre Julliard : wordpad: Display the larger icon in the about box.
by Alexandre Julliard April 2, 2008

April 2, 2008

Module: wine Branch: master Commit: a54ac90000ec9ecfde1ca2600d22b8c0e3e1c5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54ac90000ec9ecfde1ca2600… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 20:05:33 2008 +0200 wordpad: Display the larger icon in the about box. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 2df6ea7..b03ae2e 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -883,7 +883,7 @@ static void DialogOpenFile(void) static void dialog_about(void) { HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); - HICON icon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD)); + HICON icon = LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, 48, 48, LR_SHARED); ShellAboutW(hMainWnd, wszAppTitle, 0, icon); }

1 0