diff options
| author | Spencer Fricke <115671160+spencer-lunarg@users.noreply.github.com> | 2024-02-22 07:52:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-21 17:52:13 -0500 |
| commit | 1b643eac5d4062bbec48b912a1332e6909802479 (patch) | |
| tree | 05264183273afe3fac8ceca4a4e138ad346e71d1 /source/val/validate_image.cpp | |
| parent | dc6676445be97ab19d8191fee019af62e2aaf774 (diff) | |
| download | SPIRV-Tools-1b643eac5d4062bbec48b912a1332e6909802479.tar.gz | |
spirv-val: Make Constant evaluation consistent (#5587)
Bring 64-bit evaluation in line with 32-bit evaluation.
Diffstat (limited to 'source/val/validate_image.cpp')
| -rw-r--r-- | source/val/validate_image.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<uint32_t>(4), &ms) || + if (!_.EvalConstantValUint64(inst->GetOperandAs<uint32_t>(4), &ms) || ms != 0) { return _.diag(SPV_ERROR_INVALID_DATA, inst) << "Expected Sample for Image with MS 0 to be a valid <id> for " |