diff options
| author | Hans-Kristian Arntzen <post@arntzen-software.no> | 2023-10-11 14:20:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-11 14:20:36 +0200 |
| commit | 724433d72925f54682ae637c8bc4f4b7e83c4409 (patch) | |
| tree | 487bfd2856a6e20b397cdfda31387736bf17b28c | |
| parent | 082b1df25f0483c0354cab38da99bb044123b57c (diff) | |
| parent | 255ff2b19c3f48e4d8107d40cb1f35f758455bfe (diff) | |
| download | SPIRV-Cross-724433d72925f54682ae637c8bc4f4b7e83c4409.tar.gz SPIRV-Cross-724433d72925f54682ae637c8bc4f4b7e83c4409.tar.bz2 SPIRV-Cross-724433d72925f54682ae637c8bc4f4b7e83c4409.zip | |
Merge pull request #2216 from KhronosGroup/buffer-reference-2
GLSL: Use buffer_reference2 instead of 1.
25 files changed, 25 insertions, 25 deletions
diff --git a/reference/opt/shaders/vulkan/comp/array-of-buffer-reference.nocompat.vk.comp.vk b/reference/opt/shaders/vulkan/comp/array-of-buffer-reference.nocompat.vk.comp.vk index 771d0496..a76f8ccb 100644 --- a/reference/opt/shaders/vulkan/comp/array-of-buffer-reference.nocompat.vk.comp.vk +++ b/reference/opt/shaders/vulkan/comp/array-of-buffer-reference.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer Block; diff --git a/reference/opt/shaders/vulkan/comp/buffer-reference-atomic.nocompat.vk.comp.vk b/reference/opt/shaders/vulkan/comp/buffer-reference-atomic.nocompat.vk.comp.vk index f5907d3e..c9b2bbcf 100644 --- a/reference/opt/shaders/vulkan/comp/buffer-reference-atomic.nocompat.vk.comp.vk +++ b/reference/opt/shaders/vulkan/comp/buffer-reference-atomic.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer Bar; diff --git a/reference/opt/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk b/reference/opt/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk index 1808beec..d1222227 100644 --- a/reference/opt/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk +++ b/reference/opt/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer Bar; diff --git a/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast-uvec2-2.nocompat.invalid.vk.comp.vk b/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast-uvec2-2.nocompat.invalid.vk.comp.vk index 20a4f1b4..835eae41 100644 --- a/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast-uvec2-2.nocompat.invalid.vk.comp.vk +++ b/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast-uvec2-2.nocompat.invalid.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require #extension GL_EXT_buffer_reference_uvec2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; diff --git a/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast-uvec2.nocompat.vk.comp.vk b/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast-uvec2.nocompat.vk.comp.vk index 5cf6e2df..b99ace3f 100644 --- a/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast-uvec2.nocompat.vk.comp.vk +++ b/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast-uvec2.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require #extension GL_EXT_buffer_reference_uvec2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; diff --git a/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast.nocompat.vk.comp.vk b/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast.nocompat.vk.comp.vk index 8923d21d..4b59857a 100644 --- a/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast.nocompat.vk.comp.vk +++ b/reference/opt/shaders/vulkan/comp/buffer-reference-bitcast.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer PtrUint; diff --git a/reference/opt/shaders/vulkan/comp/buffer-reference-decorations.nocompat.vk.comp.vk b/reference/opt/shaders/vulkan/comp/buffer-reference-decorations.nocompat.vk.comp.vk index b7e88062..92a8bcb1 100644 --- a/reference/opt/shaders/vulkan/comp/buffer-reference-decorations.nocompat.vk.comp.vk +++ b/reference/opt/shaders/vulkan/comp/buffer-reference-decorations.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer RO; diff --git a/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk b/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk index c3855cf6..8080b701 100644 --- a/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk +++ b/reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk @@ -4,7 +4,7 @@ #else #error No extension available for 64-bit integers. #endif -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer Node; diff --git a/reference/shaders-no-opt/asm/comp/bda-to-array-in-buffer.asm.spv16.nocompat.vk.comp.vk b/reference/shaders-no-opt/asm/comp/bda-to-array-in-buffer.asm.spv16.nocompat.vk.comp.vk index dfb8e318..d019502c 100644 --- a/reference/shaders-no-opt/asm/comp/bda-to-array-in-buffer.asm.spv16.nocompat.vk.comp.vk +++ b/reference/shaders-no-opt/asm/comp/bda-to-array-in-buffer.asm.spv16.nocompat.vk.comp.vk @@ -6,7 +6,7 @@ #else #error No extension available for 64-bit integers. #endif -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 16, local_size_y = 16, local_size_z = 1) in; layout(buffer_reference) buffer uint8_tPointer diff --git a/reference/shaders-no-opt/asm/comp/buffer-device-address-ptr-casting.vk.nocompat.asm.comp.vk b/reference/shaders-no-opt/asm/comp/buffer-device-address-ptr-casting.vk.nocompat.asm.comp.vk index f082267f..cf611803 100644 --- a/reference/shaders-no-opt/asm/comp/buffer-device-address-ptr-casting.vk.nocompat.asm.comp.vk +++ b/reference/shaders-no-opt/asm/comp/buffer-device-address-ptr-casting.vk.nocompat.asm.comp.vk @@ -4,7 +4,7 @@ #else #error No extension available for 64-bit integers. #endif -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require #extension GL_EXT_buffer_reference_uvec2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; diff --git a/reference/shaders-no-opt/asm/comp/buffer-reference-aliased-block-name.nocompat.vk.asm.comp.vk b/reference/shaders-no-opt/asm/comp/buffer-reference-aliased-block-name.nocompat.vk.asm.comp.vk index 77865787..9fbe0f8e 100644 --- a/reference/shaders-no-opt/asm/comp/buffer-reference-aliased-block-name.nocompat.vk.asm.comp.vk +++ b/reference/shaders-no-opt/asm/comp/buffer-reference-aliased-block-name.nocompat.vk.asm.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer Alias; diff --git a/reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-pod-in-buffer.asm.nocompat.vk.comp.vk b/reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-pod-in-buffer.asm.nocompat.vk.comp.vk index ea958acb..505ac69e 100644 --- a/reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-pod-in-buffer.asm.nocompat.vk.comp.vk +++ b/reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-pod-in-buffer.asm.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference, buffer_reference_align = 8) buffer uvec4Pointer diff --git a/reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-unused-pod-in-buffer.asm.nocompat.vk.comp.vk b/reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-unused-pod-in-buffer.asm.nocompat.vk.comp.vk index 44427de8..1723b83b 100644 --- a/reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-unused-pod-in-buffer.asm.nocompat.vk.comp.vk +++ b/reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-unused-pod-in-buffer.asm.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer uvec4Pointer diff --git a/reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer-2.asm.nocompat.vk.comp.vk b/reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer-2.asm.nocompat.vk.comp.vk index 37940a1e..ea58e71d 100644 --- a/reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer-2.asm.nocompat.vk.comp.vk +++ b/reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer-2.asm.nocompat.vk.comp.vk @@ -4,7 +4,7 @@ #else #error No extension available for 64-bit integers. #endif -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference, buffer_reference_align = 4) buffer uintPointer diff --git a/reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer.asm.nocompat.vk.comp.vk b/reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer.asm.nocompat.vk.comp.vk index 4062e70e..9f21b9ff 100644 --- a/reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer.asm.nocompat.vk.comp.vk +++ b/reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer.asm.nocompat.vk.comp.vk @@ -4,7 +4,7 @@ #else #error No extension available for 64-bit integers. #endif -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference, buffer_reference_align = 4) buffer uint0_Pointer diff --git a/reference/shaders-no-opt/asm/comp/nonuniform-bracket-handling.vk.nocompat.asm.comp.vk b/reference/shaders-no-opt/asm/comp/nonuniform-bracket-handling.vk.nocompat.asm.comp.vk index bd7dcf0e..fdc65be2 100644 --- a/reference/shaders-no-opt/asm/comp/nonuniform-bracket-handling.vk.nocompat.asm.comp.vk +++ b/reference/shaders-no-opt/asm/comp/nonuniform-bracket-handling.vk.nocompat.asm.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require #extension GL_EXT_nonuniform_qualifier : require #extension GL_KHR_shader_subgroup_ballot : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; diff --git a/reference/shaders/vulkan/comp/array-of-buffer-reference.nocompat.vk.comp.vk b/reference/shaders/vulkan/comp/array-of-buffer-reference.nocompat.vk.comp.vk index 771d0496..a76f8ccb 100644 --- a/reference/shaders/vulkan/comp/array-of-buffer-reference.nocompat.vk.comp.vk +++ b/reference/shaders/vulkan/comp/array-of-buffer-reference.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer Block; diff --git a/reference/shaders/vulkan/comp/buffer-reference-atomic.nocompat.vk.comp.vk b/reference/shaders/vulkan/comp/buffer-reference-atomic.nocompat.vk.comp.vk index f5907d3e..c9b2bbcf 100644 --- a/reference/shaders/vulkan/comp/buffer-reference-atomic.nocompat.vk.comp.vk +++ b/reference/shaders/vulkan/comp/buffer-reference-atomic.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer Bar; diff --git a/reference/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk b/reference/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk index 9cd3d3e5..c63618fc 100644 --- a/reference/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk +++ b/reference/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer Bar; diff --git a/reference/shaders/vulkan/comp/buffer-reference-bitcast-uvec2-2.nocompat.invalid.vk.comp.vk b/reference/shaders/vulkan/comp/buffer-reference-bitcast-uvec2-2.nocompat.invalid.vk.comp.vk index 20a4f1b4..835eae41 100644 --- a/reference/shaders/vulkan/comp/buffer-reference-bitcast-uvec2-2.nocompat.invalid.vk.comp.vk +++ b/reference/shaders/vulkan/comp/buffer-reference-bitcast-uvec2-2.nocompat.invalid.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require #extension GL_EXT_buffer_reference_uvec2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; diff --git a/reference/shaders/vulkan/comp/buffer-reference-bitcast-uvec2.nocompat.vk.comp.vk b/reference/shaders/vulkan/comp/buffer-reference-bitcast-uvec2.nocompat.vk.comp.vk index 5cf6e2df..b99ace3f 100644 --- a/reference/shaders/vulkan/comp/buffer-reference-bitcast-uvec2.nocompat.vk.comp.vk +++ b/reference/shaders/vulkan/comp/buffer-reference-bitcast-uvec2.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require #extension GL_EXT_buffer_reference_uvec2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; diff --git a/reference/shaders/vulkan/comp/buffer-reference-bitcast.nocompat.vk.comp.vk b/reference/shaders/vulkan/comp/buffer-reference-bitcast.nocompat.vk.comp.vk index 8923d21d..4b59857a 100644 --- a/reference/shaders/vulkan/comp/buffer-reference-bitcast.nocompat.vk.comp.vk +++ b/reference/shaders/vulkan/comp/buffer-reference-bitcast.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer PtrUint; diff --git a/reference/shaders/vulkan/comp/buffer-reference-decorations.nocompat.vk.comp.vk b/reference/shaders/vulkan/comp/buffer-reference-decorations.nocompat.vk.comp.vk index b7e88062..92a8bcb1 100644 --- a/reference/shaders/vulkan/comp/buffer-reference-decorations.nocompat.vk.comp.vk +++ b/reference/shaders/vulkan/comp/buffer-reference-decorations.nocompat.vk.comp.vk @@ -1,5 +1,5 @@ #version 450 -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer RO; diff --git a/reference/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk b/reference/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk index 241483ed..48071fcc 100644 --- a/reference/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk +++ b/reference/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk @@ -4,7 +4,7 @@ #else #error No extension available for 64-bit integers. #endif -#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(buffer_reference) buffer Node; diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp index 6fac25d8..3499dead 100644 --- a/spirv_glsl.cpp +++ b/spirv_glsl.cpp @@ -553,7 +553,7 @@ void CompilerGLSL::find_static_extensions() SPIRV_CROSS_THROW("GL_EXT_buffer_reference requires ESSL 320."); else if (!options.es && options.version < 450) SPIRV_CROSS_THROW("GL_EXT_buffer_reference requires GLSL 450."); - require_extension_internal("GL_EXT_buffer_reference"); + require_extension_internal("GL_EXT_buffer_reference2"); } else if (ir.addressing_model != AddressingModelLogical) { |