wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Matteo Bruni : ddraw/tests: Port test_shademode() to ddraw7.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 1a3d6ad24074a98f357ba587f44a159afcb6df94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3d6ad24074a98f357ba587f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:46 2015 +0100 ddraw/tests: Port test_shademode() to ddraw7. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fe02396..24e7fc8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -10158,6 +10158,142 @@ static void test_range_colorkey(void) DestroyWindow(window); } +static void test_shademode(void) +{ + IDirect3DVertexBuffer7 *vb_strip, *vb_list, *buffer; + IDirect3DDevice7 *device; + D3DVERTEXBUFFERDESC desc; + IDirectDrawSurface7 *rt; + DWORD color0, color1; + void *data = NULL; + IDirect3D7 *d3d; + ULONG refcount; + UINT i, count; + HWND window; + HRESULT hr; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad_strip[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + }, + quad_list[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + }; + static const struct + { + DWORD primtype; + DWORD shademode; + DWORD color0, color1; + } + tests[] = + { + {D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x0000ff00}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {D3DPT_TRIANGLELIST, D3DSHADE_FLAT, 0x00ff0000, 0x000000ff}, + {D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + }; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == D3D_OK, "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwCaps = D3DVBCAPS_WRITEONLY; + desc.dwFVF = D3DFVF_XYZ | D3DFVF_DIFFUSE; + desc.dwNumVertices = sizeof(quad_strip) / sizeof(*quad_strip); + hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &vb_strip, 0); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_Lock(vb_strip, 0, &data, NULL); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad_strip, sizeof(quad_strip)); + hr = IDirect3DVertexBuffer7_Unlock(vb_strip); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + desc.dwNumVertices = sizeof(quad_list) / sizeof(*quad_list); + hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &vb_list, 0); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer7_Lock(vb_list, 0, &data, NULL); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad_list, sizeof(quad_list)); + hr = IDirect3DVertexBuffer7_Unlock(vb_list); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + /* Try it first with a TRIANGLESTRIP. Do it with different geometry because + * the color fixups we have to do for FLAT shading will be dependent on that. */ + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_SHADEMODE, tests[i].shademode); + ok(hr == D3D_OK, "Failed to set shade mode, hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + buffer = tests[i].primtype == D3DPT_TRIANGLESTRIP ? vb_strip : vb_list; + count = tests[i].primtype == D3DPT_TRIANGLESTRIP ? 4 : 6; + hr = IDirect3DDevice7_DrawPrimitiveVB(device, tests[i].primtype, buffer, 0, count, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color0 = get_surface_color(rt, 100, 100); /* Inside first triangle */ + color1 = get_surface_color(rt, 500, 350); /* Inside second triangle */ + + /* For D3DSHADE_FLAT it should take the color of the first vertex of + * each triangle. This requires EXT_provoking_vertex or similar + * functionality being available. */ + /* PHONG should be the same as GOURAUD, since no hardware implements + * this. */ + ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + i, color0, tests[i].color0); + ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + i, color1, tests[i].color1); + } + + IDirect3DVertexBuffer7_Release(vb_strip); + IDirect3DVertexBuffer7_Release(vb_list); + IDirectDrawSurface7_Release(rt); + IDirect3D7_Release(d3d); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -10254,4 +10390,5 @@ START_TEST(ddraw7) test_texcoordindex(); test_colorkey_precision(); test_range_colorkey(); + test_shademode(); }

1 0

Matteo Bruni : d3d8/tests: Port test_shademode() to d3d8.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 3bd99687a304b1b0c53b4452e3182d476bac64f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd99687a304b1b0c53b4452e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:45 2015 +0100 d3d8/tests: Port test_shademode() to d3d8. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 226 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1e2b16b..7029551 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8278,6 +8278,231 @@ static void test_uninitialized_varyings(void) DestroyWindow(window); } +static void test_shademode(void) +{ + IDirect3DVertexBuffer8 *vb_strip; + IDirect3DVertexBuffer8 *vb_list; + IDirect3DDevice8 *device; + DWORD color0, color1; + BYTE *data = NULL; + IDirect3D8 *d3d; + ULONG refcount; + D3DCAPS8 caps; + DWORD vs, ps; + HWND window; + HRESULT hr; + UINT i; + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), + D3DVSD_REG(D3DVSDE_DIFFUSE, D3DVSDT_D3DCOLOR), + D3DVSD_END() + }; + static const DWORD vs1_code[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0000, 0x90e40005, /* mov oD0, v5 */ + 0x0000ffff + }; + static const DWORD ps1_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff + }; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad_strip[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + }, + quad_list[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + }; + static const struct test_shader + { + DWORD version; + const DWORD *code; + } + novs = {0, NULL}, + vs_1 = {D3DVS_VERSION(1, 1), vs1_code}, + nops = {0, NULL}, + ps_1 = {D3DPS_VERSION(1, 1), ps1_code}; + static const struct + { + const struct test_shader *vs, *ps; + DWORD primtype; + DWORD shademode; + DWORD color0, color1; + } + tests[] = + { + {&novs, &nops, D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x0000ff00}, + {&novs, &nops, D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {&novs, &nops, D3DPT_TRIANGLESTRIP, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {&novs, &nops, D3DPT_TRIANGLESTRIP, D3DSHADE_PHONG, 0x000dca28, 0x000d45c7}, + {&novs, &nops, D3DPT_TRIANGLELIST, D3DSHADE_FLAT, 0x00ff0000, 0x000000ff}, + {&novs, &nops, D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {&vs_1, &ps_1, D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x0000ff00}, + {&vs_1, &ps_1, D3DPT_TRIANGLESTRIP, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {&vs_1, &ps_1, D3DPT_TRIANGLELIST, D3DSHADE_FLAT, 0x00ff0000, 0x000000ff}, + {&vs_1, &ps_1, D3DPT_TRIANGLELIST, D3DSHADE_GOURAUD, 0x000dca28, 0x000d45c7}, + {&novs, &ps_1, D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x0000ff00}, + {&vs_1, &nops, D3DPT_TRIANGLESTRIP, D3DSHADE_FLAT, 0x00ff0000, 0x0000ff00}, + }; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad_strip), 0, 0, D3DPOOL_MANAGED, &vb_strip); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(vb_strip, 0, sizeof(quad_strip), &data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad_strip, sizeof(quad_strip)); + hr = IDirect3DVertexBuffer8_Unlock(vb_strip); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad_list), 0, 0, D3DPOOL_MANAGED, &vb_list); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(vb_list, 0, sizeof(quad_list), &data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad_list, sizeof(quad_list)); + hr = IDirect3DVertexBuffer8_Unlock(vb_list); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + /* Try it first with a TRIANGLESTRIP. Do it with different geometry because + * the color fixups we have to do for FLAT shading will be dependent on that. */ + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + if (tests[i].vs->version) + { + if (caps.VertexShaderVersion >= tests[i].vs->version) + { + hr = IDirect3DDevice8_CreateVertexShader(device, decl, tests[i].vs->code, &vs, 0); + ok(hr == D3D_OK, "Failed to create vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, vs); + ok(hr == D3D_OK, "Failed to set vertex shader, hr %#x.\n", hr); + } + else + { + skip("Shader version unsupported, skipping some tests.\n"); + continue; + } + } + else + { + vs = 0; + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Failed to set FVF, hr %#x.\n", hr); + } + if (tests[i].ps->version) + { + if (caps.PixelShaderVersion >= tests[i].ps->version) + { + hr = IDirect3DDevice8_CreatePixelShader(device, tests[i].ps->code, &ps); + ok(hr == D3D_OK, "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(hr == D3D_OK, "Failed to set pixel shader, hr %#x.\n", hr); + } + else + { + skip("Shader version unsupported, skipping some tests.\n"); + if (vs) + { + IDirect3DDevice8_SetVertexShader(device, 0); + IDirect3DDevice8_DeleteVertexShader(device, vs); + } + continue; + } + } + else + { + ps = 0; + } + + hr = IDirect3DDevice8_SetStreamSource(device, 0, + tests[i].primtype == D3DPT_TRIANGLESTRIP ? vb_strip : vb_list, sizeof(quad_strip[0])); + ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SHADEMODE, tests[i].shademode); + ok(hr == D3D_OK, "Failed to set shade mode, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, tests[i].primtype, 0, 2); + 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); + + color0 = getPixelColor(device, 100, 100); /* Inside first triangle */ + color1 = getPixelColor(device, 500, 350); /* Inside second triangle */ + + /* For D3DSHADE_FLAT it should take the color of the first vertex of + * each triangle. This requires EXT_provoking_vertex or similar + * functionality being available. */ + /* PHONG should be the same as GOURAUD, since no hardware implements + * this. */ + ok(color0 == tests[i].color0, "Test %u shading has color0 %08x, expected %08x.\n", + i, color0, tests[i].color0); + ok(color1 == tests[i].color1, "Test %u shading has color1 %08x, expected %08x.\n", + i, color1, tests[i].color1); + + IDirect3DDevice8_SetVertexShader(device, 0); + IDirect3DDevice8_SetPixelShader(device, 0); + + if (ps) + IDirect3DDevice8_DeletePixelShader(device, ps); + if (vs) + IDirect3DDevice8_DeleteVertexShader(device, vs); + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Failed to present, hr %#x.\n", hr); + + IDirect3DVertexBuffer8_Release(vb_strip); + IDirect3DVertexBuffer8_Release(vb_list); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -8341,4 +8566,5 @@ START_TEST(visual) test_fixed_function_fvf(); test_flip(); test_uninitialized_varyings(); + test_shademode(); }

1 0

Matteo Bruni : d3d9/tests: Improve the shade mode test.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 59d405b473b87f790300bc4fc36aa0d8cc3efb7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=59d405b473b87f790300bc4fc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:44 2015 +0100 d3d9/tests: Improve the shade mode test. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 260 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 187 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59d405b473b87f790300b…

1 0

Matteo Bruni : wined3d: Handle WINED3D_SHADE_PHONG the same as WINED3D_SHADE_GOURAUD.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: c5b2d3f10c8c7c85683631045ddb4fc74c1d85f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b2d3f10c8c7c85683631045… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:43 2015 +0100 wined3d: Handle WINED3D_SHADE_PHONG the same as WINED3D_SHADE_GOURAUD. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2be3cab..942023e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -176,12 +176,12 @@ static void state_shademode(struct wined3d_context *context, const struct wined3 checkGLcall("glShadeModel(GL_FLAT)"); break; case WINED3D_SHADE_GOURAUD: + /* WINED3D_SHADE_PHONG in practice is the same as WINED3D_SHADE_GOURAUD + * in D3D. */ + case WINED3D_SHADE_PHONG: gl_info->gl_ops.gl.p_glShadeModel(GL_SMOOTH); checkGLcall("glShadeModel(GL_SMOOTH)"); break; - case WINED3D_SHADE_PHONG: - FIXME("WINED3D_SHADE_PHONG isn't supported.\n"); - break; default: FIXME("Unrecognized shade mode %#x.\n", state->render_states[WINED3D_RS_SHADEMODE]);

1 0

Matteo Bruni : wined3d: Enforce a stable texture units mapping.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: d6c814663353d4449e67b6392dce203ffd32b8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c814663353d4449e67b6392… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:42 2015 +0100 wined3d: Enforce a stable texture units mapping. The GLSL shader backend hardcodes the sampler uniforms at program link time, it can't handle a change in the mapping between draws with the same shader program. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 37 +++++++++++++++++-------------------- dlls/wined3d/glsl_shader.c | 9 ++------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9203905..80a9ba7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2542,6 +2542,7 @@ static void context_map_stage(struct wined3d_context *context, DWORD stage, DWOR DWORD i = context->rev_tex_unit_map[unit]; DWORD j = context->tex_unit_map[stage]; + TRACE("Mapping stage %u to unit %u.\n", stage, unit); context->tex_unit_map[stage] = unit; if (i != WINED3D_UNMAPPED_STAGE && i != stage) context->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; @@ -2688,8 +2689,7 @@ static void context_map_psamplers(struct wined3d_context *context, const struct } static BOOL context_unit_free_for_vs(const struct wined3d_context *context, - const struct wined3d_shader_resource_info *ps_resource_info, - const struct wined3d_shader_resource_info *vs_resource_info, DWORD unit) + const struct wined3d_shader_resource_info *ps_resource_info, DWORD unit) { DWORD current_mapping = context->rev_tex_unit_map[unit]; @@ -2711,8 +2711,7 @@ static BOOL context_unit_free_for_vs(const struct wined3d_context *context, return !ps_resource_info[current_mapping].type; } - /* Used by a vertex sampler */ - return !vs_resource_info[current_mapping - MAX_FRAGMENT_SAMPLERS].type; + return TRUE; } static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, const struct wined3d_state *state) @@ -2738,18 +2737,15 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons DWORD vsampler_idx = i + MAX_FRAGMENT_SAMPLERS; if (vs_resource_info[i].type) { - if (context->tex_unit_map[vsampler_idx] != WINED3D_UNMAPPED_STAGE) - { - /* Already mapped somewhere */ - continue; - } - while (start >= 0) { - if (context_unit_free_for_vs(context, ps_resource_info, vs_resource_info, start)) + if (context_unit_free_for_vs(context, ps_resource_info, start)) { - context_map_stage(context, vsampler_idx, start); - context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); + if (context->tex_unit_map[vsampler_idx] != start) + { + context_map_stage(context, vsampler_idx, start); + context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); + } --start; break; @@ -2757,6 +2753,8 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons --start; } + if (context->tex_unit_map[vsampler_idx] == WINED3D_UNMAPPED_STAGE) + WARN("Couldn't find a free texture unit for vertex sampler %u.\n", i); } } } @@ -2765,13 +2763,12 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s { BOOL vs = use_vs(state); BOOL ps = use_ps(state); - /* - * Rules are: - * -> Pixel shaders need a 1:1 map. In theory the shader input could be mapped too, but - * that would be really messy and require shader recompilation - * -> When the mapping of a stage is changed, sampler and ALL texture stage states have - * to be reset. Because of that try to work with a 1:1 mapping as much as possible - */ + + /* Try to go for a 1:1 mapping of the samplers when possible. Pixel shaders + * need a 1:1 map at the moment. + * When the mapping of a stage is changed, sampler and ALL texture stage + * states have to be reset. */ + if (ps) context_map_psamplers(context, state); else diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 44e7090..abfaef8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7095,13 +7095,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glUseProgram(program_id)); checkGLcall("glUseProgram"); - /* Load the vertex and pixel samplers now. The function that finds the mappings makes sure - * that it stays the same for each vertexshader-pixelshader pair(=linked glsl program). If - * a pshader with fixed function pipeline is used there are no vertex samplers, and if a - * vertex shader with fixed function pixel processing is used we make sure that the card - * supports enough samplers to allow the max number of vertex samplers with all possible - * fixed function fragment processing setups. So once the program is linked these samplers - * won't change. */ + /* Texture unit mapping is set up to be the same each time the shader + * program is used so we can hardcode the sampler uniform values. */ shader_glsl_load_samplers(gl_info, priv, context->tex_unit_map, program_id); entry->constant_update_mask = 0;

1 0

Matteo Bruni : wined3d: Avoid going through the texture units mapping when unnecessary.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 750dc790b7a87108c9367d7363bfc2e811293bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=750dc790b7a87108c9367d736… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:41 2015 +0100 wined3d: Avoid going through the texture units mapping when unnecessary. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ff2ff4e..9203905 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2616,11 +2616,16 @@ static void context_update_fixed_function_usage_map(struct wined3d_context *cont static void context_map_fixed_function_samplers(struct wined3d_context *context, const struct wined3d_state *state) { + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i, tex; WORD ffu_map; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; context_update_fixed_function_usage_map(context, state); + + if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) + return; + ffu_map = context->fixed_function_usage_map; if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages @@ -2661,10 +2666,14 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, static void context_map_psamplers(struct wined3d_context *context, const struct wined3d_state *state) { + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader_resource_info *resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; unsigned int i; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + + if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) + return; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { @@ -2715,6 +2724,9 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers) - 1; int i; + if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) + return; + /* Note that we only care if a resource is used or not, not the * resource's specific type. Otherwise we'd need to call * shader_update_samplers() here for 1.x pixelshaders. */

1 0

Matteo Bruni : wined3d: Set default texture units mapping for vertex shader samplers when possible.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: e449f90b20cf9715df4644867efc121776da6b36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e449f90b20cf9715df4644867… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 12 23:06:40 2015 +0100 wined3d: Set default texture units mapping for vertex shader samplers when possible. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1692d0d..ff2ff4e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1509,7 +1509,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, /* Initialize the texture unit mapping to a 1:1 mapping */ for (s = 0; s < MAX_COMBINED_SAMPLERS; ++s) { - if (s < gl_info->limits.fragment_samplers) + if (s < gl_info->limits.combined_samplers) { ret->tex_unit_map[s] = s; ret->rev_tex_unit_map[s] = s;

1 0

Jacek Caban : mshtml: Skip travellog notifications for frame navigation.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: 4354bc831fef0f4bdd19d70c691af5e56e7e8c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4354bc831fef0f4bdd19d70c6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 13 12:21:21 2015 +0100 mshtml: Skip travellog notifications for frame navigation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/persist.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 20f3191..59ca5e2 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -128,8 +128,12 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) HRESULT hres; if(This->mon) { - if(This->doc_obj && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) - notify_travellog_update(This->doc_obj); + if(This->doc_obj && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) { + if(This == This->doc_obj->basedoc.window) + notify_travellog_update(This->doc_obj); + else + TRACE("Skipping travellog update for frame navigation.\n"); + } IMoniker_Release(This->mon); This->mon = NULL; }

1 0

Daniel Lehman : msvcp120: Implement _Cnd_* functions.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: df096e6b60e268eb7c699cf80d113866ae30fbd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df096e6b60e268eb7c699cf80… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Nov 3 17:10:16 2015 -0800 msvcp120: Implement _Cnd_* functions. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 12 +-- dlls/msvcp120/msvcp120.spec | 12 +-- dlls/msvcp120/tests/msvcp120.c | 184 +++++++++++++++++++++++++++++++++++- dlls/msvcp120_app/msvcp120_app.spec | 12 +-- dlls/msvcp90/misc.c | 104 ++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 2 + dlls/msvcp90/msvcp_main.c | 1 + 7 files changed, 308 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df096e6b60e268eb7c699…

1 0

Austin English : combase: Add RoGetActivationFactory stub.
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: wine Branch: master Commit: c2533ecb736b3b41e3bab81d41fd5e8f65ef6596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2533ecb736b3b41e3bab81d4… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Nov 13 08:12:54 2015 +0100 combase: Add RoGetActivationFactory stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-winrt-l1-1-0.spec | 2 +- dlls/combase/combase.spec | 2 +- dlls/combase/roapi.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec index 0749ac0..74c9d27 100644 --- a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec +++ b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub RoActivateInstance -@ stub RoGetActivationFactory +@ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory @ stub RoGetApartmentIdentifier @ stdcall RoInitialize(long) combase.RoInitialize @ stub RoRegisterActivationFactories diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 6a76b2d..5082f39 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -248,7 +248,7 @@ @ stub RoFailFastWithErrorContext @ stub RoFreeParameterizedTypeExtra @ stub RoGetActivatableClassRegistration -@ stub RoGetActivationFactory +@ stdcall RoGetActivationFactory(ptr ptr ptr) @ stub RoGetAgileReference @ stub RoGetApartmentIdentifier @ stub RoGetErrorReportingFlags diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index a2c17db..a2dfd54 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -18,6 +18,7 @@ #include "objbase.h" #include "roapi.h" +#include "hstring.h" #include "wine/debug.h" @@ -45,3 +46,12 @@ void WINAPI RoUninitialize(void) { CoUninitialize(); } + +/*********************************************************************** + * RoGetActivationFactory (combase.@) + */ +HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **factory) +{ + FIXME("stub: %p %p %p\n", classid, iid, factory); + return E_NOTIMPL; +}

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015