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_PIXELSHADER into a separate class.

Browse Source
This commit is contained in:
Zebediah Figura
2024-02-06 19:41:15 -06:00
committed by Alexandre Julliard
parent 874937dab4
commit d9f7a88329
Notes: Alexandre Julliard 2024-05-06 22:37:26 +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/831
6 changed files with 23 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1514,7 +1514,7 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type)
return D3DXPC_STRUCT;
case HLSL_CLASS_VECTOR:
return D3DXPC_VECTOR;
case HLSL_CLASS_OBJECT:
case HLSL_CLASS_PIXEL_SHADER:
case HLSL_CLASS_SAMPLER:
case HLSL_CLASS_STRING:
case HLSL_CLASS_TEXTURE:
@@ -1601,16 +1601,6 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type)
}
break;
case HLSL_CLASS_OBJECT:
switch (type->base_type)
{
case HLSL_TYPE_PIXELSHADER:
return D3DXPT_PIXELSHADER;
default:
vkd3d_unreachable();
}
vkd3d_unreachable();
case HLSL_CLASS_ARRAY:
return hlsl_sm1_base_type(type->e.array.type);
@@ -1620,6 +1610,9 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type)
case HLSL_CLASS_STRING:
return D3DXPT_STRING;
case HLSL_CLASS_PIXEL_SHADER:
return D3DXPT_PIXELSHADER;
case HLSL_CLASS_VERTEX_SHADER:
return D3DXPT_VERTEXSHADER;