tests/shader-runner: Separate resource_type into type and dimension.

If in the same shader_test file we have both a [buffer uav n] and a
[uav n] with the same slot "n", we want the last one to override the
first one instead of passing both resources to the backends.

Same for [buffer srv n] and [texture n] after we introduce SRV buffers.
This commit is contained in:
Francisco Casas
2024-01-22 20:20:18 -03:00
committed by Alexandre Julliard
parent e1c759e1c9
commit 22a0f14a2f
Notes: Alexandre Julliard 2024-02-19 22:59:16 +01:00
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/569
7 changed files with 351 additions and 289 deletions

View File

@@ -69,14 +69,20 @@ enum resource_type
RESOURCE_TYPE_RENDER_TARGET,
RESOURCE_TYPE_TEXTURE,
RESOURCE_TYPE_UAV,
RESOURCE_TYPE_BUFFER_UAV,
RESOURCE_TYPE_VERTEX_BUFFER,
};
enum resource_dimension
{
RESOURCE_DIMENSION_BUFFER,
RESOURCE_DIMENSION_2D,
};
struct resource_params
{
unsigned int slot;
enum resource_type type;
enum resource_dimension dimension;
DXGI_FORMAT format;
enum texture_data_type data_type;
@@ -91,6 +97,7 @@ struct resource
{
unsigned int slot;
enum resource_type type;
enum resource_dimension dimension;
DXGI_FORMAT format;
unsigned int size;