October 2015 - Wine-commits

Stefan Dösinger : wined3d: Pass a context to surface_load_location.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 973de3f59c7d47602fe68c8cecf8fc3dbc59bcff URL: http://source.winehq.org/git/wine.git/?a=commit;h=973de3f59c7d47602fe68c8ce… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 15 22:41:12 2015 +0200 wined3d: Pass a context to surface_load_location. Signed-off-by: Stefan Dösinger <stefan(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 | 4 +- dlls/wined3d/device.c | 22 ++++---- dlls/wined3d/drawprim.c | 20 +++---- dlls/wined3d/surface.c | 115 ++++++++++++++++++++++++----------------- dlls/wined3d/swapchain.c | 8 +-- dlls/wined3d/texture.c | 7 ++- dlls/wined3d/wined3d_private.h | 5 +- 7 files changed, 103 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=973de3f59c7d47602fe68…

1 0

Matteo Bruni : d3d8/tests: Uninitialized varyings tests.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 7837a0504cf23f533277023baf9c30f20b40f412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7837a0504cf23f533277023ba… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 15 22:01:02 2015 +0200 d3d8/tests: Uninitialized varyings tests. 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 | 205 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 2748445..50c763f 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -8065,6 +8065,210 @@ static void test_flip(void) DestroyWindow(window); } +static void test_uninitialized_varyings(void) +{ + 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, + }}}; + static const struct vec3 quad[] = + { + {-1.0f, -1.0f, 0.1f}, + {-1.0f, 1.0f, 0.1f}, + { 1.0f, -1.0f, 0.1f}, + { 1.0f, 1.0f, 0.1f}, + }; + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(0, D3DVSDT_FLOAT3), + D3DVSD_CONST(0, 1), 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, /* def c0, 0.5, 0.5, 0.5, 0.5 */ + D3DVSD_END() + }; + static const DWORD vs1_code[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x0000ffff + }; + static const DWORD vs1_partial_code[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd0010000, 0xa0e40000, /* mov oD0.x, c0 */ + 0x00000001, 0xd0010001, 0xa0e40000, /* mov oD1.x, c0 */ + 0x00000001, 0xe0010000, 0xa0e40000, /* mov oT0.x, c0 */ + 0x0000ffff + }; + static const DWORD ps1_diffuse_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff + }; + static const DWORD ps1_specular_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40001, /* mov r0, v1 */ + 0x0000ffff + }; + static const DWORD ps1_texcoord_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000040, 0xb00f0000, /* texcoord t0 */ + 0x00000001, 0x800f0000, 0xb0e40000, /* mov r0, t0 */ + 0x0000ffff + }; + static const struct + { + DWORD vs_version; + const DWORD *vs; + DWORD ps_version; + const DWORD *ps; + D3DCOLOR expected; + BOOL allow_zero_alpha; + BOOL broken_warp; + } + /* On AMD specular color is generally initialized to 0x00000000 and texcoords to 0xff000000 + * while on Nvidia it's the opposite. Just allow both. */ + tests[] = + { + {D3DVS_VERSION(1, 1), vs1_code, 0, NULL, 0xffffffff}, + { 0, NULL, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff000000, TRUE}, + {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_diffuse_code, 0xffffffff}, + {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff000000, TRUE, TRUE}, + {D3DVS_VERSION(1, 1), vs1_code, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff000000, TRUE}, + {D3DVS_VERSION(1, 1), vs1_partial_code, 0, NULL, 0xff7fffff, FALSE, TRUE}, + {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_diffuse_code, 0xff7fffff, FALSE, TRUE}, + {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_specular_code, 0xff7f0000, TRUE}, + {D3DVS_VERSION(1, 1), vs1_partial_code, D3DPS_VERSION(1, 1), ps1_texcoord_code, 0xff7f0000, TRUE}, + }; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + HWND window; + HRESULT hr; + DWORD vs, ps; + unsigned int i; + ULONG refcount; + D3DCAPS8 caps; + IDirect3DSurface8 *backbuffer; + D3DADAPTER_IDENTIFIER8 identifier; + struct surface_readback rb; + D3DCOLOR color; + BOOL warp; + + 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 = IDirect3D8_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = !strcmp(identifier.Driver, "d3d10warp.dll"); + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + if (caps.VertexShaderVersion < tests[i].vs_version + || caps.PixelShaderVersion < tests[i].ps_version) + { + skip("Vertex / pixel shader version not supported, skipping test %u.\n", i); + continue; + } + if (tests[i].vs) + { + hr = IDirect3DDevice8_CreateVertexShader(device, decl, tests[i].vs, &vs, 0); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x (case %u).\n", hr, i); + hr = IDirect3DDevice8_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + } + else + { + vs = 0; + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + } + if (tests[i].ps) + { + hr = IDirect3DDevice8_CreatePixelShader(device, tests[i].ps, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x (case %u).\n", hr, i); + } + else + { + ps = 0; + } + + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 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_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[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); + + get_rt_readback(backbuffer, &rb); + color = get_readback_color(&rb, 320, 240); + ok(color_match(color, tests[i].expected, 1) + || (tests[i].allow_zero_alpha && color_match(color, tests[i].expected & 0x00ffffff, 1)) + || (broken(warp && tests[i].broken_warp)), + "Got unexpected color 0x%08x, case %u.\n", color, i); + release_surface_readback(&rb); + + if (vs) + IDirect3DDevice8_DeleteVertexShader(device, vs); + if (ps) + IDirect3DDevice8_DeletePixelShader(device, ps); + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + IDirect3DSurface8_Release(backbuffer); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -8127,4 +8331,5 @@ START_TEST(visual) test_vshader_input(); test_fixed_function_fvf(); test_flip(); + test_uninitialized_varyings(); }

1 0

Matteo Bruni : wined3d: Don' t output the fogcoord varying when not necessary.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 5b8be5550e967e37df44a735ef493f5d81b2e47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8be5550e967e37df44a735e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 15 22:01:03 2015 +0200 wined3d: Don't output the fogcoord varying when not necessary. 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/glsl_shader.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9b5b6e8..22c75b1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1827,7 +1827,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "} ffp_point;\n"); } - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && version->major < 3) { declare_out_varying(gl_info, buffer, FALSE, "float ffp_varying_fogcoord;\n"); } @@ -5234,12 +5234,15 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context * the fog frag coord is thrown away. If the fog frag coord is used, but not written by * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) */ - if (args->fog_src == VS_FOG_Z) - shader_addline(buffer, "%s = gl_Position.z;\n", - legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); - else if (!reg_maps->fog) - shader_addline(buffer, "%s = 0.0;\n", - legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); + if (reg_maps->shader_version.major < 3) + { + if (args->fog_src == VS_FOG_Z) + shader_addline(buffer, "%s = gl_Position.z;\n", + legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); + else if (!reg_maps->fog) + shader_addline(buffer, "%s = 0.0;\n", + legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); + } /* We always store the clipplanes without y inversion */ if (args->clip_enabled)

1 0

Matteo Bruni : wined3d: Avoid the builtin texture coordinate varyings on core profile.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: ad2fc9397e859067ced0fc7314e2c73425e6c270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2fc9397e859067ced0fc731… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 15 22:01:04 2015 +0200 wined3d: Avoid the builtin texture coordinate varyings on core profile. 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/glsl_shader.c | 70 +++++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad2fc9397e859067ced0f…

1 0

Matteo Bruni : wined3d: Avoid the builtin color varyings on core profile.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 9be8d0a9f4e1f09feffaef7d6dc2d37f9ff2d383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be8d0a9f4e1f09feffaef7d6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 15 22:01:05 2015 +0200 wined3d: Avoid the builtin color varyings on core profile. 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/glsl_shader.c | 118 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 94 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9be8d0a9f4e1f09feffae…

1 0

Tag wine-1.7.53 : Alexandre Julliard : Release 1.7.53
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: refs/tags/wine-1.7.53 Tag: e45e6278aa4bb81d9dc07dbed2565598b3a05dd0 URL: http://source.winehq.org/git/wine.git/?a=tag;h=e45e6278aa4bb81d9dc07dbed256… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 16 23:02:06 2015 +0900 Release 1.7.53

1 0

Frédéric Delanoy : winmm/tests: Simplify conditional expression (PVS-Studio).
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 91a4f41712d02f28bca33043d37b376c751d791f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a4f41712d02f28bca33043d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 15 19:43:50 2015 +0200 winmm/tests: Simplify conditional expression (PVS-Studio). Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/joystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c index 2f235fa..2f230f5 100644 --- a/dlls/winmm/tests/joystick.c +++ b/dlls/winmm/tests/joystick.c @@ -156,7 +156,7 @@ static void test_api(void) par = 0xdead; ret = joyGetThreshold(joyid, &par); ok(ret == JOYERR_NOERROR, "Test [%d]: Expected %d, got %d\n", i, JOYERR_NOERROR, ret); - if (!win98 || (win98 && i < 8)) + if (!win98 || i < 8) { if ((1 << i) & threshold_error) ok(par == period[8], "Test [%d]: Expected %d, got %d\n", i, period[8], par);

1 0

Frédéric Delanoy : d3dx9_36: Simplify conditional expression (PVS-Studio).
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 3cdea7e50e476b853b9ac0abbd9903e811ba989b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cdea7e50e476b853b9ac0abb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 15 19:51:58 2015 +0200 d3dx9_36: Simplify conditional expression (PVS-Studio). Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 12d0bcb..e9d893b 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1096,7 +1096,7 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, offset = min(desc->Elements - 1, offset); last = offset * desc->Rows * desc->Columns; - if ((is_pointer || (!is_pointer && inclass == D3DXPC_MATRIX_ROWS)) && desc->RegisterSet != D3DXRS_BOOL) + if ((is_pointer || inclass == D3DXPC_MATRIX_ROWS) && desc->RegisterSet != D3DXRS_BOOL) { set(table, device, &constant->constants[0], NULL, intype, size, incol, inclass, 0, is_pointer); } @@ -1136,7 +1136,7 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, * E.g.: struct {int i; int n} s; * SetValue(device, "s", [1, 2], 8) => s = {1, 0}; */ - else if ((is_pointer || (!is_pointer && inclass == D3DXPC_MATRIX_ROWS)) && desc->RegisterSet != D3DXRS_BOOL) + else if ((is_pointer || inclass == D3DXPC_MATRIX_ROWS) && desc->RegisterSet != D3DXRS_BOOL) { last = set(table, device, &constant->constants[0], indata, intype, size, incol, inclass, index + last, is_pointer);

1 0

Nikolay Sivov : strmbase: Avoid using HRESULT codes as BOOL value ( PVS-Studio).
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: a59e3e0f4ef9b3232d3cd24f237f48f4e6920003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59e3e0f4ef9b3232d3cd24f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 16 10:17:59 2015 +0300 strmbase: Avoid using HRESULT codes as BOOL value (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/outputqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index cbcd964..36960e3 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -101,7 +101,7 @@ HRESULT WINAPI OutputQueue_Construct( EnterCriticalSection(&This->csQueue); if (bAuto && pInputPin->pMemInputPin) - threaded = IMemInputPin_ReceiveCanBlock(pInputPin->pMemInputPin); + threaded = IMemInputPin_ReceiveCanBlock(pInputPin->pMemInputPin) == S_OK; else threaded = bQueue;

1 0

Henri Verbeet : d3d8: Simplify d3d8_device_GetBackBuffer().
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: aee692d2244127ecea4f477ed0d3a83ceb6dd5c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee692d2244127ecea4f477ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:35:07 2015 +0200 d3d8: Simplify d3d8_device_GetBackBuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 20ce900..9dd78b0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -722,7 +722,7 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface8 **backbuffer) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - struct wined3d_swapchain *swapchain; + struct wined3d_swapchain *wined3d_swapchain; struct wined3d_resource *wined3d_resource; struct wined3d_texture *wined3d_texture; struct d3d8_surface *surface_impl; @@ -734,14 +734,9 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, /* No need to check for backbuffer == NULL, Windows crashes in that case. */ wined3d_mutex_lock(); - if (!(swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0))) - { - wined3d_mutex_unlock(); - *backbuffer = NULL; - return D3DERR_INVALIDCALL; - } - if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain, backbuffer_idx))) + wined3d_swapchain = device->implicit_swapchain->wined3d_swapchain; + if (!(wined3d_texture = wined3d_swapchain_get_back_buffer(wined3d_swapchain, backbuffer_idx))) { wined3d_mutex_unlock(); *backbuffer = NULL;

1 0