August 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Move struct wined3d_buffer_gl to wined3d_gl.h.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: b492199b627fb0e9dff654c079d4983c494273c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/b492199b627fb0e9dff654c079d498… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:28:02 2023 -0600 wined3d: Move struct wined3d_buffer_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 19 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 21 +-------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 50222b34360..8221c2362e9 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1033,4 +1033,23 @@ void wined3d_sampler_gl_bind(struct wined3d_sampler_gl *sampler_gl, unsigned int void wined3d_sampler_gl_init(struct wined3d_sampler_gl *sampler_gl, struct wined3d_device *device, const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops); +struct wined3d_buffer_gl +{ + struct wined3d_buffer b; +}; + +static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer) +{ + return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); +} + +static inline const struct wined3d_buffer_gl *wined3d_buffer_gl_const(const struct wined3d_buffer *buffer) +{ + return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); +} + +HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, + const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, + void *parent, const struct wined3d_parent_ops *parent_ops); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f353377a836..b4b94510d2b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3525,8 +3525,6 @@ struct wined3d_sampler struct wined3d_sampler_desc desc; }; -#include "wined3d_gl.h" - struct wined3d_vertex_declaration_element { const struct wined3d_format *format; @@ -3953,24 +3951,7 @@ HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wine const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -struct wined3d_buffer_gl -{ - struct wined3d_buffer b; -}; - -static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer) -{ - return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); -} - -static inline const struct wined3d_buffer_gl *wined3d_buffer_gl_const(const struct wined3d_buffer *buffer) -{ - return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); -} - -HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, - const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +#include "wined3d_gl.h" struct wined3d_rendertarget_view {

1 0

Zebediah Figura : wined3d: Move struct wined3d_texture_gl to wined3d_gl.h.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 951d0e94c4de18158170152fd223a938adda6b00 URL: https://gitlab.winehq.org/wine/wine/-/commit/951d0e94c4de18158170152fd223a9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:22:54 2023 -0600 wined3d: Move struct wined3d_texture_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 102 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 104 +---------------------------------------- 2 files changed, 103 insertions(+), 103 deletions(-)

1 0

Zebediah Figura : wined3d: Move struct wined3d_sampler_gl to wined3d_gl.h.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 3308c44b23889d45dd570c22f0500a724c8cf86a URL: https://gitlab.winehq.org/wine/wine/-/commit/3308c44b23889d45dd570c22f0500a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:27:19 2023 -0600 wined3d: Move struct wined3d_sampler_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 17 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 20 +------------------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b21a38c2e95..50222b34360 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1016,4 +1016,21 @@ void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt); +struct wined3d_sampler_gl +{ + struct wined3d_sampler s; + + GLuint name; +}; + +static inline struct wined3d_sampler_gl *wined3d_sampler_gl(struct wined3d_sampler *sampler) +{ + return CONTAINING_RECORD(sampler, struct wined3d_sampler_gl, s); +} + +void wined3d_sampler_gl_bind(struct wined3d_sampler_gl *sampler_gl, unsigned int unit, + struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl); +void wined3d_sampler_gl_init(struct wined3d_sampler_gl *sampler_gl, struct wined3d_device *device, + const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e167df6db17..f353377a836 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3515,8 +3515,6 @@ HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct w const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, uint32_t flags, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -#include "wined3d_gl.h" - struct wined3d_sampler { struct wine_rb_entry entry; @@ -3527,23 +3525,7 @@ struct wined3d_sampler struct wined3d_sampler_desc desc; }; -struct wined3d_sampler_gl -{ - struct wined3d_sampler s; - - GLuint name; -}; - -static inline struct wined3d_sampler_gl *wined3d_sampler_gl(struct wined3d_sampler *sampler) -{ - return CONTAINING_RECORD(sampler, struct wined3d_sampler_gl, s); -} - -void wined3d_sampler_gl_bind(struct wined3d_sampler_gl *sampler_gl, unsigned int unit, - struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; -void wined3d_sampler_gl_init(struct wined3d_sampler_gl *sampler_gl, - struct wined3d_device *device, const struct wined3d_sampler_desc *desc, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +#include "wined3d_gl.h" struct wined3d_vertex_declaration_element {

1 0

Zebediah Figura : wined3d: Move struct wined3d_rendertarget_view_gl to wined3d_gl.h.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: ec7465864c70b858411add1ec06d1c13b0c268be URL: https://gitlab.winehq.org/wine/wine/-/commit/ec7465864c70b858411add1ec06d1c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:28:39 2023 -0600 wined3d: Move struct wined3d_rendertarget_view_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 18 +----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8221c2362e9..c6cfd3606e4 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1052,4 +1052,20 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops); +struct wined3d_rendertarget_view_gl +{ + struct wined3d_rendertarget_view v; + struct wined3d_gl_view gl_view; +}; + +static inline struct wined3d_rendertarget_view_gl *wined3d_rendertarget_view_gl( + struct wined3d_rendertarget_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_rendertarget_view_gl, v); +} + +HRESULT wined3d_rendertarget_view_gl_init(struct wined3d_rendertarget_view_gl *view_gl, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b4b94510d2b..699dbe585d6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3951,8 +3951,6 @@ HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wine const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -#include "wined3d_gl.h" - struct wined3d_rendertarget_view { LONG refcount; @@ -3993,21 +3991,7 @@ HRESULT wined3d_rendertarget_view_no3d_init(struct wined3d_rendertarget_view *vi const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -struct wined3d_rendertarget_view_gl -{ - struct wined3d_rendertarget_view v; - struct wined3d_gl_view gl_view; -}; - -static inline struct wined3d_rendertarget_view_gl *wined3d_rendertarget_view_gl( - struct wined3d_rendertarget_view *view) -{ - return CONTAINING_RECORD(view, struct wined3d_rendertarget_view_gl, v); -} - -HRESULT wined3d_rendertarget_view_gl_init(struct wined3d_rendertarget_view_gl *view_gl, - const struct wined3d_view_desc *desc, struct wined3d_resource *resource, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +#include "wined3d_gl.h" struct wined3d_shader_resource_view {

1 0

Zebediah Figura : wined3d: Move struct fbo_entry to wined3d_gl.h.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: wine Branch: master Commit: 8618b09eef403c5c99169237f47f68dade553e55 URL: https://gitlab.winehq.org/wine/wine/-/commit/8618b09eef403c5c99169237f47f68… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:26:55 2023 -0600 wined3d: Move struct fbo_entry to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 24 ++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4654be41bec..b21a38c2e95 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -574,6 +574,30 @@ struct wined3d_command_fence_gl #define MAX_GL_FRAGMENT_SAMPLERS 32 +struct wined3d_fbo_resource +{ + GLuint object; + GLenum target; + GLuint level, layer; +}; + +#define WINED3D_FBO_ENTRY_FLAG_ATTACHED 0x1 +#define WINED3D_FBO_ENTRY_FLAG_DEPTH 0x2 +#define WINED3D_FBO_ENTRY_FLAG_STENCIL 0x4 + +struct fbo_entry +{ + struct list entry; + uint32_t flags; + uint32_t rt_mask; + GLuint id; + struct wined3d_fbo_entry_key + { + uint32_t rb_namespace; + struct wined3d_fbo_resource objects[WINED3D_MAX_RENDER_TARGETS + 1]; + } key; +}; + struct wined3d_context_gl { struct wined3d_context c; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f643de4561e..e167df6db17 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3517,30 +3517,6 @@ HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct w #include "wined3d_gl.h" -struct wined3d_fbo_resource -{ - GLuint object; - GLenum target; - GLuint level, layer; -}; - -#define WINED3D_FBO_ENTRY_FLAG_ATTACHED 0x1 -#define WINED3D_FBO_ENTRY_FLAG_DEPTH 0x2 -#define WINED3D_FBO_ENTRY_FLAG_STENCIL 0x4 - -struct fbo_entry -{ - struct list entry; - uint32_t flags; - uint32_t rt_mask; - GLuint id; - struct wined3d_fbo_entry_key - { - DWORD rb_namespace; - struct wined3d_fbo_resource objects[WINED3D_MAX_RENDER_TARGETS + 1]; - } key; -}; - struct wined3d_sampler { struct wine_rb_entry entry;

1 0

Francisco Casas : vkd3d-shader/tpf: Avoid reading constant value components beyond type's width (Valgrind).
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: vkd3d Branch: master Commit: ed9e236b0173e89265453b6bc993fdce47ea7122 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ed9e236b0173e89265453b6bc993f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Aug 22 03:40:50 2023 -0400 vkd3d-shader/tpf: Avoid reading constant value components beyond type's width (Valgrind). We are passing map writemasks that may have more components than the constant's data type, so a (j < width) check is added to avoid reading components from the constant that are not intended to be used. Remaining values in the register are initialized to zero. --- libs/vkd3d-shader/tpf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 550f9b27..cf2cc0d1 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3715,8 +3715,10 @@ static void sm4_src_from_constant_value(struct sm4_src_register *src, src->reg.dim = VKD3D_SM4_DIMENSION_VEC4; for (i = 0; i < 4; ++i) { - if (map_writemask & (1u << i)) + if ((map_writemask & (1u << i)) && (j < width)) src->reg.immconst_uint[i] = value->u[j++].u; + else + src->reg.immconst_uint[i] = 0; } } }

1 0

Conor McCarthy : vkd3d: Do not flush descriptor heaps stored in the command list when the array size is exceeded.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: vkd3d Branch: master Commit: 5c097521942cb4fa5e076c6a89ef4c197e20c409 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5c097521942cb4fa5e076c6a89ef4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 23 11:07:16 2023 +1000 vkd3d: Do not flush descriptor heaps stored in the command list when the array size is exceeded. An earlier patch introduced a bug which overflows the descriptor heap array. The array should not be emptied here in case the list is resubmitted, so just flush the new heap. --- libs/vkd3d/command.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8b5f7899..42a98763 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3225,7 +3225,10 @@ static void command_list_add_descriptor_heap(struct d3d12_command_list *list, st { /* Descriptors can be written after binding. */ FIXME("Flushing descriptor updates while list %p is not closed.\n", list); - command_list_flush_vk_heap_updates(list); + vkd3d_mutex_lock(&heap->vk_sets_mutex); + d3d12_desc_flush_vk_heap_updates_locked(heap, list->device); + vkd3d_mutex_unlock(&heap->vk_sets_mutex); + return; } list->descriptor_heaps[list->descriptor_heap_count++] = heap; }

1 0

Evan Tang : tests: Test CopyResource depth to color.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: vkd3d Branch: master Commit: f37493428164a24acfcbac0148f12527c0ce130d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f37493428164a24acfcbac0148f12… Author: Evan Tang <etang(a)codeweavers.com> Date: Fri Aug 18 15:43:19 2023 -0500 tests: Test CopyResource depth to color. --- tests/d3d12.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index af27cd2e..586b8222 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -25682,6 +25682,51 @@ static void test_copy_texture(void) D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + for (i = 0; i < ARRAY_SIZE(depth_values); ++i) + { + init_depth_stencil(&ds, device, context.render_target_desc.Width, + context.render_target_desc.Height, 1, 1, DXGI_FORMAT_D32_FLOAT, + DXGI_FORMAT_D32_FLOAT, NULL); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, depth_values[i], 0, 0, NULL); + transition_sub_resource_state(command_list, ds.texture, 0, + D3D12_RESOURCE_STATE_DEPTH_WRITE, resource_states[i % ARRAY_SIZE(resource_states)]); + + dst_texture = create_default_texture(device, 32, 32, DXGI_FORMAT_R32_FLOAT, + 0, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12Device_CreateShaderResourceView(device, dst_texture, NULL, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + ID3D12GraphicsCommandList_CopyResource(command_list, dst_texture, ds.texture); + transition_sub_resource_state(command_list, dst_texture, 0, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap)); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(context.render_target, 0, queue, command_list, depth_values[i], 2); + + destroy_depth_stencil(&ds); + ID3D12Resource_Release(dst_texture); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, context.render_target, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + ID3D12DescriptorHeap_Release(heap); destroy_test_context(&context); }

1 0

Nikolay Sivov : tests: Add some tests for "if" statement attributes.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: vkd3d Branch: master Commit: 9605993af3ffe637f36fab2859bd5df7bebeb9c9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9605993af3ffe637f36fab2859bd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 10 09:27:57 2023 +0200 tests: Add some tests for "if" statement attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/conditional.shader_test | 68 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/tests/hlsl/conditional.shader_test b/tests/hlsl/conditional.shader_test index d83596fc..2d2ba2e9 100644 --- a/tests/hlsl/conditional.shader_test +++ b/tests/hlsl/conditional.shader_test @@ -14,3 +14,71 @@ probe all rgba (0.9, 0.8, 0.7, 0.6) uniform 0 float4 0.1 0.0 0.0 0.0 draw quad probe all rgba (0.1, 0.2, 0.3, 0.4) + +[pixel shader todo] +float4 main(uniform float4 u) : sv_target +{ + [attr1] + if (u.x > 0.0) + return float4(0.1, 0.2, 0.3, 0.4); + else + return float4(0.9, 0.8, 0.7, 0.6); +} + +[pixel shader todo] +float4 main(uniform float4 u) : sv_target +{ + [flatten] + if (u.x > 0.0) + return float4(0.1, 0.2, 0.3, 0.4); + else + return float4(0.9, 0.8, 0.7, 0.6); +} + +[test] +uniform 0 float4 0.0 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.9, 0.8, 0.7, 0.6) + +[pixel shader fail] +float4 u; + +float main() : sv_target +{ + [branch] [branch] + if (u.x > 0.0) + return float4(0.1, 0.2, 0.3, 0.4); + else + return float4(0.9, 0.8, 0.7, 0.6); +} + +[pixel shader fail] +float4 u; + +float main() : sv_target +{ + [branch] [flatten] + if (u.x > 0.0) + return float4(0.1, 0.2, 0.3, 0.4); + else + return float4(0.9, 0.8, 0.7, 0.6); +} + +% Using older profiles fails to compile with forced control flow instruction +[require] +shader model >= 3.0 + +[pixel shader todo] +float4 main(uniform float4 u) : sv_target +{ + [branch] + if (u.x > 0.0) + return float4(0.1, 0.2, 0.3, 0.4); + else + return float4(0.9, 0.8, 0.7, 0.6); +} + +[test] +uniform 0 float4 0.0 0.0 0.0 0.0 +todo draw quad +todo probe all rgba (0.9, 0.8, 0.7, 0.6)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Parse "if" statement attributes.
by Alexandre Julliard Aug. 24, 2023

Aug. 24, 2023

Module: vkd3d Branch: master Commit: 1153f6bb3496ad53df0caa2dd3767e9659a36733 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1153f6bb3496ad53df0caa2dd3767… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 10 10:03:49 2023 +0200 vkd3d-shader/hlsl: Parse "if" statement attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 36 +++++++++++++++++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/hlsl/conditional.shader_test | 16 +++++++------- 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 29e0ff0c..048f7232 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -6108,19 +6108,39 @@ jump_statement: } selection_statement: - KW_IF '(' expr ')' if_body + attribute_list_optional KW_IF '(' expr ')' if_body { - struct hlsl_ir_node *condition = node_from_block($3); + struct hlsl_ir_node *condition = node_from_block($4); + const struct parse_attribute_list *attributes = &$1; struct hlsl_ir_node *instr; + unsigned int i; + + if (attribute_list_has_duplicates(attributes)) + hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Found duplicate attribute."); - if (!(instr = hlsl_new_if(ctx, condition, $5.then_block, $5.else_block, &@1))) + for (i = 0; i < attributes->count; ++i) { - destroy_block($5.then_block); - destroy_block($5.else_block); + const struct hlsl_attribute *attr = attributes->attrs[i]; + + if (!strcmp(attr->name, "branch") + || !strcmp(attr->name, "flatten")) + { + hlsl_warning(ctx, &@1, VKD3D_SHADER_WARNING_HLSL_IGNORED_ATTRIBUTE, "Unhandled attribute '%s'.", attr->name); + } + else + { + hlsl_warning(ctx, &@1, VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE, "Unrecognized attribute '%s'.", attr->name); + } + } + + if (!(instr = hlsl_new_if(ctx, condition, $6.then_block, $6.else_block, &@2))) + { + destroy_block($6.then_block); + destroy_block($6.else_block); YYABORT; } - destroy_block($5.then_block); - destroy_block($5.else_block); + destroy_block($6.then_block); + destroy_block($6.else_block); if (condition->data_type->dimx > 1 || condition->data_type->dimy > 1) { struct vkd3d_string_buffer *string; @@ -6130,7 +6150,7 @@ selection_statement: "if condition type %s is not scalar.", string->buffer); hlsl_release_string_buffer(ctx, string); } - $$ = $3; + $$ = $4; hlsl_block_add_instr($$, instr); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index bf925a44..7cfaba56 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -140,6 +140,7 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_HLSL_UNKNOWN_ATTRIBUTE = 5302, VKD3D_SHADER_WARNING_HLSL_IMAGINARY_NUMERIC_RESULT = 5303, VKD3D_SHADER_WARNING_HLSL_NON_FINITE_RESULT = 5304, + VKD3D_SHADER_WARNING_HLSL_IGNORED_ATTRIBUTE = 5305, VKD3D_SHADER_ERROR_GLSL_INTERNAL = 6000, diff --git a/tests/hlsl/conditional.shader_test b/tests/hlsl/conditional.shader_test index 2d2ba2e9..b3b18dc1 100644 --- a/tests/hlsl/conditional.shader_test +++ b/tests/hlsl/conditional.shader_test @@ -15,7 +15,7 @@ uniform 0 float4 0.1 0.0 0.0 0.0 draw quad probe all rgba (0.1, 0.2, 0.3, 0.4) -[pixel shader todo] +[pixel shader] float4 main(uniform float4 u) : sv_target { [attr1] @@ -25,7 +25,7 @@ float4 main(uniform float4 u) : sv_target return float4(0.9, 0.8, 0.7, 0.6); } -[pixel shader todo] +[pixel shader] float4 main(uniform float4 u) : sv_target { [flatten] @@ -37,8 +37,8 @@ float4 main(uniform float4 u) : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -todo draw quad -todo probe all rgba (0.9, 0.8, 0.7, 0.6) +draw quad +probe all rgba (0.9, 0.8, 0.7, 0.6) [pixel shader fail] float4 u; @@ -52,7 +52,7 @@ float main() : sv_target return float4(0.9, 0.8, 0.7, 0.6); } -[pixel shader fail] +[pixel shader fail todo] float4 u; float main() : sv_target @@ -68,7 +68,7 @@ float main() : sv_target [require] shader model >= 3.0 -[pixel shader todo] +[pixel shader] float4 main(uniform float4 u) : sv_target { [branch] @@ -80,5 +80,5 @@ float4 main(uniform float4 u) : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -todo draw quad -todo probe all rgba (0.9, 0.8, 0.7, 0.6) +draw quad +probe all rgba (0.9, 0.8, 0.7, 0.6)

1 0