hyzboy/GLSLCompiler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use self-define "enum class VertexAttribBaseType" instead "spirv_cross::SPIRType::BaseType"

Browse Source
This commit is contained in:
hyzboy 2020-08-25 17:44:40 +08:00
parent 5a81928c80
commit 65cbc81443
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -33,4 +33,4 @@ set(VULKAN_SPIRV_LIBS GenericCodeGen
add_library(GLSLCompiler SHARED glsl2spv.cpp VKShaderParse.h) add_library(GLSLCompiler SHARED glsl2spv.cpp VKShaderParse.h)
target_link_libraries(GLSLCompiler PRIVATE ${VULKAN_SPIRV_LIBS} ${Vulkan_LIBRARY}) target_link_libraries(GLSLCompiler PRIVATE ${VULKAN_SPIRV_LIBS})

38
glsl2spv.cpp
View File

@ -206,13 +206,42 @@ extern "C"
{ {
glslang::FinalizeProcess(); glslang::FinalizeProcess();
} }
enum class VertexAttribBaseType
{
Bool=0,
Int,
UInt,
Float,
Double,
MAX=0xff
};//enum class VertexAttribBaseType
VertexAttribBaseType FromSPIRType(const spirv_cross::SPIRType::BaseType type)
{
if(type==spirv_cross::SPIRType::BaseType::Boolean) return VertexAttribBaseType::Bool;
if(type==spirv_cross::SPIRType::BaseType::SByte
||type==spirv_cross::SPIRType::BaseType::Short
||type==spirv_cross::SPIRType::BaseType::Int
||type==spirv_cross::SPIRType::BaseType::Int64) return VertexAttribBaseType::Int;
if(type==spirv_cross::SPIRType::BaseType::UByte
||type==spirv_cross::SPIRType::BaseType::UShort
||type==spirv_cross::SPIRType::BaseType::UInt
||type==spirv_cross::SPIRType::BaseType::UInt64) return VertexAttribBaseType::UInt;
if(type==spirv_cross::SPIRType::BaseType::Half
||type==spirv_cross::SPIRType::BaseType::Float) return VertexAttribBaseType::Float;
if(type==spirv_cross::SPIRType::BaseType::Double) return VertexAttribBaseType::Double;
return VertexAttribBaseType::MAX;
}
struct ShaderStage struct ShaderStage
{ {
char name[128]; char name[128];
uint8_t location; uint8_t location;
uint8_t base_type; uint32_t basetype;
uint8_t vec_size; uint32_t vec_size;
};// };//
struct ShaderStageData struct ShaderStageData
@ -290,7 +319,8 @@ extern "C"
spv_length=spirv.size(); spv_length=spirv.size();
spv_data=new uint32_t[spv_length]; spv_data=new uint32_t[spv_length];
memcpy(spv_data,spirv.data(),spv_length*sizeof(uint32_t)); spv_length*=sizeof(uint32_t);
memcpy(spv_data,spirv.data(),spv_length);
Init(); Init();
} }
@ -330,7 +360,7 @@ extern "C"
{ {
sp->GetFormat(si,&base_type,&vec_size); sp->GetFormat(si,&base_type,&vec_size);
ss->base_type =(uint8_t)base_type; ss->basetype =(uint8_t)FromSPIRType(base_type);
ss->vec_size =vec_size; ss->vec_size =vec_size;
ss->location =sp->GetLocation(si); ss->location =sp->GetLocation(si);