February 2017 - Wine-Commits

Henri Verbeet : wined3d: Check for depth/ stencil surfaces in individual surface location loaders.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: 49a1b7b54029a6cd23c89931ea061437619f73a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a1b7b54029a6cd23c89931e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 22 00:53:21 2017 +0100 wined3d: Check for depth/stencil surfaces in individual surface location loaders. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 73 +++++++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3acf19a..15e020e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2505,9 +2505,16 @@ static BOOL surface_load_sysmem(struct wined3d_surface *surface, struct wined3d_texture *texture = surface->container; struct wined3d_texture_sub_resource *sub_resource; + sub_resource = &texture->sub_resources[sub_resource_idx]; + if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", + wined3d_debug_location(sub_resource->locations)); + return FALSE; + } + wined3d_texture_prepare_location(texture, sub_resource_idx, context, dst_location); - sub_resource = &texture->sub_resources[sub_resource_idx]; if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); @@ -2534,18 +2541,26 @@ static BOOL surface_load_sysmem(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -static HRESULT surface_load_drawable(struct wined3d_surface *surface, +static BOOL surface_load_drawable(struct wined3d_surface *surface, struct wined3d_context *context) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; RECT r; + if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + DWORD current = texture->sub_resources[sub_resource_idx].locations; + FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", + wined3d_debug_location(current)); + return FALSE; + } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && wined3d_resource_is_offscreen(&texture->resource)) { ERR("Trying to load offscreen surface into WINED3D_LOCATION_DRAWABLE.\n"); - return WINED3DERR_INVALIDCALL; + return FALSE; } surface_get_rect(surface, NULL, &r); @@ -2553,7 +2568,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, surface_blt_to_drawable(texture->resource.device, context, WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); - return WINED3D_OK; + return TRUE; } static HRESULT surface_load_texture(struct wined3d_surface *surface, @@ -2573,13 +2588,20 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, RECT src_rect; sub_resource = surface_get_sub_resource(surface); + if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", + wined3d_debug_location(sub_resource->locations)); + return FALSE; + } + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && wined3d_resource_is_offscreen(&texture->resource) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { surface_load_fb_texture(surface, srgb, context); - return WINED3D_OK; + return TRUE; } width = wined3d_texture_get_level_width(texture, surface->texture_level); @@ -2599,7 +2621,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect, surface, WINED3D_LOCATION_TEXTURE_RGB, &src_rect); - return WINED3D_OK; + return TRUE; } if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) @@ -2615,7 +2637,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, &src_rect, surface, dst_location, &src_rect); - return WINED3D_OK; + return TRUE; } /* Upload from system memory */ @@ -2678,7 +2700,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { ERR("Out of memory (%u).\n", dst_slice_pitch); context_release(context); - return E_OUTOFMEMORY; + return FALSE; } format.convert(src_mem, dst_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, width, height, 1); @@ -2702,7 +2724,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { ERR("Out of memory (%u).\n", dst_slice_pitch); context_release(context); - return E_OUTOFMEMORY; + return FALSE; } if (texture->swapchain && texture->swapchain->palette) palette = texture->swapchain->palette; @@ -2720,11 +2742,11 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, HeapFree(GetProcessHeap(), 0, dst_mem); - return WINED3D_OK; + return TRUE; } /* Context activation is done by the caller. */ -static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wined3d_context *context, +static BOOL surface_load_renderbuffer(struct wined3d_surface *surface, struct wined3d_context *context, DWORD dst_location) { struct wined3d_texture *texture = surface->container; @@ -2734,6 +2756,13 @@ static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wi DWORD locations = surface_get_sub_resource(surface)->locations; DWORD src_location; + if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", + wined3d_debug_location(locations)); + return FALSE; + } + if (locations & WINED3D_LOCATION_RB_MULTISAMPLE) src_location = WINED3D_LOCATION_RB_MULTISAMPLE; else if (locations & WINED3D_LOCATION_RB_RESOLVED) @@ -2745,24 +2774,15 @@ static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wi surface_blt_fbo(texture->resource.device, context, WINED3D_TEXF_POINT, surface, src_location, &rect, surface, dst_location, &rect); + + return TRUE; } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; - TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) - { - DWORD current = texture->sub_resources[sub_resource_idx].locations; - FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", - wined3d_debug_location(current), wined3d_debug_location(location)); - return FALSE; - } - switch (location) { case WINED3D_LOCATION_USER_MEMORY: @@ -2771,17 +2791,16 @@ BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_conte return surface_load_sysmem(surface, context, location); case WINED3D_LOCATION_DRAWABLE: - return SUCCEEDED(surface_load_drawable(surface, context)); + return surface_load_drawable(surface, context); case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_MULTISAMPLE: - surface_load_renderbuffer(surface, context, location); - return TRUE; + return surface_load_renderbuffer(surface, context, location); case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: - return SUCCEEDED(surface_load_texture(surface, context, - location == WINED3D_LOCATION_TEXTURE_SRGB)); + return surface_load_texture(surface, context, + location == WINED3D_LOCATION_TEXTURE_SRGB); default: ERR("Don't know how to handle location %#x.\n", location);

1 0

Henri Verbeet : wined3d: Return a failure if the location couldn' t be loaded in surface_load_sysmem().
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: a315899dbf010009b8caf7fd57f3648772eb088f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a315899dbf010009b8caf7fd5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 22 00:53:20 2017 +0100 wined3d: Return a failure if the location couldn't be loaded in surface_load_sysmem(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 96819a6..3acf19a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2497,7 +2497,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE } /* Context activation is done by the caller. */ -static void surface_load_sysmem(struct wined3d_surface *surface, +static BOOL surface_load_sysmem(struct wined3d_surface *surface, struct wined3d_context *context, DWORD dst_location) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); @@ -2519,17 +2519,18 @@ static void surface_load_sysmem(struct wined3d_surface *surface, surface_download_data(surface, gl_info, dst_location); ++texture->download_count; - return; + return TRUE; } if (sub_resource->locations & WINED3D_LOCATION_DRAWABLE) { read_from_framebuffer(surface, context, dst_location); - return; + return TRUE; } FIXME("Can't load surface %p with location flags %s into sysmem.\n", surface, wined3d_debug_location(sub_resource->locations)); + return FALSE; } /* Context activation is done by the caller. */ @@ -2767,8 +2768,7 @@ BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_conte case WINED3D_LOCATION_USER_MEMORY: case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: - surface_load_sysmem(surface, context, location); - return TRUE; + return surface_load_sysmem(surface, context, location); case WINED3D_LOCATION_DRAWABLE: return SUCCEEDED(surface_load_drawable(surface, context));

1 0

Henri Verbeet : wined3d: Return a BOOL from surface_load_location().
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: wine Branch: master Commit: 8de7e5ccef4f102982494bb0b70373dca74a4192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de7e5ccef4f102982494bb0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 22 00:53:19 2017 +0100 wined3d: Return a BOOL from surface_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 23 ++++++++--------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b30585c..96819a6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2747,11 +2747,10 @@ static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wi } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ -HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) +BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; - HRESULT hr; TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); @@ -2760,7 +2759,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co DWORD current = texture->sub_resources[sub_resource_idx].locations; FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", wined3d_debug_location(current), wined3d_debug_location(location)); - return WINED3DERR_INVALIDCALL; + return FALSE; } switch (location) @@ -2769,31 +2768,25 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: surface_load_sysmem(surface, context, location); - break; + return TRUE; case WINED3D_LOCATION_DRAWABLE: - if (FAILED(hr = surface_load_drawable(surface, context))) - return hr; - break; + return SUCCEEDED(surface_load_drawable(surface, context)); case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_MULTISAMPLE: surface_load_renderbuffer(surface, context, location); - break; + return TRUE; case WINED3D_LOCATION_TEXTURE_RGB: case WINED3D_LOCATION_TEXTURE_SRGB: - if (FAILED(hr = surface_load_texture(surface, context, - location == WINED3D_LOCATION_TEXTURE_SRGB))) - return hr; - break; + return SUCCEEDED(surface_load_texture(surface, context, + location == WINED3D_LOCATION_TEXTURE_SRGB)); default: ERR("Don't know how to handle location %#x.\n", location); - break; + return FALSE; } - - return WINED3D_OK; } static HRESULT ffp_blit_alloc(struct wined3d_device *device) { return WINED3D_OK; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d86e7ec..037682d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1574,7 +1574,7 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { - return SUCCEEDED(surface_load_location(texture->sub_resources[sub_resource_idx].u.surface, context, location)); + return surface_load_location(texture->sub_resources[sub_resource_idx].u.surface, context, location); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fd03674..66c1002 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3024,7 +3024,7 @@ HRESULT wined3d_surface_create_dc(struct wined3d_surface *surface) DECLSPEC_HIDD void wined3d_surface_destroy_dc(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; -HRESULT surface_load_location(struct wined3d_surface *surface, +BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN;

1 0

Francois Gouget : testbot/WineRunTask: Don' t complain about unreported failures for timeouts.
by Alexandre Julliard Feb. 22, 2017

Feb. 22, 2017

Module: tools Branch: master Commit: 204ba3e525d9418b86dd9ec2363d8dfae4db2037 URL: http://source.winehq.org/git/tools.git/?a=commit;h=204ba3e525d9418b86dd9ec2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 22 16:31:12 2017 +0100 testbot/WineRunTask: Don't complain about unreported failures for timeouts. When a test times out it usually does not have time to print the test summary line so complaining would be redundant. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 0b686f6..b48d65b 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -539,7 +539,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # Verify the summary lines if (!$CurrentIsPolluted) { - if ($LineFailures != 0 and $SummaryFailures == 0) + if ($LineFailures != 0 and $SummaryFailures == 0 and !$TimedOut) { LogTaskError("$Dll:$Unit has unreported failures\n"); $LogFailures++;

1 0

Józef Kucia : wined3d: Store actual GL_MAX_TEXTURE_IMAGE_UNITS in "fragment_samplers".
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 3f3b3e1772b36868caf7ee3bdba5de04b00ae9c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3b3e1772b36868caf7ee3bd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:46 2017 +0100 wined3d: Store actual GL_MAX_TEXTURE_IMAGE_UNITS in "fragment_samplers". 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/state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 56193da..8342325 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3419,7 +3419,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); - gl_info->limits.fragment_samplers = min(MAX_FRAGMENT_SAMPLERS, gl_max); + gl_info->limits.fragment_samplers = gl_max; } else { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 83a6cae..07f1263 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3323,7 +3323,7 @@ static void tex_coordindex(struct wined3d_context *context, const struct wined3d return; } - if (mapped_stage >= gl_info->limits.fragment_samplers) + if (mapped_stage >= min(gl_info->limits.fragment_samplers, MAX_FRAGMENT_SAMPLERS)) { WARN("stage %u not mapped to a valid texture unit (%u)\n", stage, mapped_stage); return;

1 0

Józef Kucia : wined3d: Request compatibility profile in GLSL for legacy contexts.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 30ae841fefb11ee9e6dfb69c438776cf959fca92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30ae841fefb11ee9e6dfb69c4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:40 2017 +0100 wined3d: Request compatibility profile in GLSL for legacy contexts. The deprecated GLSL functions are used in the GLSL generated for legacy contexts. 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 72039b7..41adac1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -366,7 +366,11 @@ static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_inf static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info, const struct wined3d_shader_version *version) { - shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info, version)); + unsigned int glsl_version = shader_glsl_get_version(gl_info, version); + if (glsl_version >= 150 && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + shader_addline(buffer, "#version %u compatibility\n", glsl_version); + else + shader_addline(buffer, "#version %u\n", glsl_version); } static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values)

1 0

Bruno Jesus : winemp3.acm: Fixes compilation for older mpg123 library versions.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: bb036ae502f7012af17a4a5eefcb43e294ab502f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb036ae502f7012af17a4a5ee… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Feb 19 22:16:18 2017 -0300 winemp3.acm: Fixes compilation for older mpg123 library versions. Thanks to Sebastian Lackner for the correct approach. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 28a1998..cc6008d 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -249,12 +249,14 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) aad->mh = mpg123_new(NULL,&err); mpg123_open_feed(aad->mh); +#if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */ /* mpg123 may find a XING header in the mp3 and use that information * to ask for seeks in order to read specific frames in the file. * We cannot allow that since the caller application is feeding us. * This fixes problems for mp3 files encoded with LAME (bug 42361) */ mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); +#endif } /* no encoding yet else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM &&

1 0

Stefan Dösinger : d3d8/tests: Work around a r500 Windows point sprite bug.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 3ba0872239264bf45792eeed0a88f39b01bae7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba0872239264bf45792eeed0… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Feb 20 22:31:02 2017 +0000 d3d8/tests: Work around a r500 Windows point sprite bug. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a7177d3..d314edb 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -6937,6 +6937,17 @@ static void test_pointsize(void) goto done; } + /* The r500 Windows driver needs a draw with regular texture coordinates at least once during the + * device's lifetime, otherwise texture coordinate generation only works for texture 0. */ + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(SUCCEEDED(hr), "Failed to set FVF, hr=%#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, vertices, sizeof(float) * 5); + 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); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE);

1 0

Józef Kucia : wined3d: Get rid of shader_glsl_get_version_declaration().
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: c74847111ff27dabcbc676de1ead8bb845e468e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74847111ff27dabcbc676de1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:39 2017 +0100 wined3d: Get rid of shader_glsl_get_version_declaration(). 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 | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ca70859..72039b7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -363,23 +363,10 @@ static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_inf return 120; } -static const char *shader_glsl_get_version_declaration(const struct wined3d_gl_info *gl_info, - const struct wined3d_shader_version *version) +static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, const struct wined3d_shader_version *version) { - unsigned int glsl_version; - - switch (glsl_version = shader_glsl_get_version(gl_info, version)) - { - case 150: - return "#version 150"; - case 130: - return "#version 130"; - case 120: - return "#version 120"; - default: - FIXME("Unexpected GLSL version %u requested.\n", glsl_version); - return ""; - } + shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info, version)); } static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values) @@ -6150,7 +6137,7 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl string_buffer_clear(buffer); - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &vs->reg_maps.shader_version)); + shader_glsl_add_version_declaration(buffer, gl_info, &vs->reg_maps.shader_version); if (per_vertex_point_size) { @@ -6431,7 +6418,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context priv_ctx.cur_np2fixup_info = np2fixup_info; priv_ctx.string_buffers = string_buffers; - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); + shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DERIVATIVE_CONTROL]) @@ -6585,7 +6572,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context /* Create the hw GLSL shader program and assign it as the shader->prgId */ GLuint shader_id = GL_EXTCALL(glCreateShader(GL_VERTEX_SHADER)); - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); + shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DRAW_INSTANCED]) @@ -6641,7 +6628,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_id = GL_EXTCALL(glCreateShader(GL_GEOMETRY_SHADER)); - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); + shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_GEOMETRY_SHADER4]) @@ -6699,7 +6686,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * shader_id = GL_EXTCALL(glCreateShader(GL_COMPUTE_SHADER)); - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); + shader_glsl_add_version_declaration(buffer, gl_info, &reg_maps->shader_version); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_COMPUTE_SHADER]) @@ -7172,7 +7159,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr string_buffer_clear(buffer); - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, NULL)); + shader_glsl_add_version_declaration(buffer, gl_info, NULL); if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); @@ -7743,7 +7730,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } lowest_disabled_stage = stage; - shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, NULL)); + shader_glsl_add_version_declaration(buffer, gl_info, NULL); if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n");

1 0

Józef Kucia : d3d9: Get rid of WINECAPSTOD3D9CAPS() macro.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 6b98526c57e62923afcc2eff8d4ed2ae795ec3dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b98526c57e62923afcc2eff8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:43 2017 +0100 d3d9: Get rid of WINECAPSTOD3D9CAPS() macro. 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/d3d9_private.h | 78 +--------------------------------------------- dlls/d3d9/device.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/d3d9/directx.c | 2 +- 3 files changed, 82 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b98526c57e62923afcc2…

1 0