mirror of
https://github.com/KhronosGroup/glslang
synced 2024-09-19 20:29:54 +00:00
228c67228a
Added following updates to GL_EXT_mesh_shader implementation: 1. Added SPIRV and GLSL test cases 2. Added checks to ensure NV and EXT mesh shader builtins cannot be used interchangeably. 3. Updated the language name by removing the postfix "NV" to MeshShader and TaskShader. 4. Added checks for grammar checking to comply with the spec. 5. Added gl_NumWorkGroups builtin to Mesh shader 6. Fixed data type of gl_PrimitiveLineIndicesEXT and gl_PrimitiveTriangleIndicesEXT 7. Added new constants to the resources table 8. Updates to handle new storage qualifier "taskPayloadSharedEXT" 9. Updated test cases by replacing "taskEXT" with storage qualifier "taskPayloadSharedEXT" Addressed Review comments 1. Fixed instruction description used by glslang disassembly. 2. Updated OpEmitMeshTasksEXT as per spec update 3. Fixed implementation that errors out if there are more then one taskPayloadSharedEXT varjables. 4. Fixed miscellaneous error logs and removed unwanted code. SPIRV 1.6 related build failure fixes - Update SPIRV header to 1.6 - Fix conflict wiht SPIRV 1.6 change, where localSizeId is used for execution mode for mesh/task shaders Enable SPIRV generated for EXT_mesh_shader to be version 1.4 GL_EXT_mesh_shader: Add checks for atomic support and corresponding test cases
52 lines
1.1 KiB
Plaintext
52 lines
1.1 KiB
Plaintext
#version 450
|
|
|
|
#define BARRIER() \
|
|
memoryBarrierShared(); \
|
|
barrier();
|
|
|
|
#extension GL_EXT_mesh_shader : enable
|
|
|
|
layout(local_size_x = 32) in;
|
|
|
|
// test use of shared memory in task shaders:
|
|
layout(binding=0) writeonly uniform image2D uni_image;
|
|
uniform block0 {
|
|
uint uni_value;
|
|
};
|
|
shared vec4 mem[10];
|
|
|
|
// use of storage qualifier "taskPayloadSharedEXT" in task shaders
|
|
struct Task {
|
|
vec2 dummy;
|
|
vec2 submesh[3];
|
|
};
|
|
taskPayloadSharedEXT Task mytask;
|
|
|
|
void main()
|
|
{
|
|
uint iid = gl_LocalInvocationID.x;
|
|
uint gid = gl_WorkGroupID.x;
|
|
|
|
// 1. shared memory load and stores
|
|
for (uint i = 0; i < 10; ++i) {
|
|
mem[i] = vec4(i + uni_value);
|
|
}
|
|
imageStore(uni_image, ivec2(iid), mem[gid]);
|
|
imageStore(uni_image, ivec2(iid), mem[gid+1]);
|
|
|
|
BARRIER();
|
|
|
|
// 2. task memory stores
|
|
|
|
mytask.dummy = vec2(30.0, 31.0);
|
|
mytask.submesh[0] = vec2(32.0, 33.0);
|
|
mytask.submesh[1] = vec2(34.0, 35.0);
|
|
mytask.submesh[2] = mytask.submesh[gid%2];
|
|
|
|
BARRIER();
|
|
|
|
// 3. emit task count under uniform control flow
|
|
EmitMeshTasksEXT(3U, 1U, 1U);
|
|
|
|
}
|