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
123 lines
4.3 KiB
C++
123 lines
4.3 KiB
C++
/**
|
|
This code is based on the glslang_c_interface implementation by Viktor Latypov
|
|
**/
|
|
|
|
/**
|
|
BSD 2-Clause License
|
|
|
|
Copyright (c) 2019, Viktor Latypov
|
|
All rights reserved.
|
|
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions are met:
|
|
|
|
1. Redistributions of source code must retain the above copyright notice, this
|
|
list of conditions and the following disclaimer.
|
|
|
|
2. Redistributions in binary form must reproduce the above copyright notice,
|
|
this list of conditions and the following disclaimer in the documentation
|
|
and/or other materials provided with the distribution.
|
|
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
|
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
**/
|
|
|
|
#include "glslang/Include/glslang_c_interface.h"
|
|
|
|
#include "SPIRV/GlslangToSpv.h"
|
|
#include "SPIRV/Logger.h"
|
|
#include "SPIRV/SpvTools.h"
|
|
|
|
static_assert(sizeof(glslang_spv_options_t) == sizeof(glslang::SpvOptions), "");
|
|
|
|
typedef struct glslang_program_s {
|
|
glslang::TProgram* program;
|
|
std::vector<unsigned int> spirv;
|
|
std::string loggerMessages;
|
|
} glslang_program_t;
|
|
|
|
static EShLanguage c_shader_stage(glslang_stage_t stage)
|
|
{
|
|
switch (stage) {
|
|
case GLSLANG_STAGE_VERTEX:
|
|
return EShLangVertex;
|
|
case GLSLANG_STAGE_TESSCONTROL:
|
|
return EShLangTessControl;
|
|
case GLSLANG_STAGE_TESSEVALUATION:
|
|
return EShLangTessEvaluation;
|
|
case GLSLANG_STAGE_GEOMETRY:
|
|
return EShLangGeometry;
|
|
case GLSLANG_STAGE_FRAGMENT:
|
|
return EShLangFragment;
|
|
case GLSLANG_STAGE_COMPUTE:
|
|
return EShLangCompute;
|
|
case GLSLANG_STAGE_RAYGEN_NV:
|
|
return EShLangRayGen;
|
|
case GLSLANG_STAGE_INTERSECT_NV:
|
|
return EShLangIntersect;
|
|
case GLSLANG_STAGE_ANYHIT_NV:
|
|
return EShLangAnyHit;
|
|
case GLSLANG_STAGE_CLOSESTHIT_NV:
|
|
return EShLangClosestHit;
|
|
case GLSLANG_STAGE_MISS_NV:
|
|
return EShLangMiss;
|
|
case GLSLANG_STAGE_CALLABLE_NV:
|
|
return EShLangCallable;
|
|
case GLSLANG_STAGE_TASK:
|
|
return EShLangTask;
|
|
case GLSLANG_STAGE_MESH:
|
|
return EShLangMesh;
|
|
default:
|
|
break;
|
|
}
|
|
return EShLangCount;
|
|
}
|
|
|
|
GLSLANG_EXPORT void glslang_program_SPIRV_generate(glslang_program_t* program, glslang_stage_t stage)
|
|
{
|
|
glslang_spv_options_t spv_options;
|
|
spv_options.generate_debug_info = false;
|
|
spv_options.strip_debug_info = false;
|
|
spv_options.disable_optimizer = true;
|
|
spv_options.optimize_size = false;
|
|
spv_options.disassemble = false;
|
|
spv_options.validate = true;
|
|
|
|
glslang_program_SPIRV_generate_with_options(program, stage, &spv_options);
|
|
}
|
|
|
|
GLSLANG_EXPORT void glslang_program_SPIRV_generate_with_options(glslang_program_t* program, glslang_stage_t stage, glslang_spv_options_t* spv_options) {
|
|
spv::SpvBuildLogger logger;
|
|
|
|
const glslang::TIntermediate* intermediate = program->program->getIntermediate(c_shader_stage(stage));
|
|
|
|
glslang::GlslangToSpv(*intermediate, program->spirv, &logger, reinterpret_cast<glslang::SpvOptions*>(spv_options));
|
|
|
|
program->loggerMessages = logger.getAllMessages();
|
|
}
|
|
|
|
GLSLANG_EXPORT size_t glslang_program_SPIRV_get_size(glslang_program_t* program) { return program->spirv.size(); }
|
|
|
|
GLSLANG_EXPORT void glslang_program_SPIRV_get(glslang_program_t* program, unsigned int* out)
|
|
{
|
|
memcpy(out, program->spirv.data(), program->spirv.size() * sizeof(unsigned int));
|
|
}
|
|
|
|
GLSLANG_EXPORT unsigned int* glslang_program_SPIRV_get_ptr(glslang_program_t* program)
|
|
{
|
|
return program->spirv.data();
|
|
}
|
|
|
|
GLSLANG_EXPORT const char* glslang_program_SPIRV_get_messages(glslang_program_t* program)
|
|
{
|
|
return program->loggerMessages.empty() ? nullptr : program->loggerMessages.c_str();
|
|
}
|