Signed-off-by: Giovanni Mascellani gmascellani@codeweavers.com
Il 27/01/22 19:31, Francisco Casas ha scritto:
Signed-off-by: Francisco Casas fcasas@codeweavers.com
libs/vkd3d-shader/hlsl.c | 25 ++++++++++++--------- libs/vkd3d-shader/hlsl.h | 16 ++++++++++++-- libs/vkd3d-shader/hlsl_sm4.c | 43 ++++++++++++++++++++++-------------- 3 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e96969d1..8a0f4b01 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -932,10 +932,15 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru { static const char *const dimensions[] = {
[HLSL_SAMPLER_DIM_1D] = "1D",[HLSL_SAMPLER_DIM_2D] = "2D",[HLSL_SAMPLER_DIM_3D] = "3D",[HLSL_SAMPLER_DIM_CUBE] = "Cube"
[HLSL_SAMPLER_DIM_1D] = "1D",[HLSL_SAMPLER_DIM_2D] = "2D",[HLSL_SAMPLER_DIM_3D] = "3D",[HLSL_SAMPLER_DIM_CUBE] = "Cube",[HLSL_SAMPLER_DIM_1DARRAY] = "1DArray",[HLSL_SAMPLER_DIM_2DARRAY] = "2DArray",[HLSL_SAMPLER_DIM_2DMS] = "2DMS",[HLSL_SAMPLER_DIM_2DMSARRAY] = "2DMSArray",[HLSL_SAMPLER_DIM_CUBEARRAY] = "CubeArray", }; switch (type->base_type)@@ -1778,11 +1783,11 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
static const char *const sampler_names[] = {
"sampler","sampler1D","sampler2D","sampler3D","samplerCUBE"
[HLSL_SAMPLER_DIM_GENERIC] = "sampler",[HLSL_SAMPLER_DIM_1D] = "sampler1D",[HLSL_SAMPLER_DIM_2D] = "sampler2D",[HLSL_SAMPLER_DIM_3D] = "sampler3D",[HLSL_SAMPLER_DIM_CUBE] = "samplerCUBE", }; static const struct@@ -1834,7 +1839,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } }
- for (bt = 0; bt <= HLSL_SAMPLER_DIM_MAX; ++bt)
- for (bt = 0; bt <= HLSL_SAMPLER_DIM_LAST_SAMPLER; ++bt) { type = hlsl_new_type(ctx, sampler_names[bt], HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); type->sampler_dim = bt;
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3dfeea1d..8f365abb 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -98,7 +98,13 @@ enum hlsl_sampler_dim HLSL_SAMPLER_DIM_2D, HLSL_SAMPLER_DIM_3D, HLSL_SAMPLER_DIM_CUBE,
- HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBE
HLSL_SAMPLER_DIM_LAST_SAMPLER = HLSL_SAMPLER_DIM_CUBE,
HLSL_SAMPLER_DIM_1DARRAY,
HLSL_SAMPLER_DIM_2DARRAY,
HLSL_SAMPLER_DIM_2DMS,
HLSL_SAMPLER_DIM_2DMSARRAY,
HLSL_SAMPLER_DIM_CUBEARRAY,
HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBEARRAY, };
enum hlsl_matrix_majority
@@ -487,7 +493,7 @@ struct hlsl_ctx struct hlsl_type *vector[HLSL_TYPE_LAST_SCALAR + 1][4]; /* matrix[float][2][4] is a float4x2, i.e. dimx = 2, dimy = 4 */ struct hlsl_type *matrix[HLSL_TYPE_LAST_SCALAR + 1][4][4];
struct hlsl_type *sampler[HLSL_SAMPLER_DIM_MAX + 1];
struct hlsl_type *sampler[HLSL_SAMPLER_DIM_LAST_SAMPLER + 1]; struct hlsl_type *Void; } builtin_types;@@ -673,11 +679,17 @@ static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim) { case HLSL_SAMPLER_DIM_1D: return 1;
case HLSL_SAMPLER_DIM_1DARRAY: case HLSL_SAMPLER_DIM_2D:case HLSL_SAMPLER_DIM_2DMS: return 2;case HLSL_SAMPLER_DIM_2DARRAY:case HLSL_SAMPLER_DIM_2DMSARRAY: case HLSL_SAMPLER_DIM_3D: case HLSL_SAMPLER_DIM_CUBE: return 3;case HLSL_SAMPLER_DIM_CUBEARRAY:return 4; default: assert(0); return 0;diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 4eebd583..d62a1bed 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -434,6 +434,16 @@ static D3D_SRV_DIMENSION sm4_rdef_resource_dimension(const struct hlsl_type *typ return D3D_SRV_DIMENSION_TEXTURE3D; case HLSL_SAMPLER_DIM_CUBE: return D3D_SRV_DIMENSION_TEXTURECUBE;
case HLSL_SAMPLER_DIM_1DARRAY:return D3D_SRV_DIMENSION_TEXTURE1DARRAY;case HLSL_SAMPLER_DIM_2DARRAY:return D3D_SRV_DIMENSION_TEXTURE2DARRAY;case HLSL_SAMPLER_DIM_2DMS:return D3D_SRV_DIMENSION_TEXTURE2DMS;case HLSL_SAMPLER_DIM_2DMSARRAY:return D3D_SRV_DIMENSION_TEXTURE2DMSARRAY;case HLSL_SAMPLER_DIM_CUBEARRAY:return D3D_SRV_DIMENSION_TEXTURECUBEARRAY; default: assert(0); return D3D_SRV_DIMENSION_UNKNOWN;@@ -721,6 +731,16 @@ static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_typ return VKD3D_SM4_RESOURCE_TEXTURE_3D; case HLSL_SAMPLER_DIM_CUBE: return VKD3D_SM4_RESOURCE_TEXTURE_CUBE;
case HLSL_SAMPLER_DIM_1DARRAY:return VKD3D_SM4_RESOURCE_TEXTURE_1DARRAY;case HLSL_SAMPLER_DIM_2DARRAY:return VKD3D_SM4_RESOURCE_TEXTURE_2DARRAY;case HLSL_SAMPLER_DIM_2DMS:return VKD3D_SM4_RESOURCE_TEXTURE_2DMS;case HLSL_SAMPLER_DIM_2DMSARRAY:return VKD3D_SM4_RESOURCE_TEXTURE_2DMSARRAY;case HLSL_SAMPLER_DIM_CUBEARRAY:return VKD3D_SM4_RESOURCE_TEXTURE_CUBEARRAY; default: assert(0); return 0;@@ -1307,6 +1327,7 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf const struct hlsl_deref *resource, const struct hlsl_ir_node *coords) { struct sm4_instruction instr;
unsigned int dim_count;
memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_LD;
@@ -1318,23 +1339,11 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf
/* Mipmap level is in the last component in the IR, but needs to be in the W * component in the instruction. */
- switch (resource_type->sampler_dim)
- {
case HLSL_SAMPLER_DIM_1D:instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4);break;case HLSL_SAMPLER_DIM_2D:instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4);break;case HLSL_SAMPLER_DIM_3D:case HLSL_SAMPLER_DIM_CUBE:break;case HLSL_SAMPLER_DIM_GENERIC:assert(0);- }
dim_count = hlsl_sampler_dim_count(resource_type->sampler_dim);
if (dim_count == 1)
instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4);if (dim_count == 2)
instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); sm4_src_from_deref(ctx, &instr.srcs[1], resource, resource_type, instr.dsts[0].writemask);