wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Francois Gouget : winetest: Fail tests units that spam the test report.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: tools Branch: master Commit: 0aa7f8d0d9c6b5dad1076553fffdf1078886784b URL: https://source.winehq.org/git/tools.git/?a=commit;h=0aa7f8d0d9c6b5dad107655… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 12 00:59:49 2018 +0100 winetest: Fail tests units that spam the test report. To not exceed the maximum report size, each test unit must print less than 2.5KB of traces on average. So report tests that hog more than 10 times that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 10 +++++++++- winetest/winetest.conf | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 4cb31b0..9635f0a 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -48,7 +48,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$workdir $gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxfilesize $acceptprediluvianwin/; +use vars qw/$workdir $gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxunitsize $maxfilesize $acceptprediluvianwin/; require "winetest.conf"; my $name0=$0; @@ -435,6 +435,7 @@ while ($line = <IN> || "") # my ($dll, $unit, $source, $rev, $result) = ("", "", ""); +my $unitsize = 0; my ($failures, $todo, $skipped) = (0, 0, 0); my ($s_failures, $s_todo, $s_skipped, $s_total) = (0, 0, 0, 0); my (%pids, $rc, $summary, $broken); @@ -523,6 +524,11 @@ sub close_test_unit($) $todo ||= $s_todo; $skipped ||= $s_skipped; + if ($unitsize > $maxunitsize) + { + add_test_line("end", "The test prints too much data ($unitsize bytes)"); + $extra_failures++; + } if (!$broken and defined $rc) { # Check the exit code, particularly against failures reported @@ -563,6 +569,7 @@ sub close_test_unit($) } $dll = $unit = ""; + $unitsize = 0; $failures = $todo = $skipped = 0; $s_failures = $s_todo = $s_skipped = $s_total = 0; $extra_failures = $broken = 0; @@ -572,6 +579,7 @@ sub close_test_unit($) $line =~ /^Test output:/ or mydie "no test header: $line"; while ($line = <IN>) { + $unitsize += length($line); next if ($line =~ /^\s*$/); chomp $line; $line =~ s/\r+$//; diff --git a/winetest/winetest.conf b/winetest/winetest.conf index ba15514..84824a2 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -17,6 +17,9 @@ $maxfailedtests = 50; # Whether to accept test results from Win9x / NT4 versions $acceptprediluvianwin = 0; +# Maximum amount of traces for a test unit +$maxunitsize = 32 * 1024; + # Maximum size of the report file # This should be in line with programs\winetest\send.c $maxfilesize = 1.5 * 1024 * 1024;

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

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

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

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 : 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: 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 : 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 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: Add support for multisample textures in context_dump_fbo_attachment().
by Alexandre Julliard 09 Feb '18

09 Feb '18

Module: wine Branch: master Commit: 32e61de2825e1b01ac55195ecdf7b997d587e37a URL: https://source.winehq.org/git/wine.git/?a=commit;h=32e61de2825e1b01ac55195e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:21 2018 +0100 wined3d: Add support for multisample textures in context_dump_fbo_attachment(). 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/context.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9a69921..e3e4834 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -238,9 +238,11 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G } texture_type[] = { - {GL_TEXTURE_2D, GL_TEXTURE_BINDING_2D, "2d", WINED3D_GL_EXT_NONE}, - {GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB, "rectangle", ARB_TEXTURE_RECTANGLE}, - {GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BINDING_2D_ARRAY, "2d-array", EXT_TEXTURE_ARRAY}, + {GL_TEXTURE_2D, GL_TEXTURE_BINDING_2D, "2d", WINED3D_GL_EXT_NONE}, + {GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB, "rectangle", ARB_TEXTURE_RECTANGLE}, + {GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BINDING_2D_ARRAY, "2d-array" , EXT_TEXTURE_ARRAY}, + {GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_BINDING_2D_MULTISAMPLE, "2d-ms", ARB_TEXTURE_MULTISAMPLE}, + {GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY, "2d-array-ms", ARB_TEXTURE_MULTISAMPLE}, }; GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target; @@ -307,6 +309,7 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt)); GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_WIDTH, &width)); GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_HEIGHT, &height)); + GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_SAMPLES, &samples)); } else { @@ -336,13 +339,17 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_SAMPLES, &samples); + else + samples = 1; gl_info->gl_ops.gl.p_glBindTexture(tex_target, old_texture); } } - FIXME(" %s: %s texture %d, %dx%d, format %#x.\n", debug_fboattachment(attachment), - tex_type_str, name, width, height, fmt); + FIXME(" %s: %s texture %d, %dx%d, %d samples, format %#x.\n", + debug_fboattachment(attachment), tex_type_str, name, width, height, samples, fmt); checkGLcall("guess texture type"); }

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
81
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 February 2018