March 2015 - Wine-Commits - list.winehq.org

Matteo Bruni : d3d8/tests: Add more lighting tests.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 848991fc111ac3f0f9d87b5c6cb7148c357a1004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=848991fc111ac3f0f9d87b5c6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 26 20:12:19 2015 +0100 d3d8/tests: Add more lighting tests. --- dlls/d3d8/tests/visual.c | 116 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 99 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index d8382f7..737bb91 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -224,15 +224,43 @@ static void lighting_test(void) {{0.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, {{1.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + }, + nquad[] = + { + {{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + }, + rotatedquad[] = + { + {{-10.0f, -11.0f, 11.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, + {{-10.0f, -9.0f, 11.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, + {{-10.0f, -9.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, + {{-10.0f, -11.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, }; - static const WORD Indices[] = {0, 1, 2, 2, 3, 0}; + static const WORD indices[] = {0, 1, 2, 2, 3, 0}; static const D3DMATRIX mat = {{{ 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, - }}}; + }}}, + mat_singular = + {{{ + 1.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 1.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}, + mat_transf = + {{{ + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + -1.0f, 0.0f, 0.0f, 0.0f, + 10.f, 10.0f, 10.0f, 1.0f, + }}}; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -247,7 +275,6 @@ static void lighting_test(void) hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed with %#08x\n", hr); - /* Setup some states that may cause issues */ hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLDMATRIX(0), &mat); ok(hr == D3D_OK, "IDirect3DDevice8_SetTransform returned %#08x\n", hr); hr = IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &mat); @@ -262,14 +289,8 @@ static void lighting_test(void) ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %#08x\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %#08x\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHATESTENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %#08x\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState returned %#08x\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed with %#08x\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE); - ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed with %#08x\n", hr); hr = IDirect3DDevice8_SetVertexShader(device, fvf); ok(hr == D3D_OK, "IDirect3DDevice8_SetVertexShader returned %#08x\n", hr); @@ -280,14 +301,14 @@ static void lighting_test(void) /* No lights are defined... That means, lit vertices should be entirely black. */ hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /* PrimCount */, Indices, D3DFMT_INDEX16, unlitquad, sizeof(unlitquad[0])); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, unlitquad, sizeof(unlitquad[0])); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, TRUE); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /* PrimCount */, Indices, D3DFMT_INDEX16, litquad, sizeof(litquad[0])); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, litquad, sizeof(litquad[0])); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice8_SetVertexShader(device, nfvf); @@ -295,14 +316,14 @@ static void lighting_test(void) hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /* PrimCount */, Indices, D3DFMT_INDEX16, unlitnquad, sizeof(unlitnquad[0])); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, unlitnquad, sizeof(unlitnquad[0])); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, TRUE); ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /* PrimCount */, Indices, D3DFMT_INDEX16, litnquad, sizeof(litnquad[0])); + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, litnquad, sizeof(litnquad[0])); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice8_EndScene(device); @@ -319,6 +340,67 @@ static void lighting_test(void) IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, TRUE); + ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice8_LightEnable(device, 0, TRUE); + ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color == 0x000000ff, "Lit quad with light has color 0x%08x.\n", color); + + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat_singular); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 240); + ok(color == 0x00ffffff, "Cleared area has color 0x%08x.\n", color); + color = getPixelColor(device, 480, 240); + ok(color == 0x000000ff, "Lit quad with singular world matrix has color 0x%08x.\n", color); + + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat_transf); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, rotatedquad, sizeof(rotatedquad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color == 0x000000ff, "Lit quad with transformation matrix has color 0x%08x.\n", color); + refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done:

1 0

Matteo Bruni : d3d9/tests: Add more lighting tests.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 2f710d72bbff35cd99395b2398a8e6f0121b15aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f710d72bbff35cd99395b239… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 26 20:12:18 2015 +0100 d3d9/tests: Add more lighting tests. --- dlls/d3d9/tests/visual.c | 124 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 103 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0ef3e53..51e8753 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -269,6 +269,20 @@ static void lighting_test(void) 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, + }}}, + mat_singular = + {{{ + 1.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 1.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}, + mat_transf = + {{{ + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + -1.0f, 0.0f, 0.0f, 0.0f, + 10.f, 10.0f, 10.0f, 1.0f, }}}; static const struct { @@ -315,8 +329,22 @@ static void lighting_test(void) {{0.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, {{1.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + }, + nquad[] = + { + {{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, -1.0f}, 0xff0000ff}, + }, + rotatedquad[] = + { + {{-10.0f, -11.0f, 11.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, + {{-10.0f, -9.0f, 11.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, + {{-10.0f, -9.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, + {{-10.0f, -11.0f, 9.0f}, {-1.0f, 0.0f, 0.0f}, 0xff0000ff}, }; - static const WORD Indices[] = {0, 1, 2, 2, 3, 0}; + static const WORD indices[] = {0, 1, 2, 2, 3, 0}; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -331,7 +359,6 @@ static void lighting_test(void) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); - /* Setup some states that may cause issues */ hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLDMATRIX(0), &mat); ok(hr == D3D_OK, "IDirect3DDevice9_SetTransform returned %08x\n", hr); hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); @@ -346,19 +373,8 @@ static void lighting_test(void) ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHATESTENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SCISSORTESTENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %08x\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %08x\n", hr); - - hr = IDirect3DDevice9_SetFVF(device, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, fvf); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr); @@ -369,14 +385,14 @@ static void lighting_test(void) /* No lights are defined... That means, lit vertices should be entirely black */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /* PrimCount */, Indices, D3DFMT_INDEX16, unlitquad, sizeof(unlitquad[0])); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, unlitquad, sizeof(unlitquad[0])); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, TRUE); ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /* PrimCount */, Indices, D3DFMT_INDEX16, litquad, sizeof(litquad[0])); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, litquad, sizeof(litquad[0])); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice9_SetFVF(device, nfvf); @@ -384,14 +400,14 @@ static void lighting_test(void) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /* PrimCount */, Indices, D3DFMT_INDEX16, unlitnquad, sizeof(unlitnquad[0])); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, unlitnquad, sizeof(unlitnquad[0])); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, TRUE); ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 2 /* PrimCount */, Indices, D3DFMT_INDEX16, litnquad, sizeof(litnquad[0])); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, litnquad, sizeof(litnquad[0])); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); @@ -408,6 +424,72 @@ static void lighting_test(void) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, TRUE); + ok(SUCCEEDED(hr), "Failed to enable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_LightEnable(device, 0, TRUE); + ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color == 0x000000ff, "Lit quad with light has color 0x%08x.\n", color); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat_singular); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, nquad, sizeof(nquad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 240); + ok(color == 0x00ffffff, "Cleared area has color 0x%08x.\n", color); + color = getPixelColor(device, 480, 240); + ok(color == 0x000000ff, "Lit quad with singular world matrix has color 0x%08x.\n", color); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat_transf); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0, 4, + 2, indices, D3DFMT_INDEX16, rotatedquad, sizeof(rotatedquad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color == 0x000000ff, "Lit quad with transformation matrix has color 0x%08x.\n", color); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_LightEnable(device, 0, FALSE); + ok(SUCCEEDED(hr), "Failed to disable light 0, hr %#x.\n", hr); + memset(&material, 0, sizeof(material)); material.Diffuse.r = 0.0; material.Diffuse.g = 0.0;

1 0

Matteo Bruni : wined3d: Don' t use the builtin FFP uniform for the normal matrix.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 7a8ac888de232578dd36f799cf203e5a59fe5b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8ac888de232578dd36f799c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 26 20:12:17 2015 +0100 wined3d: Don't use the builtin FFP uniform for the normal matrix. --- dlls/wined3d/glsl_shader.c | 96 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0fa8308..2dd4760 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -118,6 +118,7 @@ struct glsl_vs_program GLint pos_fixup_location; GLint modelview_matrix_location; + GLint normal_matrix_location; }; struct glsl_gs_program @@ -735,6 +736,93 @@ static void shader_glsl_load_np2fixup_constants(const struct glsl_ps_program *ps GL_EXTCALL(glUniform4fv(ps->np2_fixup_location, ps->np2_fixup_info->num_consts, np2fixup_constants)); } +/* Taken and adapted from Mesa. */ +static BOOL invert_matrix_3d(struct wined3d_matrix *out, const struct wined3d_matrix *in) +{ + float pos, neg, t, det; + struct wined3d_matrix temp; + + /* Calculate the determinant of upper left 3x3 submatrix and + * determine if the matrix is singular. */ + pos = neg = 0.0f; + t = in->_11 * in->_22 * in->_33; + if (t >= 0.0f) + pos += t; + else + neg += t; + + t = in->_21 * in->_32 * in->_13; + if (t >= 0.0f) + pos += t; + else + neg += t; + t = in->_31 * in->_12 * in->_23; + if (t >= 0.0f) + pos += t; + else + neg += t; + + t = -in->_31 * in->_22 * in->_13; + if (t >= 0.0f) + pos += t; + else + neg += t; + t = -in->_21 * in->_12 * in->_33; + if (t >= 0.0f) + pos += t; + else + neg += t; + + t = -in->_11 * in->_32 * in->_23; + if (t >= 0.0f) + pos += t; + else + neg += t; + + det = pos + neg; + + if (fabsf(det) < 1e-25f) + return FALSE; + + det = 1.0f / det; + temp._11 = (in->_22 * in->_33 - in->_32 * in->_23) * det; + temp._12 = -(in->_12 * in->_33 - in->_32 * in->_13) * det; + temp._13 = (in->_12 * in->_23 - in->_22 * in->_13) * det; + temp._21 = -(in->_21 * in->_33 - in->_31 * in->_23) * det; + temp._22 = (in->_11 * in->_33 - in->_31 * in->_13) * det; + temp._23 = -(in->_11 * in->_23 - in->_21 * in->_13) * det; + temp._31 = (in->_21 * in->_32 - in->_31 * in->_22) * det; + temp._32 = -(in->_11 * in->_32 - in->_31 * in->_12) * det; + temp._33 = (in->_11 * in->_22 - in->_21 * in->_12) * det; + + *out = temp; + return TRUE; +} + +static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_context *context, + const struct wined3d_state *state, struct glsl_shader_prog_link *prog) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + float mat[3 * 3]; + struct wined3d_matrix mv; + unsigned int i, j; + + /* gl_NormalMatrix is defined in the OpenGL spec as "transpose of the + * inverse of the upper leftmost 3x3 of gl_ModelViewMatrix" and that + * seems to be correct for D3D too. */ + get_modelview_matrix(context, state, &mv); + invert_matrix_3d(&mv, &mv); + /* Tests show that singular modelview matrices are used unchanged as normal + * matrices on D3D3 and older. There seems to be no clearly consistent + * behavior on newer D3D versions so always follow older ddraw behavior. */ + for (i = 0; i < 3; ++i) + for (j = 0; j < 3; ++j) + mat[i * 3 + j] = (&mv._11)[j * 4 + i]; + + GL_EXTCALL(glUniformMatrix3fv(prog->vs.normal_matrix_location, 1, FALSE, mat)); + checkGLcall("glUniformMatrix3fv"); +} + /* Context activation is done by the caller (state handler). */ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) @@ -784,6 +872,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context get_modelview_matrix(context, state, &mat); GL_EXTCALL(glUniformMatrix4fv(prog->vs.modelview_matrix_location, 1, FALSE, &mat._11)); checkGLcall("glUniformMatrix4fv"); + + shader_glsl_ffp_vertex_normalmatrix_uniform(context, state, prog); } if (update_mask & WINED3D_SHADER_CONST_PS_F) @@ -5002,6 +5092,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_buffe shader_addline(buffer, "\n"); shader_addline(buffer, "uniform mat4 ffp_modelview_matrix;\n"); + shader_addline(buffer, "uniform mat3 ffp_normal_matrix;\n"); shader_addline(buffer, "\nvoid main()\n{\n"); shader_addline(buffer, "float m;\n"); @@ -5025,9 +5116,9 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_buffe if (!settings->normal) shader_addline(buffer, "vec3 normal = vec3(0.0);\n"); else if (settings->normalize) - shader_addline(buffer, "vec3 normal = normalize(gl_NormalMatrix * gl_Normal);\n"); + shader_addline(buffer, "vec3 normal = normalize(ffp_normal_matrix * gl_Normal);\n"); else - shader_addline(buffer, "vec3 normal = gl_NormalMatrix * gl_Normal;\n"); + shader_addline(buffer, "vec3 normal = ffp_normal_matrix * gl_Normal;\n"); shader_glsl_ffp_vertex_lighting(buffer, settings, gl_info); @@ -5784,6 +5875,7 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * vs->pos_fixup_location = GL_EXTCALL(glGetUniformLocation(program_id, "posFixup")); vs->modelview_matrix_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_modelview_matrix")); + vs->normal_matrix_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_normal_matrix")); } static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info *gl_info,

1 0

Stefan Dösinger : wined3d: Implement per stage constants in atifs.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: be4c7a0a8424f932efb1b3f6624d47915855c134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4c7a0a8424f932efb1b3f66… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 26 19:02:41 2015 +0100 wined3d: Implement per stage constants in atifs. --- dlls/wined3d/ati_fragment_shader.c | 87 ++++++++++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be4c7a0a8424f932efb1b…

1 0

Matteo Bruni : wined3d: Don' t use the builtin FFP uniform for the projection matrix.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 05757794a0d2f456fd581d5eeae6bff04e61561f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05757794a0d2f456fd581d5ee… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 26 20:12:20 2015 +0100 wined3d: Don't use the builtin FFP uniform for the projection matrix. --- dlls/wined3d/glsl_shader.c | 30 ++++++++++++++++++------------ dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_private.h | 5 ++--- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2dd4760..e4ddbe6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -118,6 +118,7 @@ struct glsl_vs_program GLint pos_fixup_location; GLint modelview_matrix_location; + GLint projection_matrix_location; GLint normal_matrix_location; }; @@ -876,6 +877,15 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context shader_glsl_ffp_vertex_normalmatrix_uniform(context, state, prog); } + if (update_mask & WINED3D_SHADER_CONST_FFP_PROJ) + { + struct wined3d_matrix projection; + + get_projection_matrix(context, state, &projection); + GL_EXTCALL(glUniformMatrix4fv(prog->vs.projection_matrix_location, 1, FALSE, &projection._11)); + checkGLcall("glUniformMatrix4fv"); + } + if (update_mask & WINED3D_SHADER_CONST_PS_F) shader_glsl_load_constantsF(pshader, gl_info, state->ps_consts_f, prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version); @@ -5092,6 +5102,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_buffe shader_addline(buffer, "\n"); shader_addline(buffer, "uniform mat4 ffp_modelview_matrix;\n"); + shader_addline(buffer, "uniform mat4 ffp_projection_matrix;\n"); shader_addline(buffer, "uniform mat3 ffp_normal_matrix;\n"); shader_addline(buffer, "\nvoid main()\n{\n"); @@ -5101,13 +5112,13 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_shader_buffe if (settings->transformed) { shader_addline(buffer, "vec4 ec_pos = vec4(gl_Vertex.xyz, 1.0);\n"); - shader_addline(buffer, "gl_Position = gl_ProjectionMatrix * ec_pos;\n"); + shader_addline(buffer, "gl_Position = ffp_projection_matrix * ec_pos;\n"); shader_addline(buffer, "if (gl_Vertex.w != 0.0) gl_Position /= gl_Vertex.w;\n"); } else { shader_addline(buffer, "vec4 ec_pos = ffp_modelview_matrix * gl_Vertex;\n"); - shader_addline(buffer, "gl_Position = gl_ProjectionMatrix * ec_pos;\n"); + shader_addline(buffer, "gl_Position = ffp_projection_matrix * ec_pos;\n"); if (settings->clipping) shader_addline(buffer, "gl_ClipVertex = ec_pos;\n"); shader_addline(buffer, "ec_pos /= ec_pos.w;\n"); @@ -5875,6 +5886,7 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * vs->pos_fixup_location = GL_EXTCALL(glGetUniformLocation(program_id, "posFixup")); vs->modelview_matrix_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_modelview_matrix")); + vs->projection_matrix_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_projection_matrix")); vs->normal_matrix_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_normal_matrix")); } @@ -6178,7 +6190,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const } else { - entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MODELVIEW; + entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MODELVIEW + | WINED3D_SHADER_CONST_FFP_PROJ; } if (gshader) @@ -7095,11 +7108,7 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, } if (transformed != wasrhw) - { - if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)) - && !isStateDirty(context, STATE_VIEWPORT)) - transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); - } + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PROJ; for (i = 0; i < MAX_TEXTURES; ++i) { @@ -7133,9 +7142,6 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, } } - if (transformed != wasrhw && !isStateDirty(context, STATE_RENDER(WINED3D_RS_ZENABLE))) - context_apply_state(context, state, STATE_RENDER(WINED3D_RS_ZENABLE)); - context->last_was_vshader = use_vs(state); } @@ -7194,7 +7200,7 @@ static void glsl_vertex_pipe_projection(struct wined3d_context *context, if (state->render_states[WINED3D_RS_FOGENABLE] && state->render_states[WINED3D_RS_FOGTABLEMODE] != WINED3D_FOG_NONE) context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_VERTEX; - transform_projection(context, state, state_id); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PROJ; } static void glsl_vertex_pipe_viewport(struct wined3d_context *context, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a949077..69623af 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -132,7 +132,7 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ } if (context->last_was_rhw && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION))) - transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); + context_apply_state(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); } static void state_cullmode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4029,7 +4029,7 @@ static void transform_view(struct wined3d_context *context, const struct wined3d } } -void transform_projection(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void transform_projection(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_matrix projection; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c88f9b1..96b8244 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -307,7 +307,8 @@ enum wined3d_shader_resource_type #define WINED3D_SHADER_CONST_PS_Y_CORR 0x00000100 #define WINED3D_SHADER_CONST_PS_NP2_FIXUP 0x00000200 #define WINED3D_SHADER_CONST_FFP_MODELVIEW 0x00000400 -#define WINED3D_SHADER_CONST_FFP_PS 0x00000800 +#define WINED3D_SHADER_CONST_FFP_PROJ 0x00000800 +#define WINED3D_SHADER_CONST_FFP_PS 0x00001000 enum wined3d_shader_register_type { @@ -2812,8 +2813,6 @@ void sampler_texmatrix(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void state_specularenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void transform_projection(struct wined3d_context *context, - const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void transform_texture(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void state_ambient(struct wined3d_context *context,

1 0

André Hentschel : ntdll: Fix CPU level on ARM.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 2b5deddc05c0483e400e286e496268ca589b3a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5deddc05c0483e400e286e4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 26 23:17:14 2015 +0100 ntdll: Fix CPU level on ARM. --- dlls/ntdll/nt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 73d9383..a0de705 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1100,10 +1100,10 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) while (isspace(*value)) value++; if ((s = strchr(value,'\n'))) *s='\0'; - if (!strcasecmp(line, "CPU part")) + if (!strcasecmp(line, "CPU architecture")) { if (isdigit(value[0])) - info->Level = strtol(value, NULL, 16); + info->Level = atoi(value); continue; } if (!strcasecmp(line, "CPU revision"))

1 0

Sebastian Lackner : wiaservc: Return pointer to vtbl instead of implementation in wiadevmgr_Constructor.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: f630fb4f6a81813f4f754d4d169682af05e33af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f630fb4f6a81813f4f754d4d1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 27 09:14:37 2015 +0100 wiaservc: Return pointer to vtbl instead of implementation in wiadevmgr_Constructor. --- dlls/wiaservc/factory.c | 8 ++++---- dlls/wiaservc/wiadevmgr.c | 4 ++-- dlls/wiaservc/wiaservc_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wiaservc/factory.c b/dlls/wiaservc/factory.c index c76a363..9a607d5 100644 --- a/dlls/wiaservc/factory.c +++ b/dlls/wiaservc/factory.c @@ -70,19 +70,19 @@ WIASERVC_IClassFactory_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) { HRESULT res; - IUnknown *punk = NULL; + IWiaDevMgr *devmgr = NULL; TRACE("IID: %s\n", debugstr_guid(riid)); if (pUnkOuter) return CLASS_E_NOAGGREGATION; - res = wiadevmgr_Constructor((LPVOID*) &punk); + res = wiadevmgr_Constructor(&devmgr); if (FAILED(res)) return res; - res = IUnknown_QueryInterface(punk, riid, ppvObj); - IUnknown_Release(punk); + res = IWiaDevMgr_QueryInterface(devmgr, riid, ppvObj); + IWiaDevMgr_Release(devmgr); return res; } diff --git a/dlls/wiaservc/wiadevmgr.c b/dlls/wiaservc/wiadevmgr.c index 2f0907b..6eb82aa 100644 --- a/dlls/wiaservc/wiadevmgr.c +++ b/dlls/wiaservc/wiadevmgr.c @@ -164,7 +164,7 @@ static const IWiaDevMgrVtbl WIASERVC_IWiaDevMgr_Vtbl = wiadevmgr_AddDeviceDlg }; -HRESULT wiadevmgr_Constructor(LPVOID *ppObj) +HRESULT wiadevmgr_Constructor(IWiaDevMgr **ppObj) { wiadevmgr *This; TRACE("(%p)\n", ppObj); @@ -173,7 +173,7 @@ HRESULT wiadevmgr_Constructor(LPVOID *ppObj) { This->IWiaDevMgr_iface.lpVtbl = &WIASERVC_IWiaDevMgr_Vtbl; This->ref = 1; - *ppObj = This; + *ppObj = &This->IWiaDevMgr_iface; return S_OK; } *ppObj = NULL; diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h index b7faf89..33c9ba1 100644 --- a/dlls/wiaservc/wiaservc_private.h +++ b/dlls/wiaservc/wiaservc_private.h @@ -34,7 +34,7 @@ typedef struct LONG ref; } wiadevmgr; -HRESULT wiadevmgr_Constructor(LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT wiadevmgr_Constructor(IWiaDevMgr **ppObj) DECLSPEC_HIDDEN; /* Little helper functions */ static inline char *

1 0

Stefan Dösinger : ddraw/tests: Port test_color_fill to earlier versions.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: bfe82190ad9a2172eb73a19a18bb93eeaae9a688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe82190ad9a2172eb73a19a1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 26 19:02:40 2015 +0100 ddraw/tests: Port test_color_fill to earlier versions. --- dlls/ddraw/tests/ddraw1.c | 486 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 486 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 512 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1484 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfe82190ad9a2172eb73a…

1 0

Stefan Dösinger : ddraw/tests: Make sure color keying is on in test_texturemapblend.
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: 7897a2c058cd87c4a4d09c8aeb32a632e9c87774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7897a2c058cd87c4a4d09c8ae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 26 19:02:39 2015 +0100 ddraw/tests: Make sure color keying is on in test_texturemapblend. --- dlls/ddraw/tests/ddraw1.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 68821e4..2c8bc5f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6280,6 +6280,11 @@ static void test_texturemapblend(void) emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 8); emit_set_rs(&ptr, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE); emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, texture_handle); + /* This is supposed to be on by default on version 1 devices, + * but for some reason it randomly defaults to FALSE on the W8 + * testbot. This is either the fault of Windows 8 or the WARP + * driver. */ + emit_set_rs(&ptr, D3DRENDERSTATE_COLORKEYENABLE, TRUE); emit_tquad(&ptr, 0); emit_tquad(&ptr, 4);

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetTags().
by Alexandre Julliard March 27, 2015

March 27, 2015

Module: wine Branch: master Commit: fd4b0532d0b5a2d35f9036142451d4e75eee3a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4b0532d0b5a2d35f9036142… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 09:07:05 2015 +0100 d2d1: Implement d2d_d3d_render_target_GetTags(). --- dlls/d2d1/render_target.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index b6e68dc..ae82550 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -904,10 +904,12 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTags(ID2D1RenderTarget *i static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTags(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { - FIXME("iface %p, tag1 %p, tag2 %p stub!\n", iface, tag1, tag2); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); - *tag1 = 0; - *tag2 = 0; + *tag1 = render_target->tag1; + *tag2 = render_target->tag2; } static void STDMETHODCALLTYPE d2d_d3d_render_target_PushLayer(ID2D1RenderTarget *iface,

1 0