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/ir: Introduce a helper for validating DCL_TESSELLATOR_OUTPUT_PRIMITIVE.

Browse Source
This commit is contained in:
Giovanni Mascellani
2024-09-12 12:18:27 +02:00
committed by Henri Verbeet
parent 48f512a83a
commit a3c7bebc18
Notes: Henri Verbeet 2024-09-16 19:36:47 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1077
1 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libs/vkd3d-shader/ir.c
View File

@@ -6265,6 +6265,17 @@ static void vsir_validate_dcl_tessellator_domain(struct validation_context *ctx,
"Tessellator domain %#x is invalid.", instruction->declaration.tessellator_domain); "Tessellator domain %#x is invalid.", instruction->declaration.tessellator_domain);
} }
static void vsir_validate_dcl_tessellator_output_primitive(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction)
{
if (!instruction->declaration.tessellator_output_primitive
|| instruction->declaration.tessellator_output_primitive
> VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_TESSELLATION,
"Tessellator output primitive %#x is invalid.",
instruction->declaration.tessellator_output_primitive);
}
static void vsir_validate_dcl_vertices_out(struct validation_context *ctx, static void vsir_validate_dcl_vertices_out(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction) const struct vkd3d_shader_instruction *instruction)
{ {
@@ -6504,6 +6515,7 @@ static const struct vsir_validator_instruction_desc vsir_validator_instructions[
[VKD3DSIH_DCL_OUTPUT_TOPOLOGY] = {0, 0, vsir_validate_dcl_output_topology}, [VKD3DSIH_DCL_OUTPUT_TOPOLOGY] = {0, 0, vsir_validate_dcl_output_topology},
[VKD3DSIH_DCL_TEMPS] = {0, 0, vsir_validate_dcl_temps}, [VKD3DSIH_DCL_TEMPS] = {0, 0, vsir_validate_dcl_temps},
[VKD3DSIH_DCL_TESSELLATOR_DOMAIN] = {0, 0, vsir_validate_dcl_tessellator_domain}, [VKD3DSIH_DCL_TESSELLATOR_DOMAIN] = {0, 0, vsir_validate_dcl_tessellator_domain},
[VKD3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE] = {0, 0, vsir_validate_dcl_tessellator_output_primitive},
[VKD3DSIH_DCL_VERTICES_OUT] = {0, 0, vsir_validate_dcl_vertices_out}, [VKD3DSIH_DCL_VERTICES_OUT] = {0, 0, vsir_validate_dcl_vertices_out},
[VKD3DSIH_ELSE] = {0, 0, vsir_validate_else}, [VKD3DSIH_ELSE] = {0, 0, vsir_validate_else},
[VKD3DSIH_ENDIF] = {0, 0, vsir_validate_endif}, [VKD3DSIH_ENDIF] = {0, 0, vsir_validate_endif},
@@ -6562,13 +6574,6 @@ static void vsir_validate_instruction(struct validation_context *ctx)
ctx->dcl_temps_found = false; ctx->dcl_temps_found = false;
return; return;
case VKD3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE:
if (!instruction->declaration.tessellator_output_primitive
|| instruction->declaration.tessellator_output_primitive > VKD3D_SHADER_TESSELLATOR_OUTPUT_TRIANGLE_CCW)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_TESSELLATION,
"Tessellator output primitive %#x is invalid.", instruction->declaration.tessellator_output_primitive);
return;
case VKD3DSIH_DCL_TESSELLATOR_PARTITIONING: case VKD3DSIH_DCL_TESSELLATOR_PARTITIONING:
if (!instruction->declaration.tessellator_partitioning if (!instruction->declaration.tessellator_partitioning
|| instruction->declaration.tessellator_partitioning > VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN) || instruction->declaration.tessellator_partitioning > VKD3D_SHADER_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN)