From 50f046fcfc713904c220c7b417aedbd9c17ab3ab Mon Sep 17 00:00:00 2001 From: Cassandra Beckley Date: Thu, 5 Dec 2024 10:24:29 -0800 Subject: [PATCH 1/2] [SPIR-V] Update submodules Update submodules in preparation for release --- external/SPIRV-Headers | 2 +- external/SPIRV-Tools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/SPIRV-Headers b/external/SPIRV-Headers index 252dc2df08..3f17b2af67 160000 --- a/external/SPIRV-Headers +++ b/external/SPIRV-Headers @@ -1 +1 @@ -Subproject commit 252dc2df08f58e0e50c8437edc0e77eacdfb7559 +Subproject commit 3f17b2af6784bfa2c5aa5dbb8e0e74a607dd8b3b diff --git a/external/SPIRV-Tools b/external/SPIRV-Tools index 298055b25c..4d2f0b40bf 160000 --- a/external/SPIRV-Tools +++ b/external/SPIRV-Tools @@ -1 +1 @@ -Subproject commit 298055b25cab863d73a8588ce482d8e77c77b807 +Subproject commit 4d2f0b40bfe290dea6c6904dafdf7fd8328ba346 From 4eda037907956ad876ee3b8042e6c628db32d23f Mon Sep 17 00:00:00 2001 From: Cassandra Beckley Date: Thu, 5 Dec 2024 12:35:31 -0800 Subject: [PATCH 2/2] Fix broken validation --- tools/clang/lib/SPIRV/EmitVisitor.cpp | 4 ++++ .../clang/test/CodeGenSPIRV/shader.debug.line.composite.hlsl | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/clang/lib/SPIRV/EmitVisitor.cpp b/tools/clang/lib/SPIRV/EmitVisitor.cpp index 909fa193c6..468fdee4a4 100644 --- a/tools/clang/lib/SPIRV/EmitVisitor.cpp +++ b/tools/clang/lib/SPIRV/EmitVisitor.cpp @@ -385,6 +385,10 @@ void EmitVisitor::emitDebugLine(spv::Op op, const SourceLocation &loc, debugColumnEnd = columnEnd; } + if (columnEnd < columnStart) { + columnEnd = columnStart = 0; + } + curInst.clear(); if (!spvOptions.debugInfoVulkan) { curInst.push_back(static_cast(spv::Op::OpLine)); diff --git a/tools/clang/test/CodeGenSPIRV/shader.debug.line.composite.hlsl b/tools/clang/test/CodeGenSPIRV/shader.debug.line.composite.hlsl index 178833efef..03ff75e6ef 100644 --- a/tools/clang/test/CodeGenSPIRV/shader.debug.line.composite.hlsl +++ b/tools/clang/test/CodeGenSPIRV/shader.debug.line.composite.hlsl @@ -60,7 +60,7 @@ void main() { // CHECK: DebugLine [[src]] %uint_46 %uint_46 %uint_12 %uint_12 // CHECK-NEXT: OpConvertFToS %int // CHECK-NEXT: OpConvertFToS %int -// CHECK: DebugLine [[src]] %uint_46 %uint_65 %uint_12 %uint_3 +// CHECK: DebugLine [[src]] %uint_46 %uint_65 %uint_0 %uint_0 // CHECK: OpCompositeConstruct %v4int };