diff options
| author | Hans-Kristian Arntzen <post@arntzen-software.no> | 2019-01-30 15:31:17 +0300 |
|---|---|---|
| committer | Hans-Kristian Arntzen <post@arntzen-software.no> | 2019-01-30 15:41:57 +0300 |
| commit | 4e7777c4433be8f5ee61d5c955cfe6aa41e06b92 (patch) | |
| tree | fe72eee244e4e66051eee84e32f4467ecc9f8814 /shaders | |
| parent | 88041522533d72b107ab43a3b017ec1b6d440571 (diff) | |
Update to latest glslang/SPIRV-Tools.
Fix various bugs along the way.
Diffstat (limited to 'shaders')
| -rw-r--r-- | shaders/asm/comp/hlsl-functionality.asm.comp | 1 | ||||
| -rw-r--r-- | shaders/asm/comp/multiple-entry.asm.comp | 1 | ||||
| -rw-r--r-- | shaders/asm/frag/default-member-names.asm.frag | 2 | ||||
| -rw-r--r-- | shaders/asm/frag/locations-components.asm.frag | 1 | ||||
| -rw-r--r-- | shaders/asm/frag/temporary-phi-hoisting.asm.frag | 1 |
5 files changed, 5 insertions, 1 deletions
diff --git a/shaders/asm/comp/hlsl-functionality.asm.comp b/shaders/asm/comp/hlsl-functionality.asm.comp index dfdcb454..d4311139 100644 --- a/shaders/asm/comp/hlsl-functionality.asm.comp +++ b/shaders/asm/comp/hlsl-functionality.asm.comp @@ -26,6 +26,7 @@ OpMemberDecorate %Buf_count 0 Offset 0 OpDecorate %Buf_count BufferBlock OpDecorate %Buf_count_0 DescriptorSet 0 + OpDecorate %Buf_count_0 Binding 1 OpDecorateId %Buf_0 HlslCounterBufferGOOGLE %Buf_count_0 %void = OpTypeVoid %3 = OpTypeFunction %void diff --git a/shaders/asm/comp/multiple-entry.asm.comp b/shaders/asm/comp/multiple-entry.asm.comp index 0cfb5543..9ddc07bc 100644 --- a/shaders/asm/comp/multiple-entry.asm.comp +++ b/shaders/asm/comp/multiple-entry.asm.comp @@ -9,6 +9,7 @@ OpEntryPoint Fragment %func_alt "main2" %frag_in %frag_out OpEntryPoint GLCompute %func "main" OpExecutionMode %func LocalSize 1 1 1 + OpExecutionMode %func_alt OriginUpperLeft OpSource ESSL 310 OpSourceExtension "GL_GOOGLE_cpp_style_line_directive" OpSourceExtension "GL_GOOGLE_include_directive" diff --git a/shaders/asm/frag/default-member-names.asm.frag b/shaders/asm/frag/default-member-names.asm.frag index 4d616fe4..ba493c0f 100644 --- a/shaders/asm/frag/default-member-names.asm.frag +++ b/shaders/asm/frag/default-member-names.asm.frag @@ -7,7 +7,7 @@ %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 OpEntryPoint Fragment %2 "main" %3 - OpExecutionMode %2 OriginLowerLeft + OpExecutionMode %2 OriginUpperLeft OpDecorate %3 Location 0 %void = OpTypeVoid %9 = OpTypeFunction %void diff --git a/shaders/asm/frag/locations-components.asm.frag b/shaders/asm/frag/locations-components.asm.frag index bf8c6a69..16bfc525 100644 --- a/shaders/asm/frag/locations-components.asm.frag +++ b/shaders/asm/frag/locations-components.asm.frag @@ -6,6 +6,7 @@ OpCapability Shader OpMemoryModel Logical GLSL450 OpEntryPoint Fragment %main "main" %8 %16 %22 %28 %33 %o0 + OpExecutionMode %main OriginUpperLeft OpName %main "main" OpName %v1 "v1" OpName %v2 "v2" diff --git a/shaders/asm/frag/temporary-phi-hoisting.asm.frag b/shaders/asm/frag/temporary-phi-hoisting.asm.frag index 7cedcd58..977c20ac 100644 --- a/shaders/asm/frag/temporary-phi-hoisting.asm.frag +++ b/shaders/asm/frag/temporary-phi-hoisting.asm.frag @@ -21,6 +21,7 @@ OpMemberDecorate %MyStruct_CB 0 Offset 0 OpDecorate %MyStruct_CB Block OpDecorate %_ DescriptorSet 0 + OpDecorate %_ Binding 0 OpDecorate %_entryPointOutput Location 0 %void = OpTypeVoid %3 = OpTypeFunction %void |