October 2018 - Wine-Commits

Nikolay Sivov : d2d1: Simplify target bitmap creation for DC target.
by Alexandre Julliard Oct. 3, 2018

Oct. 3, 2018

Module: wine Branch: master Commit: c96eba60e347e9ce79f8b60e0fac9bf69c165ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=c96eba60e347e9ce79f8b60e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 2 09:33:08 2018 +0300 d2d1: Simplify target bitmap creation for DC target. 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/d2d1/dc_render_target.c | 64 +++++++++++++++++--------------------------- dlls/d2d1/tests/d2d1.c | 1 - 2 files changed, 25 insertions(+), 40 deletions(-) diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index b4306fb..b095008 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -686,11 +686,13 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget const HDC hdc, const RECT *rect) { struct d2d_dc_render_target *render_target = impl_from_ID2D1DCRenderTarget(iface); - D3D10_TEXTURE2D_DESC texture_desc; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + struct d2d_bitmap *bitmap_impl; IDXGISurface1 *dxgi_surface; ID2D1DeviceContext *context; - ID3D10Texture2D *texture; - ID2D1Bitmap1 *bitmap; + ID3D10Resource *resource; + D2D1_SIZE_U bitmap_size; + ID2D1Bitmap *bitmap; HRESULT hr; TRACE("iface %p, hdc %p, rect %s.\n", iface, hdc, wine_dbgstr_rect(rect)); @@ -698,49 +700,33 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget if (!hdc) return E_INVALIDARG; - texture_desc.Width = rect->right - rect->left; - texture_desc.Height = rect->bottom - rect->top; - texture_desc.MipLevels = 1; - texture_desc.ArraySize = 1; - texture_desc.Format = render_target->pixel_format.format; - texture_desc.SampleDesc.Count = 1; - texture_desc.SampleDesc.Quality = 0; - texture_desc.Usage = D3D10_USAGE_DEFAULT; - texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE; - texture_desc.CPUAccessFlags = 0; - texture_desc.MiscFlags = D3D10_RESOURCE_MISC_GDI_COMPATIBLE; - - if (FAILED(hr = ID3D10Device1_CreateTexture2D(render_target->d3d_device, &texture_desc, NULL, &texture))) - { - WARN("Failed to create texture, hr %#x.\n", hr); - return hr; - } - - hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface1, (void **)&dxgi_surface); - ID3D10Texture2D_Release(texture); - if (FAILED(hr)) - { - WARN("Failed to get surface interface from a texture, hr %#x.\n", hr); - return hr; - } - /* Switch dxgi target to new surface. */ ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, &IID_ID2D1DeviceContext, (void **)&context); - hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(context, (IDXGISurface *)dxgi_surface, NULL, &bitmap); - if (SUCCEEDED(hr)) - { - ID2D1DeviceContext_SetTarget(context, (ID2D1Image *)bitmap); - ID2D1Bitmap1_Release(bitmap); - } - ID2D1DeviceContext_Release(context); - if (FAILED(hr)) + bitmap_size.width = rect->right - rect->left; + bitmap_size.height = rect->bottom - rect->top; + + memset(&bitmap_desc, 0, sizeof(bitmap_desc)); + bitmap_desc.pixelFormat = render_target->pixel_format; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | + D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE; + if (FAILED(hr = ID2D1DeviceContext_CreateBitmap(context, bitmap_size, NULL, 0, &bitmap_desc, + (ID2D1Bitmap1 **)&bitmap))) { - WARN("Failed to create new target bitmap, hr %#x.\n", hr); - IDXGISurface1_Release(dxgi_surface); + WARN("Failed to create target bitmap, hr %#x.\n", hr); + ID2D1DeviceContext_Release(context); return hr; } + bitmap_impl = unsafe_impl_from_ID2D1Bitmap(bitmap); + ID3D10ShaderResourceView_GetResource(bitmap_impl->view, &resource); + ID3D10Resource_QueryInterface(resource, &IID_IDXGISurface1, (void **)&dxgi_surface); + ID3D10Resource_Release(resource); + + ID2D1DeviceContext_SetTarget(context, (ID2D1Image *)bitmap); + ID2D1Bitmap_Release(bitmap); + ID2D1DeviceContext_Release(context); + if (render_target->dxgi_surface) IDXGISurface1_Release(render_target->dxgi_surface); render_target->dxgi_surface = dxgi_surface; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 55d2f56..feebeff 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7489,7 +7489,6 @@ todo_wine ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); options = ID2D1Bitmap1_GetOptions(bitmap); -todo_wine ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE), "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface);

1 0

Nikolay Sivov : d2d1: Set GDI compatible resource flag from bitmap options.
by Alexandre Julliard Oct. 3, 2018

Oct. 3, 2018

Module: wine Branch: master Commit: 8b3081e30566b3aa5e29857bfa9fcb652341a76f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b3081e30566b3aa5e29857b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 2 09:33:07 2018 +0300 d2d1: Set GDI compatible resource flag from bitmap options. 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/d2d1/bitmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 6eee1d1..c0aef3c 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -345,6 +345,8 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, texture_desc.BindFlags |= D3D10_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; + if (desc->bitmapOptions & D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE) + texture_desc.MiscFlags |= D3D10_RESOURCE_MISC_GDI_COMPATIBLE; resource_data.pSysMem = src_data; resource_data.SysMemPitch = pitch;

1 0

Nikolay Sivov : d2d1: Fix bind flags used for bitmap resources.
by Alexandre Julliard Oct. 3, 2018

Oct. 3, 2018

Module: wine Branch: master Commit: f2429e3109c4caa92fdc22bed48f2c8b580ba3fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2429e3109c4caa92fdc22be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 2 09:33:06 2018 +0300 d2d1: Fix bind flags used for bitmap resources. 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/d2d1/bitmap.c | 6 +++++- dlls/d2d1/tests/d2d1.c | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 3948c26..6eee1d1 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -338,7 +338,11 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D10_USAGE_DEFAULT; - texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.BindFlags = 0; + if (desc->bitmapOptions & D2D1_BITMAP_OPTIONS_TARGET) + texture_desc.BindFlags |= D3D10_BIND_RENDER_TARGET; + if (!(desc->bitmapOptions & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) + texture_desc.BindFlags |= D3D10_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d31c8ad..55d2f56 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -813,9 +813,8 @@ static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap *bitmap, BOOL h if (!(options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) bind_flags |= D3D10_BIND_SHADER_RESOURCE; - todo_wine_if (options == D2D1_BITMAP_OPTIONS_TARGET) - ok_(__FILE__, line)(desc.BindFlags == bind_flags, "Unexpected bind flags %#x for bitmap options %#x.\n", - desc.BindFlags, options); + ok_(__FILE__, line)(desc.BindFlags == bind_flags, "Unexpected bind flags %#x for bitmap options %#x.\n", + desc.BindFlags, options); ok_(__FILE__, line)(!desc.CPUAccessFlags, "Unexpected cpu access flags %#x.\n", desc.CPUAccessFlags); ok_(__FILE__, line)(!desc.MiscFlags, "Unexpected misc flags %#x.\n", desc.MiscFlags);

1 0

Józef Kucia : vkd3d-shader: Bump SPIR-V generator version.
by Alexandre Julliard Oct. 3, 2018

Oct. 3, 2018

Module: vkd3d Branch: master Commit: 406824327940644568754c37172fc8c699993877 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=406824327940644568754c3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 2 12:02:40 2018 +0200 vkd3d-shader: Bump SPIR-V generator version. In preparation for the next release. 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> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 7fe3528..98d7a93 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -96,7 +96,7 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) {} #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18 -#define VKD3D_SPIRV_GENERATOR_VERSION 0 +#define VKD3D_SPIRV_GENERATOR_VERSION 1 #define VKD3D_SPIRV_GENERATOR_MAGIC ((VKD3D_SPIRV_GENERATOR_ID << 16) | VKD3D_SPIRV_GENERATOR_VERSION) struct vkd3d_spirv_stream

1 0

Józef Kucia : build: Bump libtool version numbers for shared libraries.
by Alexandre Julliard Oct. 3, 2018

Oct. 3, 2018

Module: vkd3d Branch: master Commit: 44fb80f84c8bb2d8857b7268d4e3a16b8648c8e6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=44fb80f84c8bb2d8857b726… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 2 12:02:41 2018 +0200 build: Bump libtool version numbers for shared libraries. 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> --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1fdc916..8d47439 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,7 +96,7 @@ libvkd3d_la_SOURCES = \ libs/vkd3d/vkd3d_private.h \ libs/vkd3d/vulkan_procs.h \ libs/vkd3d_version.c -libvkd3d_la_LDFLAGS = -version-info 1:0:0 +libvkd3d_la_LDFLAGS = -version-info 2:0:1 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map @@ -106,7 +106,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_LDFLAGS = -version-info 1:0:0 +libvkd3d_utils_la_LDFLAGS = -version-info 1:1:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map

1 0

Józef Kucia : wined3d: Add core context support for A8_UNORM render targets.
by Alexandre Julliard Oct. 2, 2018

Oct. 2, 2018

Module: wine Branch: master Commit: b4b55bbbb6d7654b78dd9d8c7b9abab942fc18ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4b55bbbb6d7654b78dd9d8c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 1 18:01:15 2018 +0200 wined3d: Add core context support for A8_UNORM render targets. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655 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/cs.c | 8 ++++++++ dlls/wined3d/glsl_shader.c | 11 +++++++---- dlls/wined3d/shader.c | 10 ++++++++++ dlls/wined3d/utils.c | 3 ++- dlls/wined3d/wined3d_private.h | 3 ++- 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2aae559..af1dbef 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1084,9 +1084,17 @@ void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_ static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_rendertarget_view *op = data; + BOOL prev_alpha_swizzle, curr_alpha_swizzle; + struct wined3d_rendertarget_view *prev; + prev = cs->state.fb->render_targets[op->view_idx]; cs->fb.render_targets[op->view_idx] = op->view; device_invalidate_state(cs->device, STATE_FRAMEBUFFER); + + prev_alpha_swizzle = prev && prev->format->id == WINED3DFMT_A8_UNORM; + curr_alpha_swizzle = op->view && op->view->format->id == WINED3DFMT_A8_UNORM; + if (prev_alpha_swizzle != curr_alpha_swizzle) + device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); } void wined3d_cs_emit_set_rendertarget_view(struct wined3d_cs *cs, unsigned int view_idx, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0db7fdc..32f82d6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7694,11 +7694,12 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, static void shader_glsl_generate_color_output(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info, const struct wined3d_shader *shader, - struct wined3d_string_buffer_list *string_buffers) + const struct ps_compile_args *args, struct wined3d_string_buffer_list *string_buffers) { const struct wined3d_shader_signature *output_signature = &shader->output_signature; struct wined3d_string_buffer *src, *assignment; enum wined3d_data_type dst_data_type; + const char *swizzle; unsigned int i; if (output_signature->element_count) @@ -7721,7 +7722,8 @@ static void shader_glsl_generate_color_output(struct wined3d_string_buffer *buff shader_addline(buffer, "color_out%u = ", output->semantic_idx); string_buffer_sprintf(src, "ps_out[%u]", output->semantic_idx); shader_glsl_sprintf_cast(assignment, src->buffer, dst_data_type, WINED3D_DATA_FLOAT); - shader_addline(buffer, "%s;\n", assignment->buffer); + swizzle = args->rt_alpha_swizzle & (1u << output->semantic_idx) ? ".argb" : ""; + shader_addline(buffer, "%s%s;\n", assignment->buffer, swizzle); } string_buffer_release(string_buffers, src); string_buffer_release(string_buffers, assignment); @@ -7733,7 +7735,8 @@ static void shader_glsl_generate_color_output(struct wined3d_string_buffer *buff while (mask) { i = wined3d_bit_scan(&mask); - shader_addline(buffer, "color_out%u = ps_out[%u];\n", i, i); + swizzle = args->rt_alpha_swizzle & (1u << i) ? ".argb" : ""; + shader_addline(buffer, "color_out%u = ps_out[%u]%s;\n", i, i, swizzle); } } } @@ -7761,7 +7764,7 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in shader_addline(buffer, "gl_SampleMask[0] = floatBitsToInt(sample_mask);\n"); if (!needs_legacy_glsl_syntax(gl_info)) - shader_glsl_generate_color_output(buffer, gl_info, shader, string_buffers); + shader_glsl_generate_color_output(buffer, gl_info, shader, args, string_buffers); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 62ec971..0968172 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4124,6 +4124,16 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 args->render_offscreen = shader->reg_maps.vpos && gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS] ? context->render_offscreen : 0; + + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + for (i = 0; i < ARRAY_SIZE(state->fb->render_targets); ++i) + { + struct wined3d_rendertarget_view *rtv = state->fb->render_targets[i]; + if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM) + args->rt_alpha_swizzle |= 1u << i; + } + } } static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 05579db..e3df24a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1519,7 +1519,8 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_TEXTURE_RG, NULL}, {WINED3DFMT_A8_UNORM, GL_R8, GL_R8, 0, GL_RED, GL_UNSIGNED_BYTE, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG, NULL}, {WINED3DFMT_A8_UNORM, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9135189..5f7f6fd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1345,7 +1345,8 @@ struct ps_compile_args DWORD flatshading : 1; DWORD alpha_test_func : 3; DWORD render_offscreen : 1; - DWORD padding : 26; + DWORD rt_alpha_swizzle : 8; /* MAX_RENDER_TARGET_VIEWS, 8 */ + DWORD padding : 18; }; enum fog_src_type

1 0

Józef Kucia : d3d11/tests: Add test for layered rendering without geometry shader.
by Alexandre Julliard Oct. 2, 2018

Oct. 2, 2018

Module: wine Branch: master Commit: 07aa98a447767a0791a09b6dd01521d4065b2083 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07aa98a447767a0791a09b6d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 1 18:01:14 2018 +0200 d3d11/tests: Add test for layered rendering without geometry shader. 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 | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 41afdf9..646d41f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1409,6 +1409,16 @@ static BOOL check_compute_shaders_via_sm4_support(ID3D11Device *device) return options.ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x; } +static BOOL check_viewport_array_index_from_any_shader_support(ID3D11Device *device) +{ + D3D11_FEATURE_DATA_D3D11_OPTIONS3 options; + + if (FAILED(ID3D11Device_CheckFeatureSupport(device, + D3D11_FEATURE_D3D11_OPTIONS3, &options, sizeof(options)))) + return FALSE; + return options.VPAndRTArrayIndexFromAnyShaderFeedingRasterizer; +} + static BOOL is_buffer(ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; @@ -9305,12 +9315,38 @@ static void test_layered_rendering(void) ID3D11RenderTargetView *rtv; ID3D11Texture2D *texture; ID3D11GeometryShader *gs; + ID3D11VertexShader *vs; ID3D11PixelShader *ps; ID3D11Device *device; ID3D11Buffer *cb; HRESULT hr; BOOL warp; + static const DWORD vs_code[] = + { +#if 0 + uint layer_offset; + + void main(float4 position : POSITION, + out float4 out_position : SV_POSITION, + out uint layer : SV_RenderTargetArrayIndex) + { + out_position = position; + layer = layer_offset; + } +#endif + 0x43425844, 0x71f7b9cd, 0x2ab8c713, 0x53e77663, 0x54a9ba68, 0x00000001, 0x00000158, 0x00000004, + 0x00000030, 0x00000064, 0x000000cc, 0x00000148, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, + 0xababab00, 0x4e47534f, 0x00000060, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000004, 0x00000001, 0x00000001, + 0x00000e01, 0x505f5653, 0x5449534f, 0x004e4f49, 0x525f5653, 0x65646e65, 0x72615472, 0x41746567, + 0x79617272, 0x65646e49, 0xabab0078, 0x52444853, 0x00000074, 0x00010040, 0x0000001d, 0x04000059, + 0x00208e46, 0x00000000, 0x00000001, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x04000067, 0x00102012, 0x00000001, 0x00000004, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x06000036, 0x00102012, 0x00000001, 0x0020800a, 0x00000000, + 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00002000, 0x00000000, + }; static const DWORD gs_5_code[] = { #if 0 @@ -9442,6 +9478,7 @@ static void test_layered_rendering(void) {4.0f, 1.0f}, {4.0f, 3.0f}, {3.0f, 7.0f}, {5.0f, 1.0f}, {5.0f, 3.0f}, {3.0f, 6.0f}, {6.0f, 1.0f}, {6.0f, 3.0f}, {3.0f, 5.0f}, {7.0f, 1.0f}, {7.0f, 3.0f}, {3.0f, 4.0f}, }; + static const struct vec4 vs_expected_value = {1.0f, 42.0f}; if (!init_test_context(&test_context, NULL)) return; @@ -9453,6 +9490,7 @@ static void test_layered_rendering(void) memset(&constant, 0, sizeof(constant)); cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(constant), &constant); + ID3D11DeviceContext_VSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext_GSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); @@ -9556,6 +9594,35 @@ static void test_layered_rendering(void) check_texture_sub_resource_vec4(texture, i, NULL, &expected_values[i], 1); } + /* layered rendering without GS */ + if (!check_viewport_array_index_from_any_shader_support(device)) + { + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D11VertexShader_Release(vs); + skip("Viewport array index not supported in vertex shaders.\n"); + goto done; + } + + ID3D11DeviceContext_GSSetShader(context, NULL, NULL, 0); + + constant.layer_offset = 1; + constant.draw_id = 42; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY; + U(rtv_desc).Texture2DArray.MipSlice = 0; + U(rtv_desc).Texture2DArray.FirstArraySlice = 0; + U(rtv_desc).Texture2DArray.ArraySize = ~0u; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv); + ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + draw_quad_vs(&test_context, vs_code, sizeof(vs_code)); + check_texture_sub_resource_vec4(texture, + constant.layer_offset * texture_desc.MipLevels, NULL, &vs_expected_value, 1); + ID3D11RenderTargetView_Release(rtv); + +done: ID3D11Texture2D_Release(texture); ID3D11Buffer_Release(cb);

1 0

Józef Kucia : d3d11: Implement D3D11_FEATURE_D3D11_OPTIONS3.
by Alexandre Julliard Oct. 2, 2018

Oct. 2, 2018

Module: wine Branch: master Commit: 5c5856ec3ed8a4ab938d1703f5bc8cea385df097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c5856ec3ed8a4ab938d1703… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 1 18:01:13 2018 +0200 d3d11: Implement D3D11_FEATURE_D3D11_OPTIONS3. 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/device.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 1edd41f..157ff03 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3515,6 +3515,29 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 return S_OK; } + case D3D11_FEATURE_D3D11_OPTIONS3: + { + D3D11_FEATURE_DATA_D3D11_OPTIONS3 *options = feature_support_data; + if (feature_support_data_size != sizeof(*options)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to get device caps, hr %#x.\n", hr); + return hr; + } + + options->VPAndRTArrayIndexFromAnyShaderFeedingRasterizer + = wined3d_caps.viewport_array_index_any_shader; + return S_OK; + } + case D3D11_FEATURE_ARCHITECTURE_INFO: { D3D11_FEATURE_DATA_ARCHITECTURE_INFO *options = feature_support_data;

1 0

Piotr Caban : msvcr120: Added creal implementation.
by Alexandre Julliard Oct. 2, 2018

Oct. 2, 2018

Module: wine Branch: master Commit: 83a0c2085f55bbe789f7aabf1d494c24c8d6ab37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83a0c2085f55bbe789f7aabf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 19:50:45 2018 +0200 msvcr120: Added creal implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 3 ++- dlls/msvcr120/msvcr120.spec | 3 ++- dlls/msvcr120/tests/msvcr120.c | 7 +++++++ dlls/msvcr120_app/msvcr120_app.spec | 3 ++- dlls/msvcrt/math.c | 5 +++++ dlls/ucrtbase/ucrtbase.spec | 3 ++- 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index ec85a53..e7f3c98 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -202,7 +202,8 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ stub creal +@ cdecl -arch=i386 creal(double double) ucrtbase.creal +@ cdecl -arch=arm,x86_64,arm64 creal(ptr) ucrtbase.creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f3ab39a..fe4e2bd 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2103,7 +2103,8 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ stub creal +@ cdecl -arch=i386 creal(double double) MSVCR120_creal +@ cdecl -arch=arm,x86_64,arm64 creal(ptr) MSVCR120_creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 37957d5..79b667e 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -191,6 +191,7 @@ static void (__cdecl *p_free_locale)(_locale_t); static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); +static double (__cdecl *p_creal)(_Dcomplex); /* make sure we use the correct errno */ #undef errno @@ -250,6 +251,7 @@ static BOOL init(void) SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); + SET(p_creal, "creal"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -946,15 +948,20 @@ static void test_vsscanf(void) static void test__Cbuild(void) { _Dcomplex c; + double d; memset(&c, 0, sizeof(c)); p__Cbuild(&c, 1.0, 2.0); ok(c.r == 1.0, "c.r = %lf\n", c.r); ok(c.i == 2.0, "c.i = %lf\n", c.i); + d = p_creal(c); + ok(d == 1.0, "creal returned %lf\n", d); p__Cbuild(&c, 3.0, NAN); ok(c.r == 3.0, "c.r = %lf\n", c.r); ok(_isnan(c.i), "c.i = %lf\n", c.i); + d = p_creal(c); + ok(d == 3.0, "creal returned %lf\n", d); } START_TEST(msvcr120) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 1076ddf..4429a0c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1769,7 +1769,8 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ stub creal +@ cdecl -arch=i386 creal(double double) msvcr120.creal +@ cdecl -arch=arm,x86_64,arm64 creal(ptr) msvcr120.creal @ stub crealf @ stub creall @ stub csin diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b920251..d4785d3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3390,4 +3390,9 @@ _Dcomplex* CDECL MSVCR120__Cbuild(_Dcomplex *ret, double r, double i) return ret; } +double CDECL MSVCR120_creal(_Dcomplex z) +{ + return z.x; +} + #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3d0de47..084bea8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2246,7 +2246,8 @@ @ stub cproj @ stub cprojf @ stub cprojl -@ stub creal +@ cdecl -arch=i386 creal(double double) MSVCR120_creal +@ cdecl -arch=arm,x86_64,arm64 creal(ptr) MSVCR120_creal @ stub crealf @ stub creall @ stub csin

1 0

Piotr Caban : msvcr120: Added _Cbuild implementation.
by Alexandre Julliard Oct. 2, 2018

Oct. 2, 2018

Module: wine Branch: master Commit: 84f5d8a619c599dbacff499989500e653abec0fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f5d8a619c599dbacff4999… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 1 19:50:39 2018 +0200 msvcr120: Added _Cbuild implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 23 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 7 +++++++ dlls/msvcrt/msvcrt.h | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 7bae4ff..ec85a53 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl -arch=i386 _CIsqrt() ucrtbase._CIsqrt @ cdecl -arch=i386 _CItan() ucrtbase._CItan @ cdecl -arch=i386 _CItanh() ucrtbase._CItanh -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) ucrtbase._Cbuild @ stub _Cmulcc @ stub _Cmulcr @ stub _FCbuild diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 44f728b..f3ab39a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -824,7 +824,7 @@ @ cdecl -arch=i386 _CItanh() @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) MSVCR120__Cbuild @ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 85e83a6..37957d5 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -163,6 +163,12 @@ typedef struct unsigned int status; } fenv_t; +typedef struct +{ + double r; + double i; +} _Dcomplex; + static char* (CDECL *p_setlocale)(int category, const char* locale); static struct MSVCRT_lconv* (CDECL *p_localeconv)(void); static size_t (CDECL *p_wcstombs_s)(size_t *ret, char* dest, size_t sz, const wchar_t* src, size_t max); @@ -184,6 +190,7 @@ static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); +static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); /* make sure we use the correct errno */ #undef errno @@ -242,6 +249,7 @@ static BOOL init(void) SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); + SET(p__Cbuild, "_Cbuild"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -935,6 +943,20 @@ static void test_vsscanf(void) ok(v == 10, "got %d.\n", v); } +static void test__Cbuild(void) +{ + _Dcomplex c; + + memset(&c, 0, sizeof(c)); + p__Cbuild(&c, 1.0, 2.0); + ok(c.r == 1.0, "c.r = %lf\n", c.r); + ok(c.i == 2.0, "c.i = %lf\n", c.i); + + p__Cbuild(&c, 3.0, NAN); + ok(c.r == 3.0, "c.r = %lf\n", c.r); + ok(_isnan(c.i), "c.i = %lf\n", c.i); +} + START_TEST(msvcr120) { if (!init()) return; @@ -953,4 +975,5 @@ START_TEST(msvcr120) test__Condition_variable(); test_wctype(); test_vsscanf(); + test__Cbuild(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 935de2b..1076ddf 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -818,7 +818,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcr120._CIsqrt @ cdecl -arch=i386 _CItan() msvcr120._CItan @ cdecl -arch=i386 _CItanh() msvcr120._CItanh -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) msvcr120._Cbuild @ cdecl _CreateFrameInfo(ptr ptr) msvcr120._CreateFrameInfo @ stdcall _CxxThrowException(ptr ptr) msvcr120._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcr120._EH_prolog diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index dbfaa24..b920251 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3383,4 +3383,11 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, return res; } +_Dcomplex* CDECL MSVCR120__Cbuild(_Dcomplex *ret, double r, double i) +{ + ret->x = r; + ret->y = i; + return ret; +} + #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4e24ec0..37e820a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -458,6 +458,7 @@ struct MSVCRT__complex { double x; /* Real part */ double y; /* Imaginary part */ }; +typedef struct MSVCRT__complex _Dcomplex; typedef struct MSVCRT__div_t { int quot; /* quotient */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1ced9ca..3d0de47 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -14,7 +14,7 @@ @ cdecl -arch=i386 _CIsqrt() @ cdecl -arch=i386 _CItan() @ cdecl -arch=i386 _CItanh() -@ stub _Cbuild +@ cdecl _Cbuild(ptr double double) MSVCR120__Cbuild @ stub _Cmulcc @ stub _Cmulcr @ cdecl _CreateFrameInfo(ptr ptr)

1 0