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/hlsl: Make HLSL_TYPE_STRING into a separate class.

Browse Source
This commit is contained in:
Zebediah Figura
2024-02-05 20:04:02 -06:00
committed by Alexandre Julliard
parent cdcf2da2eb
commit f57db442b0
Notes: Alexandre Julliard 2024-04-19 22:26:17 +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/781
6 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1506,14 +1506,15 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type)
return D3DXPC_MATRIX_COLUMNS;
else
return D3DXPC_MATRIX_ROWS;
case HLSL_CLASS_OBJECT:
return D3DXPC_OBJECT;
case HLSL_CLASS_SCALAR:
return D3DXPC_SCALAR;
case HLSL_CLASS_STRUCT:
return D3DXPC_STRUCT;
case HLSL_CLASS_VECTOR:
return D3DXPC_VECTOR;
case HLSL_CLASS_OBJECT:
case HLSL_CLASS_STRING:
return D3DXPC_OBJECT;
case HLSL_CLASS_VOID:
break;
}
@@ -1574,8 +1575,6 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type)
vkd3d_unreachable();
}
break;
case HLSL_TYPE_STRING:
return D3DXPT_STRING;
case HLSL_TYPE_TEXTURE:
switch (type->sampler_dim)
{
@@ -1607,6 +1606,9 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type)
case HLSL_CLASS_STRUCT:
return D3DXPT_VOID;
case HLSL_CLASS_STRING:
return D3DXPT_STRING;
case HLSL_CLASS_VOID:
break;
}