wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

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

22 Feb '17

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 22 Feb '17

22 Feb '17

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 22 Feb '17

22 Feb '17

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 22 Feb '17

22 Feb '17

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: Check if texture unit mapping is required in context_update_tex_unit_map( ).
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 3d62cd26d1b988b373efae0b9c4a0a988985d45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d62cd26d1b988b373efae0b9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:47 2017 +0100 wined3d: Check if texture unit mapping is required in context_update_tex_unit_map(). 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 | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cb1935a..93b49a0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2865,15 +2865,9 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i, tex; WORD ffu_map; - context_update_fixed_function_usage_map(context, state); - - if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) - return; - ffu_map = context->fixed_function_usage_map; if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages @@ -2915,14 +2909,10 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, static void context_map_psamplers(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader_resource_info *resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; unsigned int i; - if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) - return; - for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { if (resource_info[i].type && context->tex_unit_map[i] != i) @@ -2970,9 +2960,6 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers) - 1; int i; - if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) - return; - /* Note that we only care if a resource is used or not, not the * resource's specific type. Otherwise we'd need to call * shader_update_samplers() here for 1.x pixelshaders. */ @@ -3008,14 +2995,21 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons static void context_update_tex_unit_map(struct wined3d_context *context, const struct wined3d_state *state) { + const struct wined3d_gl_info *gl_info = context->gl_info; BOOL vs = use_vs(state); BOOL ps = use_ps(state); + if (!ps) + context_update_fixed_function_usage_map(context, state); + /* Try to go for a 1:1 mapping of the samplers when possible. Pixel shaders * need a 1:1 map at the moment. * When the mapping of a stage is changed, sampler and ALL texture stage * states have to be reset. */ + if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) + return; + if (ps) context_map_psamplers(context, state); else

1 0

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

21 Feb '17

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: Get rid of "tmp" variables in wined3d_adapter_init_limits().
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 9acc780aadbc5749d27ebc79b20749170234da42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9acc780aadbc5749d27ebc79b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:45 2017 +0100 wined3d: Get rid of "tmp" variables in wined3d_adapter_init_limits(). 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 | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0df4b58..56193da 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3416,11 +3416,10 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { - GLint tmp; 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, &tmp); - gl_info->limits.fragment_samplers = min(MAX_FRAGMENT_SAMPLERS, tmp); + 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); } else { @@ -3432,13 +3431,12 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) if (gl_info->supported[ARB_VERTEX_SHADER]) { - GLint tmp; - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB, &tmp); - gl_info->limits.vertex_samplers = tmp; - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, &tmp); - gl_info->limits.combined_samplers = tmp; - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &tmp); - gl_info->limits.vertex_attribs = tmp; + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); + gl_info->limits.vertex_samplers = gl_max; + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, &gl_max); + gl_info->limits.combined_samplers = gl_max; + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &gl_max); + gl_info->limits.vertex_attribs = gl_max; /* Loading GLSL sampler uniforms is much simpler if we can assume that the sampler setup * is known at shader link time. In a vertex shader + pixel shader combination this isn't

1 0

Józef Kucia : d3d9: Merge filter_caps() into d3dcaps_from_wined3dcaps().
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 711539bc6e89cb980d4c28fee2200f1b9e84fb7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=711539bc6e89cb980d4c28fee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:44 2017 +0100 d3d9: Merge filter_caps() into d3dcaps_from_wined3dcaps(). 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 | 1 - dlls/d3d9/device.c | 88 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/d3d9/directx.c | 82 -------------------------------------------- 3 files changed, 83 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=711539bc6e89cb980d4c2…

1 0

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

21 Feb '17

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

Józef Kucia : d3d8: Merge fixup_caps() into d3dcaps_from_wined3dcaps().
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 377c2eebbfc750d67c687c1d81911200b92c004d URL: http://source.winehq.org/git/wine.git/?a=commit;h=377c2eebbfc750d67c687c1d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 21 13:24:42 2017 +0100 d3d8: Merge fixup_caps() into d3dcaps_from_wined3dcaps(). 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/d3d8/d3d8_private.h | 1 - dlls/d3d8/device.c | 14 +++++++++++++- dlls/d3d8/directx.c | 17 ----------------- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 1a7d7fd..e7dea35 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -42,7 +42,6 @@ #define VS_HIGHESTFIXEDFXF 0xF0000000 void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const WINED3DCAPS *wined3d_caps) DECLSPEC_HIDDEN; -void fixup_caps(WINED3DCAPS *pWineCaps) DECLSPEC_HIDDEN; struct d3d8 { diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1ef7420..d7a933b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -282,6 +282,19 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const WINED3DCAPS *wined3d_caps) caps->MaxVertexShaderConst = wined3d_caps->MaxVertexShaderConst; caps->PixelShaderVersion = wined3d_caps->PixelShaderVersion; caps->MaxPixelShaderValue = wined3d_caps->PixelShader1xMaxValue; + + /* D3D8 doesn't support SM 2.0 or higher, so clamp to 1.x */ + if (caps->PixelShaderVersion) + caps->PixelShaderVersion = D3DPS_VERSION(1, 4); + else + caps->PixelShaderVersion = D3DPS_VERSION(0, 0); + if (caps->VertexShaderVersion) + caps->VertexShaderVersion = D3DVS_VERSION(1, 1); + else + caps->VertexShaderVersion = D3DVS_VERSION(0, 0); + caps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, caps->MaxVertexShaderConst); + + caps->StencilCaps &= ~WINED3DSTENCILCAPS_TWOSIDED; } /* Handle table functions */ @@ -527,7 +540,6 @@ static HRESULT WINAPI d3d8_device_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); wined3d_mutex_unlock(); - fixup_caps(&wined3d_caps); d3dcaps_from_wined3dcaps(caps, &wined3d_caps); return hr; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 560e107..f91e4af 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -315,22 +315,6 @@ static HRESULT WINAPI d3d8_CheckDepthStencilMatch(IDirect3D8 *iface, UINT adapte return hr; } -void fixup_caps(WINED3DCAPS *caps) -{ - /* D3D8 doesn't support SM 2.0 or higher, so clamp to 1.x */ - if (caps->PixelShaderVersion) - caps->PixelShaderVersion = D3DPS_VERSION(1,4); - else - caps->PixelShaderVersion = D3DPS_VERSION(0,0); - if (caps->VertexShaderVersion) - caps->VertexShaderVersion = D3DVS_VERSION(1,1); - else - caps->VertexShaderVersion = D3DVS_VERSION(0,0); - caps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, caps->MaxVertexShaderConst); - - caps->StencilCaps &= ~WINED3DSTENCILCAPS_TWOSIDED; -} - static HRESULT WINAPI d3d8_GetDeviceCaps(IDirect3D8 *iface, UINT adapter, D3DDEVTYPE device_type, D3DCAPS8 *caps) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); @@ -346,7 +330,6 @@ static HRESULT WINAPI d3d8_GetDeviceCaps(IDirect3D8 *iface, UINT adapter, D3DDEV hr = wined3d_get_device_caps(d3d8->wined3d, adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); - fixup_caps(&wined3d_caps); d3dcaps_from_wined3dcaps(caps, &wined3d_caps); return hr;

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
84
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 2017