March 2016 - Wine-commits - list.winehq.org

Józef Kucia : d3d11/tests: Add test for ClearRenderTargetView().
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 369a48c646190b3e3a491091737c75c266e06af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369a48c646190b3e3a4910917… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 23 13:42:50 2016 +0100 d3d11/tests: Add test for ClearRenderTargetView(). 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/tests/d3d11.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4953675..9348aff 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -265,6 +265,27 @@ static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) return NULL; } +static BOOL is_warp_device(ID3D11Device *device) +{ + DXGI_ADAPTER_DESC adapter_desc; + IDXGIDevice *dxgi_device; + IDXGIAdapter *adapter; + HRESULT hr; + + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to query IDXGIDevice interface, hr %#x.\n", hr); + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(SUCCEEDED(hr), "Failed to get adapter desc, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + return !adapter_desc.SubSysId && !adapter_desc.Revision + && ((!adapter_desc.VendorId && !adapter_desc.DeviceId) + || (adapter_desc.VendorId == 0x1414 && adapter_desc.DeviceId == 0x008c)); +} + static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window, BOOL windowed) { IDXGISwapChain *swapchain; @@ -5277,6 +5298,100 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_clear_render_target_view(void) +{ + static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; + static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + + ID3D11Texture2D *texture, *srgb_texture; + struct d3d11_test_context test_context; + ID3D11RenderTargetView *rtv, *srgb_rtv; + D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11Device *device; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &srgb_texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)srgb_texture, NULL, &srgb_rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, color); + check_texture_color(test_context.backbuffer, expected_color, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); + check_texture_color(texture, expected_color, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); + check_texture_color(srgb_texture, expected_srgb_color, 1); + + ID3D11RenderTargetView_Release(srgb_rtv); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(srgb_texture); + ID3D11Texture2D_Release(texture); + + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_TYPELESS; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create depth texture, hr %#x.\n", hr); + + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &srgb_rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); + check_texture_color(texture, expected_color, 1); + + if (!is_warp_device(device)) + { + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); + todo_wine check_texture_color(texture, expected_srgb_color, 1); + } + else + { + win_skip("Skipping broken test on WARP.\n"); + } + + + ID3D11RenderTargetView_Release(srgb_rtv); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_clear_depth_stencil_view(void) { D3D11_TEXTURE2D_DESC texture_desc; @@ -5760,6 +5875,7 @@ START_TEST(d3d11) test_resource_map(); test_multisample_init(); test_check_multisample_quality_levels(); + test_clear_render_target_view(); test_clear_depth_stencil_view(); test_draw_depth_only(); test_cb_relative_addressing();

1 0

Józef Kucia : wined3d: Implement SM4 sample_c instruction.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: e06180a564c2afc24d20602019f20e629124ac81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06180a564c2afc24d2060201… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 23 13:42:51 2016 +0100 wined3d: Implement SM4 sample_c instruction. 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 | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8664172..dd7f3b0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4473,6 +4473,31 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) shader_glsl_release_sample_function(ins->ctx, &sample_function); } +static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) +{ + unsigned int resource_idx, sampler_idx, sampler_bind_idx; + struct glsl_src_param coord_param, compare_param; + struct glsl_sample_function sample_function; + DWORD flags = 0; + UINT coord_size; + + if (wined3d_shader_instruction_has_texel_offset(ins)) + flags |= WINED3D_GLSL_SAMPLE_OFFSET; + + resource_idx = ins->src[1].reg.idx[0].offset; + sampler_idx = ins->src[2].reg.idx[0].offset; + + shader_glsl_get_sample_function(ins->ctx, resource_idx, flags, &sample_function); + coord_size = shader_glsl_get_write_mask_size(sample_function.coord_mask); + shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask >> 1, &coord_param); + shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); + sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); + shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, WINED3DSP_NOSWIZZLE, + NULL, NULL, NULL, &ins->texel_offset, "vec%u(%s, %s)", + coord_size, coord_param.param_str, compare_param.param_str); + shader_glsl_release_sample_function(ins->ctx, &sample_function); +} + static void shader_glsl_texcoord(const struct wined3d_shader_instruction *ins) { /* FIXME: Make this work for more than just 2D textures */ @@ -8163,7 +8188,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_B */ shader_glsl_sample, - /* WINED3DSIH_SAMPLE_C */ NULL, + /* WINED3DSIH_SAMPLE_C */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample,

1 0

Józef Kucia : wined3d: Implement SM4 sample_c_lz instruction.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: d563cdb0db7c9a881a5e374ebc1e43dad4c0b34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d563cdb0db7c9a881a5e374eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 23 13:42:52 2016 +0100 wined3d: Implement SM4 sample_c_lz instruction. 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 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dd7f3b0..48aeacc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4478,9 +4478,16 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) unsigned int resource_idx, sampler_idx, sampler_bind_idx; struct glsl_src_param coord_param, compare_param; struct glsl_sample_function sample_function; + const char *lod_param = NULL; DWORD flags = 0; UINT coord_size; + if (ins->handler_idx == WINED3DSIH_SAMPLE_C_LZ) + { + lod_param = "0"; + flags |= WINED3D_GLSL_SAMPLE_LOD; + } + if (wined3d_shader_instruction_has_texel_offset(ins)) flags |= WINED3D_GLSL_SAMPLE_OFFSET; @@ -4493,7 +4500,7 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, WINED3DSP_NOSWIZZLE, - NULL, NULL, NULL, &ins->texel_offset, "vec%u(%s, %s)", + NULL, NULL, lod_param, &ins->texel_offset, "vec%u(%s, %s)", coord_size, coord_param.param_str, compare_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -8189,7 +8196,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SAMPLE */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_B */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_C */ shader_glsl_sample_c, - /* WINED3DSIH_SAMPLE_C_LZ */ NULL, + /* WINED3DSIH_SAMPLE_C_LZ */ shader_glsl_sample_c, /* WINED3DSIH_SAMPLE_GRAD */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample, /* WINED3DSIH_SETP */ NULL,

1 0

Józef Kucia : wined3d: Use dcl_sampler to determine if shadow sampler is needed.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 510c8e39838e4ceef1a66b42e7e58484bf4ac143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=510c8e39838e4ceef1a66b42e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 23 13:42:53 2016 +0100 wined3d: Use dcl_sampler to determine if shadow sampler is needed. 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 | 58 +++++++++++++++++++++++++----------------- dlls/wined3d/shader.c | 10 ++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 46 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=510c8e39838e4ceef1a66…

1 0

Henri Verbeet : ddraw/tests: Rewrite blt_test().
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: f0c7c7f6276b267755d88c93531ac3dfd2180bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c7c7f6276b267755d88c935… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 22 17:46:08 2016 +0100 ddraw/tests: Rewrite blt_test(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 81 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 81 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 84 ++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 84 ++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 108 ---------------------------------------------- 5 files changed, 330 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0c7c7f6276b267755d88…

1 0

Henri Verbeet : ddraw/tests: Get rid of the unused "d3d" variable in test_shademode().
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 3c7ca3d5536e94078b6140d0ebeb44af2478b2f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7ca3d5536e94078b6140d0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 22 17:46:09 2016 +0100 ddraw/tests: Get rid of the unused "d3d" variable in test_shademode(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 4 ---- dlls/ddraw/tests/ddraw2.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 8462873..02eb9c9 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7939,7 +7939,6 @@ static void test_shademode(void) DWORD color0, color1; UINT i, inst_length; IDirectDraw *ddraw; - IDirect3D *d3d; ULONG refcount; HWND window; HRESULT hr; @@ -7986,8 +7985,6 @@ static void test_shademode(void) return; } - hr = IDirect3DDevice_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); @@ -8061,7 +8058,6 @@ static void test_shademode(void) destroy_viewport(device, viewport); destroy_material(background); IDirectDrawSurface_Release(rt); - IDirect3D_Release(d3d); refcount = IDirect3DDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index fe86149..ee3508f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -9063,7 +9063,6 @@ static void test_shademode(void) DWORD color0, color1; IDirectDraw2 *ddraw; D3DLVERTEX *quad; - IDirect3D2 *d3d; ULONG refcount; UINT i, count; HWND window; @@ -9113,8 +9112,6 @@ static void test_shademode(void) return; } - hr = IDirect3DDevice2_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); hr = IDirect3DDevice2_GetRenderTarget(device, &rt); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); @@ -9164,7 +9161,6 @@ static void test_shademode(void) destroy_viewport(device, viewport); destroy_material(background); IDirectDrawSurface_Release(rt); - IDirect3D2_Release(d3d); refcount = IDirect3DDevice2_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirectDraw_Release(ddraw);

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_blt_to_drawable().
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: c526188bb30619a3df80ad08109fa18b9d9e8f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c526188bb30619a3df80ad081… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 22 17:46:10 2016 +0100 wined3d: Get resource info from the texture in surface_blt_to_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c11d248..4243de6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2512,6 +2512,8 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { + struct wined3d_texture *src_texture = src_surface->container; + struct wined3d_texture *dst_texture = dst_surface->container; const struct wined3d_gl_info *gl_info; struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; @@ -2532,12 +2534,12 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, /* Make sure the surface is up-to-date. This should probably use * surface_load_location() and worry about the destination surface too, * unless we're overwriting it completely. */ - wined3d_texture_load(src_surface->container, context, FALSE); + wined3d_texture_load(src_texture, context, FALSE); /* Activate the destination context, set it up for blitting */ context_apply_blit_state(context, device); - if (!wined3d_resource_is_offscreen(&dst_surface->container->resource)) + if (!wined3d_resource_is_offscreen(&dst_texture->resource)) surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); device->blitter->set_shader(device->blit_priv, context, src_surface, NULL); @@ -2550,9 +2552,9 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, /* For P8 surfaces, the alpha component contains the palette index. * Which means that the colorkey is one of the palette entries. In * other cases pixels that should be masked away have alpha set to 0. */ - if (src_surface->resource.format->id == WINED3DFMT_P8_UINT) + if (src_texture->resource.format->id == WINED3DFMT_P8_UINT) gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, - (float)src_surface->container->async.src_blt_color_key.color_space_low_value / 255.0f); + (float)src_texture->async.src_blt_color_key.color_space_low_value / 255.0f); else gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, 0.0f); checkGLcall("glAlphaFunc"); @@ -2575,8 +2577,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, device->blitter->unset_shader(context->gl_info); if (wined3d_settings.strict_draw_ordering - || (dst_surface->container->swapchain - && dst_surface->container->swapchain->front_buffer == dst_surface->container)) + || (dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)) gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ if (restore_rt)

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_blt_special().
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 6d823825faeeab73dea821c24060d3fd8ff5c817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d823825faeeab73dea821c24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 22 17:46:11 2016 +0100 wined3d: Get resource info from the texture in surface_blt_special(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4243de6..9840683 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2621,35 +2621,39 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { - struct wined3d_device *device = dst_surface->resource.device; + struct wined3d_texture *dst_texture = dst_surface->container; + struct wined3d_device *device = dst_texture->resource.device; const struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(device->fb.render_targets[0]); struct wined3d_swapchain *src_swapchain, *dst_swapchain; + struct wined3d_texture *src_texture; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); /* Get the swapchain. One of the surfaces has to be a primary surface */ - if (dst_surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) + if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) { WARN("Destination is in sysmem, rejecting gl blt\n"); return WINED3DERR_INVALIDCALL; } - dst_swapchain = dst_surface->container->swapchain; + dst_swapchain = dst_texture->swapchain; if (src_surface) { - if (src_surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) + src_texture = src_surface->container; + if (src_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) { WARN("Src is in sysmem, rejecting gl blt\n"); return WINED3DERR_INVALIDCALL; } - src_swapchain = src_surface->container->swapchain; + src_swapchain = src_texture->swapchain; } else { + src_texture = NULL; src_swapchain = NULL; } @@ -2698,8 +2702,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE BOOL stretchx; /* P8 read back is not implemented */ - if (src_surface->resource.format->id == WINED3DFMT_P8_UINT - || dst_surface->resource.format->id == WINED3DFMT_P8_UINT) + if (src_texture->resource.format->id == WINED3DFMT_P8_UINT + || dst_texture->resource.format->id == WINED3DFMT_P8_UINT) { TRACE("P8 read back not supported by frame buffer to texture blit\n"); return WINED3DERR_INVALIDCALL;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_depth_blt().
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 9868969211012f95f7034cbf0f22fd7423f76653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9868969211012f95f7034cbf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 22 17:46:12 2016 +0100 wined3d: Get resource info from the texture in surface_depth_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9840683..b86cb72 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2757,7 +2757,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE static void surface_depth_blt(const struct wined3d_surface *surface, struct wined3d_context *context, GLuint texture, GLint x, GLint y, GLsizei w, GLsizei h, GLenum target) { - struct wined3d_device *device = surface->resource.device; + struct wined3d_device *device = surface->container->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; GLint compare_mode = GL_NONE; struct blt_info info;

1 0

Stefan Dösinger : wined3d: Avoid storing a rectangle pointer in struct wined3d_cs_set_scissor_rect.
by Alexandre Julliard 23 Mar '16

23 Mar '16

Module: wine Branch: master Commit: 8d8b4d9c66720228b57ec62b6489049ad6c11b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8b4d9c66720228b57ec62b6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 22 17:46:13 2016 +0100 wined3d: Avoid storing a rectangle pointer in struct wined3d_cs_set_scissor_rect. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e36429d..6e7a57b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -101,7 +101,7 @@ struct wined3d_cs_set_viewport struct wined3d_cs_set_scissor_rect { enum wined3d_cs_op opcode; - const RECT *rect; + RECT rect; }; struct wined3d_cs_set_rendertarget_view @@ -374,7 +374,7 @@ static void wined3d_cs_exec_set_scissor_rect(struct wined3d_cs *cs, const void * { const struct wined3d_cs_set_scissor_rect *op = data; - cs->state.scissor_rect = *op->rect; + cs->state.scissor_rect = op->rect; device_invalidate_state(cs->device, STATE_SCISSORRECT); } @@ -384,7 +384,7 @@ void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECT; - op->rect = rect; + op->rect = *rect; cs->ops->submit(cs); }

1 0