From 1b643eac5d4062bbec48b912a1332e6909802479 Mon Sep 17 00:00:00 2001 From: Spencer Fricke <115671160+spencer-lunarg@users.noreply.github.com> Date: Thu, 22 Feb 2024 07:52:13 +0900 Subject: spirv-val: Make Constant evaluation consistent (#5587) Bring 64-bit evaluation in line with 32-bit evaluation. --- source/val/validate_image.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/val/validate_image.cpp') diff --git a/source/val/validate_image.cpp b/source/val/validate_image.cpp index 46a32f24..543f345e 100644 --- a/source/val/validate_image.cpp +++ b/source/val/validate_image.cpp @@ -495,7 +495,7 @@ spv_result_t ValidateImageOperands(ValidationState_t& _, } uint64_t array_size = 0; - if (!_.GetConstantValUint64(type_inst->word(3), &array_size)) { + if (!_.EvalConstantValUint64(type_inst->word(3), &array_size)) { assert(0 && "Array type definition is corrupt"); } @@ -1210,7 +1210,7 @@ spv_result_t ValidateImageTexelPointer(ValidationState_t& _, if (info.multisampled == 0) { uint64_t ms = 0; - if (!_.GetConstantValUint64(inst->GetOperandAs(4), &ms) || + if (!_.EvalConstantValUint64(inst->GetOperandAs(4), &ms) || ms != 0) { return _.diag(SPV_ERROR_INVALID_DATA, inst) << "Expected Sample for Image with MS 0 to be a valid for " -- cgit v1.2.3