Просмотр исходного кода

[spirv] spirv-val scalar-block-layout for dx/scalar layout (#2473)

If -fvk-use-dx-layout or -fvk-use-scalar-layout option is given,
we use dx or scalar memory layout that must follow
scalarBlockLayout feature of Vulkan memory layout rule. This commit
lets dx/scalar layout use SPIR-V validator with
--scalar-block-layout option.
Jaebaek Seo 6 лет назад
Родитель
Сommit
625458a625
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      tools/clang/lib/SPIRV/SpirvEmitter.cpp

+ 1 - 1
tools/clang/lib/SPIRV/SpirvEmitter.cpp

@@ -210,7 +210,7 @@ bool spirvToolsValidate(spv_target_env env, const SpirvCodeGenOptions &opts,
   // VK: relaxed block layout rules
   // VK: relaxed block layout rules
   // DX: Skip block layout rules
   // DX: Skip block layout rules
   if (opts.useScalarLayout || opts.useDxLayout) {
   if (opts.useScalarLayout || opts.useDxLayout) {
-    options.SetSkipBlockLayout(true);
+    options.SetScalarBlockLayout(true);
   } else if (opts.useGlLayout) {
   } else if (opts.useGlLayout) {
     // spirv-val by default checks this.
     // spirv-val by default checks this.
   } else {
   } else {