Merge pull request #2216 from KhronosGroup/buffer-reference-2
GLSL: Use buffer_reference2 instead of 1.
This commit is contained in:
commit
724433d729
@ -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;
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
@ -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
|
||||||
|
@ -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;
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
@ -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;
|
||||||
|
@ -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)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user