February 2018 - Wine-commits

Józef Kucia : wined3d: Add registry setting to enable multisample textures.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: 11dd0601c5184e58c708d7763b9f55e572d52e1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=11dd0601c5184e58c708d776… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:22 2018 +0100 wined3d: Add registry setting to enable multisample textures. The registry key helps to add multisample textures support incrementally without breaking the current support for multisample renderbuffers. It might be also useful to have a possibility to disable multisample textures when they are the default code path for multisampling in wined3d. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_main.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1be6d2b..6dee5ed 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4244,6 +4244,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, WARN("Disabling ARB_draw_indirect because ARB_base_instance is not supported.\n"); gl_info->supported[ARB_DRAW_INDIRECT] = FALSE; } + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE] && !wined3d_settings.multisample_textures) + gl_info->supported[ARB_TEXTURE_MULTISAMPLE] = FALSE; wined3d_adapter_init_limits(gl_info); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 28a34a7..d3d3f2d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -81,6 +81,7 @@ struct wined3d_settings wined3d_settings = PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ + FALSE, /* Prefer multisample renderbuffers to multisample textures by default. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* No strict draw ordering. */ FALSE, /* Don't range check relative addressing indices in float constants. */ @@ -284,6 +285,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (!wined3d_settings.logo) ERR("Failed to allocate logo path memory.\n"); else memcpy(wined3d_settings.logo, buffer, len); } + if (!get_config_key_dword(hkey, appkey, "MultisampleTextures", &wined3d_settings.multisample_textures)) + ERR_(winediag)("Setting multisample textures to %#x.\n", wined3d_settings.multisample_textures); if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", wined3d_settings.sample_count); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bf17a1c..f1f7530 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -391,6 +391,7 @@ struct wined3d_settings /* Memory tracking and object counting. */ UINT64 emulated_textureram; char *logo; + unsigned int multisample_textures; unsigned int sample_count; BOOL strict_draw_ordering; BOOL check_float_constants;

1 0

Józef Kucia : wined3d: Create multisample textures.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: 2fd86a17bb73b5e32b5e9e0208a8dd050388f7ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fd86a17bb73b5e32b5e9e02… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:23 2018 +0100 wined3d: Create multisample textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 3 --- dlls/wined3d/directx.c | 5 ++++ dlls/wined3d/resource.c | 14 ++++++++++- dlls/wined3d/texture.c | 64 +++++++++++++++++++++++++++++++++---------------- 4 files changed, 61 insertions(+), 25 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 4d500c9..39d71cd 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -512,9 +512,6 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE wined3d_private_store_init(&texture->private_store); texture->desc = *desc; - if (desc->SampleDesc.Count > 1) - FIXME("Multisampled textures not implemented.\n"); - wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_desc.multisample_type = desc->SampleDesc.Count > 1 ? desc->SampleDesc.Count : WINED3D_MULTISAMPLE_NONE; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6dee5ed..c8f42fe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4246,6 +4246,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, } if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE] && !wined3d_settings.multisample_textures) gl_info->supported[ARB_TEXTURE_MULTISAMPLE] = FALSE; + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE] && !gl_info->supported[ARB_TEXTURE_STORAGE_MULTISAMPLE]) + { + WARN("Disabling ARB_texture_multisample because immutable storage is not supported.\n"); + gl_info->supported[ARB_TEXTURE_MULTISAMPLE] = FALSE; + } wined3d_adapter_init_limits(gl_info); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 61ff206..e318888 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -442,11 +442,23 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) { if (!wined3d_resource_is_offscreen(resource) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) + { resource->draw_binding = WINED3D_LOCATION_DRAWABLE; + } else if (resource->multisample_type) - resource->draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; + { + const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; + else + resource->draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; + } else if (resource->gl_type == WINED3D_GL_RES_TYPE_RB) + { resource->draw_binding = WINED3D_LOCATION_RB_RESOLVED; + } else + { resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; + } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 116b8db..5ff8a4f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -460,6 +460,13 @@ static unsigned int wined3d_texture_get_gl_sample_count(const struct wined3d_tex { const struct wined3d_format *format = texture->resource.format; + /* TODO: NVIDIA expose their Coverage Sample Anti-Aliasing (CSAA) + * feature through type == MULTISAMPLE_XX and quality != 0. This could + * be mapped to GL_NV_framebuffer_multisample_coverage. + * + * AMD have a similar feature called Enhanced Quality Anti-Aliasing + * (EQAA), but it does not have an equivalent OpenGL extension. */ + /* We advertise as many WINED3D_MULTISAMPLE_NON_MASKABLE quality * levels as the count of advertised multisample types for the texture * format. */ @@ -530,21 +537,31 @@ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture * static void wined3d_texture_allocate_gl_immutable_storage(struct wined3d_texture *texture, GLenum gl_internal_format, const struct wined3d_gl_info *gl_info) { - GLsizei width = wined3d_texture_get_level_pow2_width(texture, 0); + unsigned int samples = wined3d_texture_get_gl_sample_count(texture); GLsizei height = wined3d_texture_get_level_pow2_height(texture, 0); + GLsizei width = wined3d_texture_get_level_pow2_width(texture, 0); - if (texture->target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, gl_internal_format, - width, height, texture->layer_count)); - checkGLcall("glTexStorage3D"); - } - else + switch (texture->target) { - GL_EXTCALL(glTexStorage2D(texture->target, texture->level_count, gl_internal_format, - width, height)); - checkGLcall("glTexStorage2D"); + case GL_TEXTURE_2D_ARRAY: + GL_EXTCALL(glTexStorage3D(texture->target, texture->level_count, + gl_internal_format, width, height, texture->layer_count)); + break; + case GL_TEXTURE_2D_MULTISAMPLE: + GL_EXTCALL(glTexStorage2DMultisample(texture->target, samples, + gl_internal_format, width, height, GL_FALSE)); + break; + case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: + GL_EXTCALL(glTexStorage3DMultisample(texture->target, samples, + gl_internal_format, width, height, texture->layer_count, GL_FALSE)); + break; + default: + GL_EXTCALL(glTexStorage2D(texture->target, texture->level_count, + gl_internal_format, width, height)); + break; } + + checkGLcall("allocate immutable storage"); } static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) @@ -1502,13 +1519,6 @@ static void wined3d_texture_prepare_rb(struct wined3d_texture *texture, if (texture->rb_multisample) return; - /* TODO: NVIDIA expose their Coverage Sample Anti-Aliasing (CSAA) - * feature through type == MULTISAMPLE_XX and quality != 0. This could - * be mapped to GL_NV_framebuffer_multisample_coverage. - * - * AMD have a similar feature called Enhanced Quality Anti-Aliasing - * (EQAA), but it does not have an equivalent OpenGL extension. */ - samples = wined3d_texture_get_gl_sample_count(texture); gl_info->fbo_ops.glGenRenderbuffers(1, &texture->rb_multisample); @@ -2189,11 +2199,23 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture->pow2_matrix[5] = 1.0f; } if (desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP) + { texture->target = GL_TEXTURE_CUBE_MAP_ARB; - else if (layer_count > 1) - texture->target = GL_TEXTURE_2D_ARRAY; + } + else if (desc->multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + { + if (layer_count > 1) + texture->target = GL_TEXTURE_2D_MULTISAMPLE_ARRAY; + else + texture->target = GL_TEXTURE_2D_MULTISAMPLE; + } else - texture->target = GL_TEXTURE_2D; + { + if (layer_count > 1) + texture->target = GL_TEXTURE_2D_ARRAY; + else + texture->target = GL_TEXTURE_2D; + } } texture->pow2_matrix[10] = 1.0f; texture->pow2_matrix[15] = 1.0f;

1 0

Józef Kucia : wined3d: Add support for multisample textures in wined3d_texture_update_desc().
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: 7517d8c2e45e9c28203c269ea54033a1a31d1254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7517d8c2e45e9c28203c269e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:24 2018 +0100 wined3d: Add support for multisample textures in wined3d_texture_update_desc(). This might be called from wined3d_device_reset(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5ff8a4f..750101f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1347,9 +1347,9 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; } - if (texture->resource.type == WINED3D_RTYPE_TEXTURE_3D) + if (texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) { - WARN("Not supported on 3D textures.\n"); + WARN("Not supported on %s.\n", debug_d3dresourcetype(texture->resource.type)); return WINED3DERR_INVALIDCALL; } @@ -1403,6 +1403,12 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT sub_resource->size = texture->slice_pitch; sub_resource->locations = WINED3D_LOCATION_DISCARDED; + if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + texture->target = GL_TEXTURE_2D_MULTISAMPLE; + else + texture->target = GL_TEXTURE_2D; + texture->sub_resources[0].u.surface->texture_target = texture->target; + if (((width & (width - 1)) || (height & (height - 1))) && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) {

1 0

Józef Kucia : d3d9/tests: Add test for changing multisample type of implicit swapchain.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: f37eb6c0def54bef4297f5e44e3acad3aebb5c9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f37eb6c0def54bef4297f5e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:25 2018 +0100 d3d9/tests: Add test for changing multisample type of implicit swapchain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a9fd4e4..7c7017d 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12122,6 +12122,65 @@ static void test_clip_planes_limits(void) DestroyWindow(window); } +static void test_swapchain_multisample_reset(void) +{ + IDirect3DSwapChain9 *swapchain; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device; + DWORD quality_levels; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, &quality_levels) == D3DERR_NOTAVAILABLE) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a 3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == D3D_OK, "Failed to get the implicit swapchain, hr %#x.\n", hr); + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &d3dpp); + ok(hr == D3D_OK, "Failed to get present parameters, hr %#x.\n", hr); + ok(d3dpp.MultiSampleType == D3DMULTISAMPLE_NONE, + "Got unexpected multisample type %#x.\n", d3dpp.MultiSampleType); + IDirect3DSwapChain9_Release(swapchain); + + d3dpp.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; + d3dpp.MultiSampleQuality = quality_levels - 1; + hr = IDirect3DDevice9_Reset(device, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -12243,6 +12302,7 @@ START_TEST(device) test_destroyed_window(); test_lockable_backbuffer(); test_clip_planes_limits(); + test_swapchain_multisample_reset(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Józef Kucia : wined3d: Do not enable GL_ARB_texture_multisample in GLSL.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: 220841f33a4b343709802cb94a852730f2d20d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=220841f33a4b343709802cb9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:26 2018 +0100 wined3d: Do not enable GL_ARB_texture_multisample in GLSL. GLSL 1.50 is required for SM4+. Signed-off-by: Józef Kucia <jkucia(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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b3c6404..6f59cf1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7481,8 +7481,6 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_texture_cube_map_array : enable\n"); if (gl_info->supported[ARB_TEXTURE_GATHER]) shader_addline(buffer, "#extension GL_ARB_texture_gather : enable\n"); - if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) - shader_addline(buffer, "#extension GL_ARB_texture_multisample : enable\n"); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT])

1 0

Józef Kucia : wined3d: Add STATE_BLEND to debug_d3dstate().
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: b688f6ee34725f2b1e8e699d4d189b0f1da4ebb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b688f6ee34725f2b1e8e699d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:27 2018 +0100 wined3d: Add STATE_BLEND to debug_d3dstate(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 48f72fe..c4d6e65 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4658,6 +4658,8 @@ const char *debug_d3dstate(DWORD state) return "STATE_COLOR_KEY"; if (STATE_IS_STREAM_OUTPUT(state)) return "STATE_STREAM_OUTPUT"; + if (STATE_IS_BLEND(state)) + return "STATE_BLEND"; return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); }

1 0

Jacek Caban : jscript: Improve interp_local debug traces.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: a48ecc7e7c09e1912ae4d718fcc7b3d5d7442559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a48ecc7e7c09e1912ae4d718… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 9 14:30:41 2018 +0100 jscript: Improve interp_local debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 38d8657..8092159 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1296,7 +1296,7 @@ static HRESULT interp_local(script_ctx_t *ctx) jsval_t copy; HRESULT hres; - TRACE("%d\n", arg); + TRACE("%d: %s\n", arg, debugstr_w(local_name(frame, arg))); if(!frame->base_scope || !frame->base_scope->frame) return identifier_value(ctx, local_name(frame, arg));

1 0

Anton Romanov : wmp: Add IWMPPlayer interface.
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: 354fa7eb7921c3317e7943c18871febe5570dd52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=354fa7eb7921c3317e7943c1… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Wed Feb 7 12:24:44 2018 -0800 wmp: Add IWMPPlayer interface. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 3 + dlls/wmp/player.c | 271 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 17 +++ dlls/wmp/wmp_private.h | 1 + include/wmp.idl | 27 ++++- 5 files changed, 318 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=354fa7eb7921c3317e79…

1 0

Henri Verbeet : d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_vertex_buffer().
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: 96432c4cc26dbdd85fd6240b8f2aff425d53351d URL: https://source.winehq.org/git/wine.git/?a=commit;h=96432c4cc26dbdd85fd6240b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 9 01:46:43 2018 +0330 d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_vertex_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 15 +++++++++++---- dlls/wined3d/buffer.c | 46 ---------------------------------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 10 ---------- 4 files changed, 11 insertions(+), 61 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9dd58a3..3bd23b6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2543,15 +2543,22 @@ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UIN if (device->vertex_buffer_size < min_size || !device->vertex_buffer) { UINT size = max(device->vertex_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing vertex buffer to %u bytes.\n", size); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &d3d9_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x.\n", device, hr); + ERR("Failed to create vertex buffer, hr %#x.\n", hr); return hr; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f1b4556..f907ece 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1441,49 +1441,3 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct return WINED3D_OK; } - -static DWORD resource_access_from_pool(enum wined3d_pool pool) -{ - switch (pool) - { - case WINED3D_POOL_DEFAULT: - return WINED3D_RESOURCE_ACCESS_GPU; - - case WINED3D_POOL_MANAGED: - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; - - case WINED3D_POOL_SYSTEM_MEM: - return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; - - default: - FIXME("Unhandled pool %#x.\n", pool); - return 0; - } -} - -HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_pool pool, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) -{ - struct wined3d_buffer_desc desc; - - TRACE("device %p, size %u, usage %#x, pool %#x, parent %p, parent_ops %p, buffer %p.\n", - device, size, usage, pool, parent, parent_ops, buffer); - - if (usage & WINED3DUSAGE_SCRATCH) - { - /* The d3d9 tests shows that this is not allowed. It doesn't make much - * sense anyway, SCRATCH buffers wouldn't be usable anywhere. */ - WARN("Vertex buffer with WINED3DUSAGE_SCRATCH requested, returning WINED3DERR_INVALIDCALL.\n"); - *buffer = NULL; - return WINED3DERR_INVALIDCALL; - } - - desc.byte_width = size; - desc.usage = usage; - desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = resource_access_from_pool(pool); - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer); -} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f65cc85..7c1b5e3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -28,7 +28,6 @@ @ cdecl wined3d_blend_state_incref(ptr) @ cdecl wined3d_buffer_create(ptr ptr ptr ptr ptr ptr) -@ cdecl wined3d_buffer_create_vb(ptr long long long ptr ptr ptr) @ cdecl wined3d_buffer_decref(ptr) @ cdecl wined3d_buffer_get_parent(ptr) @ cdecl wined3d_buffer_get_resource(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f6ffdba..9d551d8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -680,13 +680,6 @@ enum wined3d_resource_type WINED3D_RTYPE_TEXTURE_3D = 3, }; -enum wined3d_pool -{ - WINED3D_POOL_DEFAULT = 0, - WINED3D_POOL_MANAGED = 1, - WINED3D_POOL_SYSTEM_MEM = 2, -}; - enum wined3d_query_type { WINED3D_QUERY_TYPE_VCACHE = 4, @@ -2195,9 +2188,6 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); -HRESULT __cdecl wined3d_buffer_create_vb(struct wined3d_device *device, UINT length, DWORD usage, - enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_buffer **buffer); ULONG __cdecl wined3d_buffer_decref(struct wined3d_buffer *buffer); void * __cdecl wined3d_buffer_get_parent(const struct wined3d_buffer *buffer); struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buffer *buffer);

1 0

Henri Verbeet : wined3d: Get rid of wined3d_get_draw_rect().
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: eb83a7c993a3c6f048dc882164c229710460bf63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb83a7c993a3c6f048dc8821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 9 01:46:44 2018 +0330 wined3d: Get rid of wined3d_get_draw_rect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/utils.c | 10 ---------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 76316e0..ed249f4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -501,14 +501,11 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) { - const struct wined3d_state *state = &cs->state; const struct wined3d_cs_clear *op = data; struct wined3d_device *device; unsigned int i; - RECT draw_rect; device = cs->device; - wined3d_get_draw_rect(state, &draw_rect); device->blitter->ops->blitter_clear(device->blitter, device, op->rt_count, op->fb, op->rect_count, op->rects, &op->draw_rect, op->flags, &op->color, op->depth, op->stencil); @@ -529,6 +526,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * { unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; const struct wined3d_state *state = &cs->device->state; + const struct wined3d_viewport *vp = &state->viewport; struct wined3d_cs_clear *op; unsigned int i; @@ -538,7 +536,9 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->flags = flags; op->rt_count = rt_count; op->fb = &cs->fb; - wined3d_get_draw_rect(state, &op->draw_rect); + SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); + if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) + IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rect); op->color = *color; op->depth = depth; op->stencil = stencil; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a31baa4..48f72fe 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5990,16 +5990,6 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb return memcmp(ka, kb, sizeof(*ka)); } -void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) -{ - const struct wined3d_viewport *vp = &state->viewport; - - SetRect(rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); - - if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) - IntersectRect(rect, rect, &state->scissor_rect); -} - const char *wined3d_debug_location(DWORD location) { const char *prefix = ""; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e2527f2..bf17a1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2695,7 +2695,6 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings) DECLSPEC_HIDDEN; void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc) DECLSPEC_HIDDEN; -void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) DECLSPEC_HIDDEN; void wined3d_ftoa(float value, char *s) DECLSPEC_HIDDEN; extern const float wined3d_srgb_const0[] DECLSPEC_HIDDEN;

1 0