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: Rename VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER to VKD3D_SHADER_ERROR_VSIR_INVALID_OPCODE.

Browse Source 
Following the way it is currently called in the code.
This commit is contained in:
Giovanni Mascellani
2025-05-29 20:54:35 +02:00
committed by Henri Verbeet
parent c3c36d8517
commit bf92190924
Notes: Henri Verbeet 2025-06-16 17:48:55 +02:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1569
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9273,7 +9273,7 @@ static void vsir_validate_hull_shader_phase(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction) const struct vkd3d_shader_instruction *instruction)
{ {
if (ctx->program->shader_version.type != VKD3D_SHADER_TYPE_HULL) if (ctx->program->shader_version.type != VKD3D_SHADER_TYPE_HULL)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_OPCODE,
"Phase instruction \"%s\" (%#x) is only valid in a hull shader.", "Phase instruction \"%s\" (%#x) is only valid in a hull shader.",
vsir_opcode_get_name(instruction->opcode, "<unknown>"), instruction->opcode); vsir_opcode_get_name(instruction->opcode, "<unknown>"), instruction->opcode);
if (ctx->depth != 0) if (ctx->depth != 0)
@@ -9359,7 +9359,7 @@ static void vsir_validate_dcl_index_range(struct validation_context *ctx,
if (ctx->program->normalisation_level >= VSIR_NORMALISED_SM6) if (ctx->program->normalisation_level >= VSIR_NORMALISED_SM6)
{ {
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_OPCODE,
"DCL_INDEX_RANGE is not allowed with fully normalised input/output."); "DCL_INDEX_RANGE is not allowed with fully normalised input/output.");
return; return;
} }
@@ -10026,8 +10026,8 @@ static void vsir_validate_instruction(struct validation_context *ctx)
if (instruction->opcode >= VKD3DSIH_INVALID) if (instruction->opcode >= VKD3DSIH_INVALID)
{ {
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER, "Invalid instruction handler %#x.", validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_OPCODE,
instruction->opcode); "Invalid opcode %#x.", instruction->opcode);
} }
if (version->type == VKD3D_SHADER_TYPE_HULL && ctx->phase == VKD3DSIH_INVALID) if (version->type == VKD3D_SHADER_TYPE_HULL && ctx->phase == VKD3DSIH_INVALID)
@@ -10043,7 +10043,7 @@ static void vsir_validate_instruction(struct validation_context *ctx)
default: default:
if (!vsir_instruction_is_dcl(instruction)) if (!vsir_instruction_is_dcl(instruction))
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_OPCODE,
"Instruction \"%s\" (%#x) appears before any phase instruction in a hull shader.", "Instruction \"%s\" (%#x) appears before any phase instruction in a hull shader.",
vsir_opcode_get_name(instruction->opcode, "<unknown>"), instruction->opcode); vsir_opcode_get_name(instruction->opcode, "<unknown>"), instruction->opcode);
break; break;

2
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@@ -238,7 +238,7 @@ enum vkd3d_shader_error
VKD3D_SHADER_WARNING_DXIL_UNDEFINED_OPERAND = 8310, VKD3D_SHADER_WARNING_DXIL_UNDEFINED_OPERAND = 8310,
VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED = 9000, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED = 9000,
VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER = 9001, VKD3D_SHADER_ERROR_VSIR_INVALID_OPCODE = 9001,
VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE = 9002, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE = 9002,
VKD3D_SHADER_ERROR_VSIR_INVALID_WRITE_MASK = 9003, VKD3D_SHADER_ERROR_VSIR_INVALID_WRITE_MASK = 9003,
VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS = 9004, VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS = 9004,