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/d3dbc: Consider the class in sm1_base_type().

Browse Source 
We want the base type to stop being a property of all types, and to stop using
the same enumeration for objects and numeric types. The backend should do the
work of translation; we want a more sensible and convenient representation for
the compiler itself.
This commit is contained in:
Zebediah Figura 2024-02-05 19:38:22 -06:00 committed by Alexandre Julliard
parent a882d60534
commit 285059ef11
Notes: Alexandre Julliard 2024-04-11 17:04:58 -05: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/775
1 changed files with 77 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
libs/vkd3d-shader/d3dbc.c
View File

@ -1522,72 +1522,94 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type)
D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type)
{ {
switch (type->base_type) switch (type->class)
{ {
case HLSL_TYPE_BOOL: case HLSL_CLASS_SCALAR:
return D3DXPT_BOOL; case HLSL_CLASS_VECTOR:
/* Actually double behaves differently depending on DLL version: case HLSL_CLASS_MATRIX:
* For <= 36, it maps to D3DXPT_FLOAT. switch (type->base_type)
* For 37-40, it maps to zero (D3DXPT_VOID).
* For >= 41, it maps to 39, which is D3D_SVT_DOUBLE (note D3D_SVT_*
* values are mostly compatible with D3DXPT_*).
* However, the latter two cases look like bugs, and a reasonable
* application certainly wouldn't know what to do with them.
* For fx_2_0 it's always D3DXPT_FLOAT regardless of DLL version. */
case HLSL_TYPE_DOUBLE:
case HLSL_TYPE_FLOAT:
case HLSL_TYPE_HALF:
return D3DXPT_FLOAT;
case HLSL_TYPE_INT:
case HLSL_TYPE_UINT:
return D3DXPT_INT;
case HLSL_TYPE_PIXELSHADER:
return D3DXPT_PIXELSHADER;
case HLSL_TYPE_SAMPLER:
switch (type->sampler_dim)
{ {
case HLSL_SAMPLER_DIM_1D: case HLSL_TYPE_BOOL:
return D3DXPT_SAMPLER1D; return D3DXPT_BOOL;
case HLSL_SAMPLER_DIM_2D: /* Actually double behaves differently depending on DLL version:
return D3DXPT_SAMPLER2D; * For <= 36, it maps to D3DXPT_FLOAT.
case HLSL_SAMPLER_DIM_3D: * For 37-40, it maps to zero (D3DXPT_VOID).
return D3DXPT_SAMPLER3D; * For >= 41, it maps to 39, which is D3D_SVT_DOUBLE (note D3D_SVT_*
case HLSL_SAMPLER_DIM_CUBE: * values are mostly compatible with D3DXPT_*).
return D3DXPT_SAMPLERCUBE; * However, the latter two cases look like bugs, and a reasonable
case HLSL_SAMPLER_DIM_GENERIC: * application certainly wouldn't know what to do with them.
return D3DXPT_SAMPLER; * For fx_2_0 it's always D3DXPT_FLOAT regardless of DLL version. */
case HLSL_TYPE_DOUBLE:
case HLSL_TYPE_FLOAT:
case HLSL_TYPE_HALF:
return D3DXPT_FLOAT;
case HLSL_TYPE_INT:
case HLSL_TYPE_UINT:
return D3DXPT_INT;
default: default:
ERR("Invalid dimension %#x.\n", type->sampler_dim);
vkd3d_unreachable(); vkd3d_unreachable();
} }
break;
case HLSL_TYPE_STRING: case HLSL_CLASS_OBJECT:
return D3DXPT_STRING; switch (type->base_type)
case HLSL_TYPE_TEXTURE:
switch (type->sampler_dim)
{ {
case HLSL_SAMPLER_DIM_1D: case HLSL_TYPE_PIXELSHADER:
return D3DXPT_TEXTURE1D; return D3DXPT_PIXELSHADER;
case HLSL_SAMPLER_DIM_2D: case HLSL_TYPE_SAMPLER:
return D3DXPT_TEXTURE2D; switch (type->sampler_dim)
case HLSL_SAMPLER_DIM_3D: {
return D3DXPT_TEXTURE3D; case HLSL_SAMPLER_DIM_1D:
case HLSL_SAMPLER_DIM_CUBE: return D3DXPT_SAMPLER1D;
return D3DXPT_TEXTURECUBE; case HLSL_SAMPLER_DIM_2D:
case HLSL_SAMPLER_DIM_GENERIC: return D3DXPT_SAMPLER2D;
return D3DXPT_TEXTURE; case HLSL_SAMPLER_DIM_3D:
return D3DXPT_SAMPLER3D;
case HLSL_SAMPLER_DIM_CUBE:
return D3DXPT_SAMPLERCUBE;
case HLSL_SAMPLER_DIM_GENERIC:
return D3DXPT_SAMPLER;
default:
ERR("Invalid dimension %#x.\n", type->sampler_dim);
vkd3d_unreachable();
}
break;
case HLSL_TYPE_STRING:
return D3DXPT_STRING;
case HLSL_TYPE_TEXTURE:
switch (type->sampler_dim)
{
case HLSL_SAMPLER_DIM_1D:
return D3DXPT_TEXTURE1D;
case HLSL_SAMPLER_DIM_2D:
return D3DXPT_TEXTURE2D;
case HLSL_SAMPLER_DIM_3D:
return D3DXPT_TEXTURE3D;
case HLSL_SAMPLER_DIM_CUBE:
return D3DXPT_TEXTURECUBE;
case HLSL_SAMPLER_DIM_GENERIC:
return D3DXPT_TEXTURE;
default:
ERR("Invalid dimension %#x.\n", type->sampler_dim);
vkd3d_unreachable();
}
break;
case HLSL_TYPE_VERTEXSHADER:
return D3DXPT_VERTEXSHADER;
case HLSL_TYPE_VOID:
return D3DXPT_VOID;
default: default:
ERR("Invalid dimension %#x.\n", type->sampler_dim);
vkd3d_unreachable(); vkd3d_unreachable();
} }
break;
case HLSL_TYPE_VERTEXSHADER:
return D3DXPT_VERTEXSHADER;
case HLSL_TYPE_VOID:
return D3DXPT_VOID;
default:
vkd3d_unreachable(); vkd3d_unreachable();
case HLSL_CLASS_ARRAY:
return hlsl_sm1_base_type(type->e.array.type);
case HLSL_CLASS_STRUCT:
return D3DXPT_VOID;
} }
vkd3d_unreachable();
} }
static void write_sm1_type(struct vkd3d_bytecode_buffer *buffer, struct hlsl_type *type, unsigned int ctab_start) static void write_sm1_type(struct vkd3d_bytecode_buffer *buffer, struct hlsl_type *type, unsigned int ctab_start)