wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

Józef Kucia : wined3d: Correctly check for absence of precise flags.
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: wine Branch: master Commit: 799719a4233ad463a0d2a309f8c831ae4744833c URL: https://source.winehq.org/git/wine.git/?a=commit;h=799719a4233ad463a0d2a309… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 27 14:52:48 2018 +0200 wined3d: Correctly check for absence of precise flags. 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/shader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4986f3c..3750dee 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1917,19 +1917,19 @@ static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD s shader_addline(buffer, "_unknown_flags(%#x)", sync_flags); } -static void shader_dump_precise_flags(struct wined3d_string_buffer *buffer, DWORD precise_flags) +static void shader_dump_precise_flags(struct wined3d_string_buffer *buffer, DWORD flags) { - if (!precise_flags) + if (!(flags & WINED3DSI_PRECISE_XYZW)) return; shader_addline(buffer, " [precise"); - if (precise_flags != WINED3DSI_PRECISE_XYZW) + if (flags != WINED3DSI_PRECISE_XYZW) { shader_addline(buffer, "(%s%s%s%s)", - precise_flags & WINED3DSI_PRECISE_X ? "x" : "", - precise_flags & WINED3DSI_PRECISE_Y ? "y" : "", - precise_flags & WINED3DSI_PRECISE_Z ? "z" : "", - precise_flags & WINED3DSI_PRECISE_W ? "w" : ""); + flags & WINED3DSI_PRECISE_X ? "x" : "", + flags & WINED3DSI_PRECISE_Y ? "y" : "", + flags & WINED3DSI_PRECISE_Z ? "z" : "", + flags & WINED3DSI_PRECISE_W ? "w" : ""); } shader_addline(buffer, "]"); }

1 0

Józef Kucia : wined3d: Do not check for ARB_fragment_program in arbfp_blit_supported().
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: wine Branch: master Commit: 3d746a6a43acca1b10cfc9800a0c52a544dba947 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d746a6a43acca1b10cfc980… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 27 14:52:47 2018 +0200 wined3d: Do not check for ARB_fragment_program in arbfp_blit_supported(). ARBfp blitter isn't be created if ARB_fragment_program is not supported. 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/arb_program_shader.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7988398..d4cc9d5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7698,9 +7698,6 @@ static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wine enum complex_fixup src_fixup; BOOL decompress; - if (!context->gl_info->supported[ARB_FRAGMENT_PROGRAM]) - return FALSE; - if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) return FALSE;

1 0

Józef Kucia : d3d11/tests: Add test for clearing 1D render target views.
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: wine Branch: master Commit: 185119906584d335196112b1efbab0d5bfbf6491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=185119906584d335196112b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 27 14:52:46 2018 +0200 d3d11/tests: Add test for clearing 1D render target views. 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 | 166 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 134 insertions(+), 32 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 465e2d5..8ca6634 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -678,9 +678,35 @@ struct resource_readback unsigned int width, height, sub_resource_idx; }; +static void init_resource_readback(ID3D11Resource *resource, ID3D11Resource *readback_resource, + unsigned int width, unsigned int height, unsigned int sub_resource_idx, + ID3D11Device *device, struct resource_readback *rb) +{ + HRESULT hr; + + rb->resource = readback_resource; + rb->width = width; + rb->height = height; + rb->sub_resource_idx = sub_resource_idx; + + ID3D11Device_GetImmediateContext(device, &rb->immediate_context); + + ID3D11DeviceContext_CopyResource(rb->immediate_context, rb->resource, resource); + if (FAILED(hr = ID3D11DeviceContext_Map(rb->immediate_context, + rb->resource, sub_resource_idx, D3D11_MAP_READ, 0, &rb->map_desc))) + { + trace("Failed to map resource, hr %#x.\n", hr); + ID3D11Resource_Release(rb->resource); + rb->resource = NULL; + ID3D11DeviceContext_Release(rb->immediate_context); + rb->immediate_context = NULL; + } +} + static void get_buffer_readback(ID3D11Buffer *buffer, struct resource_readback *rb) { D3D11_BUFFER_DESC buffer_desc; + ID3D11Resource *rb_buffer; ID3D11Device *device; HRESULT hr; @@ -694,30 +720,48 @@ static void get_buffer_readback(ID3D11Buffer *buffer, struct resource_readback * buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; buffer_desc.MiscFlags = 0; buffer_desc.StructureByteStride = 0; - if (FAILED(hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, (ID3D11Buffer **)&rb->resource))) + if (FAILED(hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, (ID3D11Buffer **)&rb_buffer))) { trace("Failed to create staging buffer, hr %#x.\n", hr); ID3D11Device_Release(device); return; } - rb->width = buffer_desc.ByteWidth; - rb->height = 1; - rb->sub_resource_idx = 0; + init_resource_readback((ID3D11Resource *)buffer, rb_buffer, + buffer_desc.ByteWidth, 1, 0, device, rb); - ID3D11Device_GetImmediateContext(device, &rb->immediate_context); + ID3D11Device_Release(device); +} + +static void get_texture1d_readback(ID3D11Texture1D *texture, unsigned int sub_resource_idx, + struct resource_readback *rb) +{ + D3D11_TEXTURE1D_DESC texture_desc; + ID3D11Resource *rb_texture; + unsigned int miplevel; + ID3D11Device *device; + HRESULT hr; + + memset(rb, 0, sizeof(*rb)); - ID3D11DeviceContext_CopyResource(rb->immediate_context, rb->resource, (ID3D11Resource *)buffer); - if (FAILED(hr = ID3D11DeviceContext_Map(rb->immediate_context, rb->resource, 0, - D3D11_MAP_READ, 0, &rb->map_desc))) + ID3D11Texture1D_GetDevice(texture, &device); + + ID3D11Texture1D_GetDesc(texture, &texture_desc); + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; + if (FAILED(hr = ID3D11Device_CreateTexture1D(device, &texture_desc, NULL, (ID3D11Texture1D **)&rb_texture))) { - trace("Failed to map buffer, hr %#x.\n", hr); - ID3D11Resource_Release(rb->resource); - rb->resource = NULL; - ID3D11DeviceContext_Release(rb->immediate_context); - rb->immediate_context = NULL; + trace("Failed to create texture, hr %#x.\n", hr); + ID3D11Device_Release(device); + return; } + miplevel = sub_resource_idx % texture_desc.MipLevels; + init_resource_readback((ID3D11Resource *)texture, rb_texture, + max(1, texture_desc.Width >> miplevel), 1, sub_resource_idx, device, rb); + ID3D11Device_Release(device); } @@ -725,6 +769,7 @@ static void get_texture_readback(ID3D11Texture2D *texture, unsigned int sub_reso struct resource_readback *rb) { D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Resource *rb_texture; unsigned int miplevel; ID3D11Device *device; HRESULT hr; @@ -738,7 +783,7 @@ static void get_texture_readback(ID3D11Texture2D *texture, unsigned int sub_reso texture_desc.BindFlags = 0; texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; texture_desc.MiscFlags = 0; - if (FAILED(hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&rb->resource))) + if (FAILED(hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&rb_texture))) { trace("Failed to create texture, hr %#x.\n", hr); ID3D11Device_Release(device); @@ -746,22 +791,10 @@ static void get_texture_readback(ID3D11Texture2D *texture, unsigned int sub_reso } miplevel = sub_resource_idx % texture_desc.MipLevels; - rb->width = max(1, texture_desc.Width >> miplevel); - rb->height = max(1, texture_desc.Height >> miplevel); - rb->sub_resource_idx = sub_resource_idx; - - ID3D11Device_GetImmediateContext(device, &rb->immediate_context); - - ID3D11DeviceContext_CopyResource(rb->immediate_context, rb->resource, (ID3D11Resource *)texture); - if (FAILED(hr = ID3D11DeviceContext_Map(rb->immediate_context, rb->resource, sub_resource_idx, - D3D11_MAP_READ, 0, &rb->map_desc))) - { - trace("Failed to map sub-resource %u, hr %#x.\n", sub_resource_idx, hr); - ID3D11Resource_Release(rb->resource); - rb->resource = NULL; - ID3D11DeviceContext_Release(rb->immediate_context); - rb->immediate_context = NULL; - } + init_resource_readback((ID3D11Resource *)texture, rb_texture, + max(1, texture_desc.Width >> miplevel), + max(1, texture_desc.Height >> miplevel), + sub_resource_idx, device, rb); ID3D11Device_Release(device); } @@ -868,6 +901,30 @@ static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, check_texture_sub_resource_color_(line, texture, sub_resource_idx, NULL, expected_color, max_diff); } +#define check_texture1d_sub_resource_color(a, b, c, d, e) check_texture1d_sub_resource_color_(__LINE__, a, b, c, d, e) +static void check_texture1d_sub_resource_color_(unsigned int line, ID3D11Texture1D *texture, + unsigned int sub_resource_idx, const RECT *rect, DWORD expected_color, BYTE max_diff) +{ + struct resource_readback rb; + + get_texture1d_readback(texture, sub_resource_idx, &rb); + check_readback_data_color_(line, &rb, rect, expected_color, max_diff); + release_resource_readback(&rb); +} + +#define check_texture1d_color(t, c, d) check_texture1d_color_(__LINE__, t, c, d) +static void check_texture1d_color_(unsigned int line, ID3D11Texture1D *texture, + DWORD expected_color, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D11_TEXTURE1D_DESC texture_desc; + + ID3D11Texture1D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture1d_sub_resource_color_(line, texture, sub_resource_idx, NULL, expected_color, max_diff); +} + #define check_texture_sub_resource_float(a, b, c, d, e) check_texture_sub_resource_float_(__LINE__, a, b, c, d, e) static void check_texture_sub_resource_float_(unsigned int line, ID3D11Texture2D *texture, unsigned int sub_resource_idx, const RECT *rect, float expected_value, BYTE max_diff) @@ -12574,7 +12631,51 @@ static void test_swapchain_flip(void) DestroyWindow(window); } -static void test_clear_render_target_view(void) +static void test_clear_render_target_view_1d(void) +{ + static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; + + struct d3d11_test_context test_context; + D3D11_TEXTURE1D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11Texture1D *texture; + ID3D11Device *device; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture1D(device, &texture_desc, NULL, &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); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); + check_texture1d_color(texture, 0xbf4c7f19, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, green); + check_texture1d_color(texture, 0x8000ff00, 1); + + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture1D_Release(texture); + release_test_context(&test_context); +} + +static void test_clear_render_target_view_2d(void) { static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; @@ -26517,7 +26618,8 @@ START_TEST(d3d11) run_for_each_feature_level(test_swapchain_formats); test_swapchain_views(); test_swapchain_flip(); - test_clear_render_target_view(); + test_clear_render_target_view_1d(); + test_clear_render_target_view_2d(); test_clear_depth_stencil_view(); test_clear_buffer_unordered_access_view(); test_initial_depth_stencil_state();

1 0

Józef Kucia : wined3d: Implement copying for 1D textures.
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: wine Branch: master Commit: 16517e4eea7cb477d504d737267db6fc52cf6c26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16517e4eea7cb477d504d737… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 27 14:52:45 2018 +0200 wined3d: Implement copying for 1D textures. 1D textures are handled by raw and CPU blitter. 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/arb_program_shader.c | 3 +++ dlls/wined3d/cs.c | 12 ++++-------- dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/surface.c | 12 ++++++++++++ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7d3f547..7988398 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7701,6 +7701,9 @@ static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wine if (!context->gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; + if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) + return FALSE; + if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) { if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ded49f2..173490d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2080,13 +2080,6 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * buffer_from_resource(op->src_resource), op->src_box.left, op->src_box.right - op->src_box.left); } - else if (op->dst_resource->type == WINED3D_RTYPE_TEXTURE_2D) - { - if (FAILED(texture2d_blt(texture_from_resource(op->dst_resource), op->dst_sub_resource_idx, - &op->dst_box, texture_from_resource(op->src_resource), op->src_sub_resource_idx, - &op->src_box, op->flags, &op->fx, op->filter))) - FIXME("Blit failed.\n"); - } else if (op->dst_resource->type == WINED3D_RTYPE_TEXTURE_3D) { struct wined3d_texture *src_texture, *dst_texture; @@ -2165,7 +2158,10 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * } else { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(op->dst_resource->type)); + if (FAILED(texture2d_blt(texture_from_resource(op->dst_resource), op->dst_sub_resource_idx, + &op->dst_box, texture_from_resource(op->src_resource), op->src_sub_resource_idx, + &op->src_box, op->flags, &op->fx, op->filter))) + FIXME("Blit failed.\n"); } error: diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5d1f118..2af9b97 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12481,6 +12481,9 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi return FALSE; } + if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) + return FALSE; + if (src_texture->target == GL_TEXTURE_2D_MULTISAMPLE || dst_texture->target == GL_TEXTURE_2D_MULTISAMPLE || src_texture->target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7a13b58..bfee4d3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -305,6 +305,9 @@ static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win if (!(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE; + if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) + return FALSE; + switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT: @@ -1509,6 +1512,12 @@ static HRESULT wined3d_texture_blt_special(struct wined3d_texture *dst_texture, dst_texture, dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), src_texture, src_sub_resource_idx, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); + if (dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_texture->resource.type)); + return WINED3DERR_INVALIDCALL; + } + /* Get the swapchain. One of the surfaces has to be a primary surface. */ if (!(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { @@ -2171,6 +2180,9 @@ static BOOL ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 const struct wined3d_format *dst_format = dst_resource->format; BOOL decompress; + if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) + return FALSE; + decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU))

1 0

Józef Kucia : wined3d: Implement clears for 1D render target views.
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: wine Branch: master Commit: 130b6ed876e6c37ab4ff165ea0fedf567dcd7760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=130b6ed876e6c37ab4ff165e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 27 14:52:44 2018 +0200 wined3d: Implement clears for 1D render target views. 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/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 87d4542..86c36d5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4394,7 +4394,7 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi return WINED3D_OK; resource = view->resource; - if (resource->type != WINED3D_RTYPE_TEXTURE_2D) + if (resource->type != WINED3D_RTYPE_TEXTURE_1D && resource->type != WINED3D_RTYPE_TEXTURE_2D) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); return WINED3DERR_INVALIDCALL;

1 0

Józef Kucia : d3d11: Do not print FIXMEs() for known DXBC chunks in shdr_handler().
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: wine Branch: master Commit: 67192c46bc93fd1aea92da88dbaf14bb3bba5b18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67192c46bc93fd1aea92da88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 27 14:52:43 2018 +0200 d3d11: Do not print FIXMEs() for known DXBC chunks in shdr_handler(). 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/d3d11_private.h | 6 ++++-- dlls/d3d11/shader.c | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index bc9d6a1..94e9e39 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -45,14 +45,16 @@ #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) +#define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') -#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_OSG5 MAKE_TAG('O', 'S', 'G', '5') +#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') +#define TAG_RDEF MAKE_TAG('R', 'D', 'E', 'F') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') #define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') -#define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') +#define TAG_STAT MAKE_TAG('S', 'T', 'A', 'T') struct d3d_device; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 9c0059f..b15bd5c 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -136,6 +136,10 @@ static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void * } break; + case TAG_RDEF: + case TAG_STAT: + break; + default: FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); break;

1 0

Nikolay Sivov : wined3d: Use fewer calls to set viewport data.
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: wine Branch: master Commit: cf312011c0e1f43123682f7f2e783174fea65425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf312011c0e1f43123682f7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 27 13:58:00 2018 +0300 wined3d: Use fewer calls to set viewport data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d76708d..87c7346 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4034,13 +4034,21 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine if (gl_info->supported[ARB_VIEWPORT_ARRAY]) { + GLdouble depth_ranges[2 * WINED3D_MAX_VIEWPORTS]; + GLfloat viewports[4 * WINED3D_MAX_VIEWPORTS]; + unsigned int i, reset_count = 0; get_viewports(context, state, state->viewport_count, vp); for (i = 0; i < state->viewport_count; ++i) { - GL_EXTCALL(glDepthRangeIndexed(i, vp[i].min_z, vp[i].max_z)); - GL_EXTCALL(glViewportIndexedf(i, vp[i].x, vp[i].y, vp[i].width, vp[i].height)); + depth_ranges[i * 2] = vp[i].min_z; + depth_ranges[i * 2 + 1] = vp[i].max_z; + + viewports[i * 4] = vp[i].x; + viewports[i * 4 + 1] = vp[i].y; + viewports[i * 4 + 2] = vp[i].width; + viewports[i * 4 + 3] = vp[i].height; } if (context->viewport_count > state->viewport_count) @@ -4048,12 +4056,12 @@ static void viewport_miscpart(struct wined3d_context *context, const struct wine if (reset_count) { - static const GLfloat reset[4 * WINED3D_MAX_VIEWPORTS]; - static const GLdouble resetd[2 * WINED3D_MAX_VIEWPORTS]; - - GL_EXTCALL(glDepthRangeArrayv(state->viewport_count, reset_count, resetd)); - GL_EXTCALL(glViewportArrayv(state->viewport_count, reset_count, reset)); + memset(&depth_ranges[state->viewport_count * 2], 0, reset_count * 2 * sizeof(*depth_ranges)); + memset(&viewports[state->viewport_count * 4], 0, reset_count * 4 * sizeof(*viewports)); } + + GL_EXTCALL(glDepthRangeArrayv(0, state->viewport_count + reset_count, depth_ranges)); + GL_EXTCALL(glViewportArrayv(0, state->viewport_count + reset_count, viewports)); context->viewport_count = state->viewport_count; } else @@ -4073,6 +4081,8 @@ static void viewport_miscpart_cc(struct wined3d_context *context, & WINED3D_PIXEL_CENTER_INTEGER ? 63.0f / 128.0f : -1.0f / 128.0f; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_viewport vp[WINED3D_MAX_VIEWPORTS]; + GLdouble depth_ranges[2 * WINED3D_MAX_VIEWPORTS]; + GLfloat viewports[4 * WINED3D_MAX_VIEWPORTS]; unsigned int i, reset_count = 0; get_viewports(context, state, state->viewport_count, vp); @@ -4083,8 +4093,14 @@ static void viewport_miscpart_cc(struct wined3d_context *context, { vp[i].x += pixel_center_offset; vp[i].y += pixel_center_offset; - GL_EXTCALL(glDepthRangeIndexed(i, vp[i].min_z, vp[i].max_z)); - GL_EXTCALL(glViewportIndexedf(i, vp[i].x, vp[i].y, vp[i].width, vp[i].height)); + + depth_ranges[i * 2] = vp[i].min_z; + depth_ranges[i * 2 + 1] = vp[i].max_z; + + viewports[i * 4 ] = vp[i].x + pixel_center_offset; + viewports[i * 4 + 1] = vp[i].y + pixel_center_offset; + viewports[i * 4 + 2] = vp[i].width; + viewports[i * 4 + 3] = vp[i].height; } if (context->viewport_count > state->viewport_count) @@ -4092,12 +4108,12 @@ static void viewport_miscpart_cc(struct wined3d_context *context, if (reset_count) { - static const GLfloat reset[4 * WINED3D_MAX_VIEWPORTS]; - static const GLdouble resetd[2 * WINED3D_MAX_VIEWPORTS]; - - GL_EXTCALL(glDepthRangeArrayv(state->viewport_count, reset_count, resetd)); - GL_EXTCALL(glViewportArrayv(state->viewport_count, reset_count, reset)); + memset(&depth_ranges[state->viewport_count * 2], 0, reset_count * 2 * sizeof(*depth_ranges)); + memset(&viewports[state->viewport_count * 4], 0, reset_count * 4 * sizeof(*viewports)); } + + GL_EXTCALL(glDepthRangeArrayv(0, state->viewport_count + reset_count, depth_ranges)); + GL_EXTCALL(glViewportArrayv(0, state->viewport_count + reset_count, viewports)); context->viewport_count = state->viewport_count; checkGLcall("setting clip space and viewport");

1 0

Nikolay Sivov : wined3d: Invalidate number of viewports set for the context.
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: wine Branch: master Commit: b2061c8589ff06d97de3924669a8c57ab99c34b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2061c8589ff06d97de39246… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 27 13:57:26 2018 +0300 wined3d: Invalidate number of viewports set for the context. Signed-off-by: Nikolay Sivov <nsivov(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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index da8a61b..b96733f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2788,6 +2788,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine if (context->blit_w != rt_size.cx || context->blit_h != rt_size.cy) { gl_info->gl_ops.gl.p_glViewport(0, 0, rt_size.cx, rt_size.cy); + context->viewport_count = WINED3D_MAX_VIEWPORTS; context->blit_w = rt_size.cx; context->blit_h = rt_size.cy; /* No need to dirtify here, the states are still dirtified because @@ -2856,6 +2857,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine if (gl_info->supported[ARB_CLIP_CONTROL]) GL_EXTCALL(glClipControl(GL_LOWER_LEFT, GL_NEGATIVE_ONE_TO_ONE)); gl_info->gl_ops.gl.p_glViewport(0, 0, rt_size.cx, rt_size.cy); + context->viewport_count = WINED3D_MAX_VIEWPORTS; context_invalidate_state(context, STATE_VIEWPORT); device->shader_backend->shader_disable(device->shader_priv, context);

1 0

Nikolay Sivov : d3d10core/tests: Add some tests for multiple scissor rectangles.
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: wine Branch: master Commit: 5153ee48edba8f6ccc593ff35e62a9d07e0686c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5153ee48edba8f6ccc593ff3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 27 08:50:12 2018 +0300 d3d10core/tests: Add some tests for multiple scissor rectangles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 63 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a5c048c..a1924f9 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16430,10 +16430,14 @@ static void test_multiple_viewports(void) }; static const struct vec4 expected_values[] = { - {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, {0.0f, 4.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + {0.0f, 5.0f}, {0.5f, 0.5f}, {1.0f, 5.0f}, {0.5f, 0.5f}, }; static const float clear_color[] = {0.5f, 0.5f, 0.0f, 0.0f}; + ID3D10RasterizerState *rasterizer_state; + D3D10_RASTERIZER_DESC rasterizer_desc; unsigned int count, i; + D3D10_RECT rects[2]; RECT rect; int width; @@ -16521,6 +16525,62 @@ static void test_multiple_viewports(void) draw_quad(&test_context); check_texture_sub_resource_vec4(texture, 0, NULL, &expected_values[4], 1); + /* Two viewports, only first scissor rectangle set. */ + memset(&rasterizer_desc, 0, sizeof(rasterizer_desc)); + rasterizer_desc.FillMode = D3D11_FILL_SOLID; + rasterizer_desc.CullMode = D3D11_CULL_BACK; + rasterizer_desc.DepthClipEnable = TRUE; + rasterizer_desc.ScissorEnable = TRUE; + hr = ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D10Device_RSSetState(device, rasterizer_state); + + ID3D10Device_ClearRenderTargetView(device, rtv, clear_color); + ID3D10Device_RSSetViewports(device, 2, vp); + + rects[0].left = 0; + rects[0].top = 0; + rects[0].right = width; + rects[0].bottom = texture_desc.Height / 2; + memset(&rects[1], 0, sizeof(*rects)); + ID3D10Device_RSSetScissorRects(device, 1, rects); + constant.draw_id = 4; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[5], 1); + SetRect(&rect, 0, texture_desc.Height / 2, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[6], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[7], 1); + + /* Set both rectangles. */ + rects[0].left = 0; + rects[0].top = 0; + rects[0].right = width; + rects[0].bottom = texture_desc.Height / 2; + rects[1].left = width; + rects[1].top = 0; + rects[1].right = width * 2; + rects[1].bottom = texture_desc.Height / 2; + ID3D10Device_ClearRenderTargetView(device, rtv, clear_color); + ID3D10Device_RSSetScissorRects(device, 2, rects); + constant.draw_id = 5; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[8], 1); + SetRect(&rect, 0, texture_desc.Height / 2, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[9], 1); + + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[10], 1); + SetRect(&rect, width, texture_desc.Height / 2, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[11], 1); + /* Viewport count exceeding maximum value. */ ID3D10Device_RSSetViewports(device, 1, vp); @@ -16542,6 +16602,7 @@ static void test_multiple_viewports(void) ok(count == 1, "Unexpected viewport count %d.\n", count); ok(vp[0].TopLeftX == 0.0f && vp[0].Width == width, "Unexpected viewport.\n"); + ID3D10RasterizerState_Release(rasterizer_state); ID3D10RenderTargetView_Release(rtv); ID3D10Texture2D_Release(texture);

1 0

Matteo Bruni : wined3d: Don' t attach render targets on clears when unnecessary.
by Alexandre Julliard 27 Apr '18

27 Apr '18

Module: wine Branch: master Commit: df99c9b9f4190c4c0f96dd3c7e2f6632d4d9c077 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df99c9b9f4190c4c0f96dd3c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 26 23:30:13 2018 +0200 wined3d: Don't attach render targets on clears when unnecessary. Otherwise we'd limit the cleared area to the size of the render target. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 46 ++++++++++++++++++++++++---------------------- dlls/wined3d/cs.c | 5 ++++- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a50cb19..d0c7795 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19788,9 +19788,12 @@ static void test_multisample_mismatch(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); - /* Check depth buffer values. AMD GPUs (r500 and evergreen tested) clear the depth buffer - * like you'd expect in a correct framebuffer setup. Nvidia doesn't clear it, neither in - * the Z only clear case nor in the combined clear case. */ + /* Check depth buffer values. AMD GPUs (r500 and evergreen tested) clear + * the depth buffer like you'd expect in a correct framebuffer + * setup. Nvidia doesn't clear it, neither in the Z only clear case nor in + * the combined clear case. + * In Wine we currently happen to allow the depth only clear case but + * disallow the combined one. */ hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); @@ -19802,7 +19805,7 @@ static void test_multisample_mismatch(void) color = getPixelColor(device, 62, 240); ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); color = getPixelColor(device, 64, 240); - ok(color_match(color, 0x0000ff00, 1) || broken(color_match(color, 0x000000ff, 1)), + ok(color_match(color, 0x0000ff00, 1) || color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); color = getPixelColor(device, 318, 240); ok(color_match(color, 0x0000ff00, 1) || broken(color_match(color, 0x000000ff, 1)), @@ -23532,26 +23535,25 @@ static void test_null_format(void) { unsigned int x, y; D3DCOLOR color; - BOOL todo; } expected_colors[] = { - {200, 30, 0x0000ff00, FALSE}, - {440, 30, 0x0000ff00, FALSE}, - {520, 30, 0x0000ff00, FALSE}, - {600, 30, 0x0000ff00, FALSE}, - {200, 90, 0x00000000, FALSE}, - {440, 90, 0x0000ff00, FALSE}, - {520, 90, 0x0000ff00, FALSE}, - {600, 90, 0x0000ff00, FALSE}, - {200, 150, 0x000000ff, FALSE}, - {440, 150, 0x000000ff, FALSE}, - {520, 150, 0x0000ff00, FALSE}, - {600, 150, 0x0000ff00, FALSE}, - {200, 320, 0x000000ff, FALSE}, - {440, 320, 0x000000ff, FALSE}, - {520, 320, 0x00000000, TRUE}, - {600, 320, 0x0000ff00, FALSE}, + {200, 30, 0x0000ff00}, + {440, 30, 0x0000ff00}, + {520, 30, 0x0000ff00}, + {600, 30, 0x0000ff00}, + {200, 90, 0x00000000}, + {440, 90, 0x0000ff00}, + {520, 90, 0x0000ff00}, + {600, 90, 0x0000ff00}, + {200, 150, 0x000000ff}, + {440, 150, 0x000000ff}, + {520, 150, 0x0000ff00}, + {600, 150, 0x0000ff00}, + {200, 320, 0x000000ff}, + {440, 320, 0x000000ff}, + {520, 320, 0x00000000}, + {600, 320, 0x0000ff00}, }; IDirect3DSurface9 *original_rt, *small_rt, *null_rt, *small_null_rt; IDirect3DDevice9 *device; @@ -23672,7 +23674,7 @@ static void test_null_format(void) for (i = 0; i < ARRAY_SIZE(expected_colors); ++i) { color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); - todo_wine_if(expected_colors[i].todo) ok(color_match(color, expected_colors[i].color, 1), + ok(color_match(color, expected_colors[i].color, 1), "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index dc07f52..ded49f2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -542,7 +542,10 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags; - op->rt_count = rt_count; + if (flags & WINED3DCLEAR_TARGET) + op->rt_count = rt_count; + else + op->rt_count = 0; op->fb = &cs->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->render_states[WINED3D_RS_SCISSORTESTENABLE])

1 0

← Newer
1
2
3
4
5
6
7
...
55
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 April 2018