AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2216 from KhronosGroup/buffer-reference-2

Browse Source 
GLSL: Use buffer_reference2 instead of 1.
This commit is contained in:
Hans-Kristian Arntzen 2023-10-11 14:20:36 +02:00 committed by GitHub
commit 724433d729
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reference/opt/shaders/vulkan/comp/array-of-buffer-reference.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer Block; layout(buffer_reference) buffer Block;

2
reference/opt/shaders/vulkan/comp/buffer-reference-atomic.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer Bar; layout(buffer_reference) buffer Bar;

2
reference/opt/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer Bar; layout(buffer_reference) buffer Bar;

2
reference/opt/shaders/vulkan/comp/buffer-reference-bitcast-uvec2-2.nocompat.invalid.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #version 450
#extension GL_EXT_buffer_reference : require #extension GL_EXT_buffer_reference2 : require
#extension GL_EXT_buffer_reference_uvec2 : require #extension GL_EXT_buffer_reference_uvec2 : require
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;

2
reference/opt/shaders/vulkan/comp/buffer-reference-bitcast-uvec2.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #version 450
#extension GL_EXT_buffer_reference : require #extension GL_EXT_buffer_reference2 : require
#extension GL_EXT_buffer_reference_uvec2 : require #extension GL_EXT_buffer_reference_uvec2 : require
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;

2
reference/opt/shaders/vulkan/comp/buffer-reference-bitcast.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer PtrUint; layout(buffer_reference) buffer PtrUint;

2
reference/opt/shaders/vulkan/comp/buffer-reference-decorations.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer RO; layout(buffer_reference) buffer RO;

2
reference/opt/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk
View File

@ -4,7 +4,7 @@
#else #else
#error No extension available for 64-bit integers. #error No extension available for 64-bit integers.
#endif #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer Node; layout(buffer_reference) buffer Node;

2
reference/shaders-no-opt/asm/comp/bda-to-array-in-buffer.asm.spv16.nocompat.vk.comp.vk
View File

@ -6,7 +6,7 @@
#else #else
#error No extension available for 64-bit integers. #error No extension available for 64-bit integers.
#endif #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(local_size_x = 16, local_size_y = 16, local_size_z = 1) in;
layout(buffer_reference) buffer uint8_tPointer layout(buffer_reference) buffer uint8_tPointer

2
reference/shaders-no-opt/asm/comp/buffer-device-address-ptr-casting.vk.nocompat.asm.comp.vk
View File

@ -4,7 +4,7 @@
#else #else
#error No extension available for 64-bit integers. #error No extension available for 64-bit integers.
#endif #endif
#extension GL_EXT_buffer_reference : require #extension GL_EXT_buffer_reference2 : require
#extension GL_EXT_buffer_reference_uvec2 : require #extension GL_EXT_buffer_reference_uvec2 : require
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;

2
reference/shaders-no-opt/asm/comp/buffer-reference-aliased-block-name.nocompat.vk.asm.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer Alias; layout(buffer_reference) buffer Alias;

2
reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-pod-in-buffer.asm.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference, buffer_reference_align = 8) buffer uvec4Pointer layout(buffer_reference, buffer_reference_align = 8) buffer uvec4Pointer

2
reference/shaders-no-opt/asm/comp/buffer-reference-pointer-to-unused-pod-in-buffer.asm.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer uvec4Pointer layout(buffer_reference) buffer uvec4Pointer

2
reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer-2.asm.nocompat.vk.comp.vk
View File

@ -4,7 +4,7 @@
#else #else
#error No extension available for 64-bit integers. #error No extension available for 64-bit integers.
#endif #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference, buffer_reference_align = 4) buffer uintPointer layout(buffer_reference, buffer_reference_align = 4) buffer uintPointer

2
reference/shaders-no-opt/asm/comp/buffer-reference-synthesized-pointer.asm.nocompat.vk.comp.vk
View File

@ -4,7 +4,7 @@
#else #else
#error No extension available for 64-bit integers. #error No extension available for 64-bit integers.
#endif #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference, buffer_reference_align = 4) buffer uint0_Pointer layout(buffer_reference, buffer_reference_align = 4) buffer uint0_Pointer

2
reference/shaders-no-opt/asm/comp/nonuniform-bracket-handling.vk.nocompat.asm.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #version 450
#extension GL_EXT_buffer_reference : require #extension GL_EXT_buffer_reference2 : require
#extension GL_EXT_nonuniform_qualifier : require #extension GL_EXT_nonuniform_qualifier : require
#extension GL_KHR_shader_subgroup_ballot : require #extension GL_KHR_shader_subgroup_ballot : require
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;

2
reference/shaders/vulkan/comp/array-of-buffer-reference.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer Block; layout(buffer_reference) buffer Block;

2
reference/shaders/vulkan/comp/buffer-reference-atomic.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer Bar; layout(buffer_reference) buffer Bar;

2
reference/shaders/vulkan/comp/buffer-reference-base-alignment-promote.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer Bar; layout(buffer_reference) buffer Bar;

2
reference/shaders/vulkan/comp/buffer-reference-bitcast-uvec2-2.nocompat.invalid.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #version 450
#extension GL_EXT_buffer_reference : require #extension GL_EXT_buffer_reference2 : require
#extension GL_EXT_buffer_reference_uvec2 : require #extension GL_EXT_buffer_reference_uvec2 : require
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;

2
reference/shaders/vulkan/comp/buffer-reference-bitcast-uvec2.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #version 450
#extension GL_EXT_buffer_reference : require #extension GL_EXT_buffer_reference2 : require
#extension GL_EXT_buffer_reference_uvec2 : require #extension GL_EXT_buffer_reference_uvec2 : require
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;

2
reference/shaders/vulkan/comp/buffer-reference-bitcast.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer PtrUint; layout(buffer_reference) buffer PtrUint;

2
reference/shaders/vulkan/comp/buffer-reference-decorations.nocompat.vk.comp.vk
View File

@ -1,5 +1,5 @@
#version 450 #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(local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer RO; layout(buffer_reference) buffer RO;

2
reference/shaders/vulkan/comp/buffer-reference.nocompat.vk.comp.vk
View File

@ -4,7 +4,7 @@
#else #else
#error No extension available for 64-bit integers. #error No extension available for 64-bit integers.
#endif #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(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(buffer_reference) buffer Node; layout(buffer_reference) buffer Node;

2
spirv_glsl.cpp
View File

@ -553,7 +553,7 @@ void CompilerGLSL::find_static_extensions()
SPIRV_CROSS_THROW("GL_EXT_buffer_reference requires ESSL 320."); SPIRV_CROSS_THROW("GL_EXT_buffer_reference requires ESSL 320.");
else if (!options.es && options.version < 450) else if (!options.es && options.version < 450)
SPIRV_CROSS_THROW("GL_EXT_buffer_reference requires GLSL 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) else if (ir.addressing_model != AddressingModelLogical)
{ {