wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/spirv: Implement the WAVE_ACTIVE_BALLOT instruction.

Browse Source
This commit is contained in:
Conor McCarthy 2024-04-23 21:00:56 +10:00 committed by Alexandre Julliard
parent 174a692a17
commit 1c49b3a779
Notes: Alexandre Julliard 2024-05-06 22:37:06 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/827
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libs/vkd3d-shader/spirv.c
View File

@ -1752,6 +1752,14 @@ static uint32_t vkd3d_spirv_get_op_scope_subgroup(struct vkd3d_spirv_builder *bu
return vkd3d_spirv_build_once(builder, &builder->scope_subgroup_id, vkd3d_spirv_build_op_scope_subgroup); return vkd3d_spirv_build_once(builder, &builder->scope_subgroup_id, vkd3d_spirv_build_op_scope_subgroup);
} }
static uint32_t vkd3d_spirv_build_op_group_nonuniform_ballot(struct vkd3d_spirv_builder *builder,
uint32_t result_type, uint32_t val_id)
{
vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniformBallot);
return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, SpvOpGroupNonUniformBallot,
result_type, vkd3d_spirv_get_op_scope_subgroup(builder), val_id);
}
static uint32_t vkd3d_spirv_build_op_glsl_std450_tr1(struct vkd3d_spirv_builder *builder, static uint32_t vkd3d_spirv_build_op_glsl_std450_tr1(struct vkd3d_spirv_builder *builder,
enum GLSLstd450 op, uint32_t result_type, uint32_t operand) enum GLSLstd450 op, uint32_t result_type, uint32_t operand)
{ {
@ -9793,6 +9801,21 @@ static void spirv_compiler_emit_wave_bool_op(struct spirv_compiler *compiler,
spirv_compiler_emit_store_dst(compiler, dst, val_id); spirv_compiler_emit_store_dst(compiler, dst, val_id);
} }
static void spirv_compiler_emit_wave_active_ballot(struct spirv_compiler *compiler,
const struct vkd3d_shader_instruction *instruction)
{
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
const struct vkd3d_shader_dst_param *dst = instruction->dst;
const struct vkd3d_shader_src_param *src = instruction->src;
uint32_t type_id, val_id;
type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, VKD3D_VEC4_SIZE);
val_id = spirv_compiler_emit_load_src(compiler, src, VKD3DSP_WRITEMASK_0);
val_id = vkd3d_spirv_build_op_group_nonuniform_ballot(builder, type_id, val_id);
spirv_compiler_emit_store_dst(compiler, dst, val_id);
}
/* This function is called after declarations are processed. */ /* This function is called after declarations are processed. */
static void spirv_compiler_emit_main_prolog(struct spirv_compiler *compiler) static void spirv_compiler_emit_main_prolog(struct spirv_compiler *compiler)
{ {
@ -10142,6 +10165,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler,
case VKD3DSIH_WAVE_ANY_TRUE: case VKD3DSIH_WAVE_ANY_TRUE:
spirv_compiler_emit_wave_bool_op(compiler, instruction); spirv_compiler_emit_wave_bool_op(compiler, instruction);
break; break;
case VKD3DSIH_WAVE_ACTIVE_BALLOT:
spirv_compiler_emit_wave_active_ballot(compiler, instruction);
break;
case VKD3DSIH_DCL: case VKD3DSIH_DCL:
case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: case VKD3DSIH_DCL_HS_MAX_TESSFACTOR:
case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT:

2
tests/hlsl/wave-ops-float.shader_test
View File

@ -81,7 +81,7 @@ void main(uint id : SV_GroupIndex)
} }
[test] [test]
todo dispatch 4 1 1 dispatch 4 1 1
probe uav 1 (0) rgbaui (0xb, 0, 0, 0) probe uav 1 (0) rgbaui (0xb, 0, 0, 0)

2
tests/hlsl/wave-ops-uint.shader_test
View File

@ -120,7 +120,7 @@ void main(uint id : SV_GroupIndex)
} }
[test] [test]
todo dispatch 4 1 1 dispatch 4 1 1
probe uav 1 (0) rui (5) probe uav 1 (0) rui (5)
probe uav 1 (1) rui (5) probe uav 1 (1) rui (5)
probe uav 1 (2) rui (5) probe uav 1 (2) rui (5)