Merge branch 'master' into aleino/new-api-invalid-cuda-code-bug

aleino-nv · web-flow · commit 6024f2aedb30 · 2025-03-05T07:56:08.000+02:00
diff --git a/source/slang/slang-compiler-options.cpp b/source/slang/slang-compiler-options.cpp
@@ -347,7 +347,7 @@ void CompilerOptionSet::serialize(SerializedOptionsData* outData)
             outData->stringPool.add(val.stringValue);
             entry.value.stringValue0 = val.stringValue.getBuffer();
             outData->stringPool.add(val.stringValue2);
-            entry.value.stringValue1 = val.stringValue.getBuffer();
+            entry.value.stringValue1 = val.stringValue2.getBuffer();
             outData->entries.add(entry);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ void CompilerOptionSet::serialize(SerializedOptionsData* outData)`
`347`	`347`	`outData->stringPool.add(val.stringValue);`
`348`	`348`	`entry.value.stringValue0 = val.stringValue.getBuffer();`
`349`	`349`	`outData->stringPool.add(val.stringValue2);`
`350`		`- entry.value.stringValue1 = val.stringValue.getBuffer();`
	`350`	`+ entry.value.stringValue1 = val.stringValue2.getBuffer();`
`351`	`351`	`outData->entries.add(entry);`
`352`	`352`	`}`
`353`	`353`	`}`