wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Create SSA values with the corresponding dimension in vsir_program_lower_sm4_sincos().

Browse Source 
For example, in the final test from trigonometry.shader_test, we have:

    sincos r1.x <v4:float>, null <float>, l(3.00000000e+01) <s:float>

which currently gets turned into

    mov sr0.xyzw <v4:float>, l(3.00000000e+01) <s:float>
    sin r1.x <v4:float>, sr0.xyzw <v4:float>

That doesn't seem ideal, and should possibly be rejected by the
validator, but ends up working out well enough for the SPIR-V backend.
It's a bit more problematic to deal with for the GLSL backend.
This commit is contained in:
Henri Verbeet
2025-06-23 23:55:34 +02:00
parent 96cd4cc954
commit 043f6f21b0
Notes: Henri Verbeet 2025-06-26 17:50:28 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1594
1 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
libs/vkd3d-shader/ir.c
View File

@@ -640,11 +640,23 @@ static void vsir_src_param_init_sampler(struct vkd3d_shader_src_param *src, unsi
src->reg.dimension = VSIR_DIMENSION_NONE; src->reg.dimension = VSIR_DIMENSION_NONE;
} }
static void src_param_init_ssa_scalar(struct vkd3d_shader_src_param *src, unsigned int idx, static void src_param_init_ssa(struct vkd3d_shader_src_param *src, unsigned int idx,
enum vkd3d_data_type data_type) enum vkd3d_data_type data_type, enum vsir_dimension dimension)
{ {
vsir_src_param_init(src, VKD3DSPR_SSA, data_type, 1); vsir_src_param_init(src, VKD3DSPR_SSA, data_type, 1);
src->reg.idx[0].offset = idx; src->reg.idx[0].offset = idx;
if (dimension == VSIR_DIMENSION_VEC4)
{
src->reg.dimension = VSIR_DIMENSION_VEC4;
src->swizzle = VKD3D_SHADER_NO_SWIZZLE;
}
}
static void src_param_init_ssa_scalar(struct vkd3d_shader_src_param *src, unsigned int idx,
enum vkd3d_data_type data_type)
{
src_param_init_ssa(src, idx, data_type, VSIR_DIMENSION_SCALAR);
} }
static void src_param_init_ssa_bool(struct vkd3d_shader_src_param *src, unsigned int idx) static void src_param_init_ssa_bool(struct vkd3d_shader_src_param *src, unsigned int idx)
@@ -660,15 +672,12 @@ static void src_param_init_ssa_float(struct vkd3d_shader_src_param *src, unsigne
static void src_param_init_ssa_vec4(struct vkd3d_shader_src_param *src, unsigned int idx, static void src_param_init_ssa_vec4(struct vkd3d_shader_src_param *src, unsigned int idx,
enum vkd3d_data_type data_type) enum vkd3d_data_type data_type)
{ {
vsir_src_param_init(src, VKD3DSPR_SSA, data_type, 1); src_param_init_ssa(src, idx, data_type, VSIR_DIMENSION_VEC4);
src->reg.idx[0].offset = idx;
src->reg.dimension = VSIR_DIMENSION_VEC4;
src->swizzle = VKD3D_SHADER_NO_SWIZZLE;
} }
static void src_param_init_ssa_float4(struct vkd3d_shader_src_param *src, unsigned int idx) static void src_param_init_ssa_float4(struct vkd3d_shader_src_param *src, unsigned int idx)
{ {
src_param_init_ssa_vec4(src, idx, VKD3D_DATA_FLOAT); src_param_init_ssa(src, idx, VKD3D_DATA_FLOAT, VSIR_DIMENSION_VEC4);
} }
static void src_param_init_temp_bool(struct vkd3d_shader_src_param *src, unsigned int idx) static void src_param_init_temp_bool(struct vkd3d_shader_src_param *src, unsigned int idx)
@@ -721,11 +730,23 @@ void vsir_dst_param_init_null(struct vkd3d_shader_dst_param *dst)
dst->write_mask = 0; dst->write_mask = 0;
} }
static void dst_param_init_ssa_scalar(struct vkd3d_shader_dst_param *dst, unsigned int idx, static void dst_param_init_ssa(struct vkd3d_shader_dst_param *dst, unsigned int idx,
enum vkd3d_data_type data_type) enum vkd3d_data_type data_type, enum vsir_dimension dimension)
{ {
vsir_dst_param_init(dst, VKD3DSPR_SSA, data_type, 1); vsir_dst_param_init(dst, VKD3DSPR_SSA, data_type, 1);
dst->reg.idx[0].offset = idx; dst->reg.idx[0].offset = idx;
if (dimension == VSIR_DIMENSION_VEC4)
{
dst->reg.dimension = VSIR_DIMENSION_VEC4;
dst->write_mask = VKD3DSP_WRITEMASK_ALL;
}
}
static void dst_param_init_ssa_scalar(struct vkd3d_shader_dst_param *dst, unsigned int idx,
enum vkd3d_data_type data_type)
{
dst_param_init_ssa(dst, idx, data_type, VSIR_DIMENSION_SCALAR);
} }
static void dst_param_init_ssa_bool(struct vkd3d_shader_dst_param *dst, unsigned int idx) static void dst_param_init_ssa_bool(struct vkd3d_shader_dst_param *dst, unsigned int idx)
@@ -741,15 +762,12 @@ static void dst_param_init_ssa_float(struct vkd3d_shader_dst_param *dst, unsigne
static void dst_param_init_ssa_vec4(struct vkd3d_shader_dst_param *dst, unsigned int idx, static void dst_param_init_ssa_vec4(struct vkd3d_shader_dst_param *dst, unsigned int idx,
enum vkd3d_data_type data_type) enum vkd3d_data_type data_type)
{ {
vsir_dst_param_init(dst, VKD3DSPR_SSA, data_type, 1); dst_param_init_ssa(dst, idx, data_type, VSIR_DIMENSION_VEC4);
dst->reg.idx[0].offset = idx;
dst->reg.dimension = VSIR_DIMENSION_VEC4;
dst->write_mask = VKD3DSP_WRITEMASK_ALL;
} }
static void dst_param_init_ssa_float4(struct vkd3d_shader_dst_param *dst, unsigned int idx) static void dst_param_init_ssa_float4(struct vkd3d_shader_dst_param *dst, unsigned int idx)
{ {
dst_param_init_ssa_vec4(dst, idx, VKD3D_DATA_FLOAT); dst_param_init_ssa(dst, idx, VKD3D_DATA_FLOAT, VSIR_DIMENSION_VEC4);
} }
static void dst_param_init_temp_bool(struct vkd3d_shader_dst_param *dst, unsigned int idx) static void dst_param_init_temp_bool(struct vkd3d_shader_dst_param *dst, unsigned int idx)
@@ -1343,7 +1361,7 @@ static enum vkd3d_result vsir_program_lower_sm4_sincos(struct vsir_program *prog
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
mov->src[0] = sincos->src[0]; mov->src[0] = sincos->src[0];
dst_param_init_ssa_vec4(&mov->dst[0], program->ssa_count, sincos->src[0].reg.data_type); dst_param_init_ssa(&mov->dst[0], program->ssa_count, sincos->src[0].reg.data_type, sincos->src[0].reg.dimension);
if (sincos->dst[0].reg.type != VKD3DSPR_NULL) if (sincos->dst[0].reg.type != VKD3DSPR_NULL)
{ {
@@ -1352,7 +1370,8 @@ static enum vkd3d_result vsir_program_lower_sm4_sincos(struct vsir_program *prog
ins->flags = sincos->flags; ins->flags = sincos->flags;
src_param_init_ssa_vec4(&ins->src[0], program->ssa_count, sincos->src[0].reg.data_type); src_param_init_ssa(&ins->src[0], program->ssa_count,
sincos->src[0].reg.data_type, sincos->src[0].reg.dimension);
ins->dst[0] = sincos->dst[0]; ins->dst[0] = sincos->dst[0];
++ins; ++ins;
@@ -1365,7 +1384,8 @@ static enum vkd3d_result vsir_program_lower_sm4_sincos(struct vsir_program *prog
ins->flags = sincos->flags; ins->flags = sincos->flags;
src_param_init_ssa_vec4(&ins->src[0], program->ssa_count, sincos->src[0].reg.data_type); src_param_init_ssa(&ins->src[0], program->ssa_count,
sincos->src[0].reg.data_type, sincos->src[0].reg.dimension);
ins->dst[0] = sincos->dst[1]; ins->dst[0] = sincos->dst[1];
++ins; ++ins;