lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-13 18:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix detection of separate samplers and textures to work properly

Browse Source
This commit is contained in:
baldurk
2016-02-25 22:29:19 +01:00
parent 939d7e56bd
commit 7a557380aa
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
+32 -19
View File
@@ -3441,32 +3441,45 @@ void SPVModule::MakeReflection(const string &entryPoint, ShaderReflection *refle
else if(type->texdim == spv::DimBuffer)
res.resType = eResType_Buffer;
res.IsSampler = type->type == SPVTypeData::eSampledImage;
res.IsTexture = res.resType != eResType_Buffer;
res.IsSampler = type->type == SPVTypeData::eSampledImage || type->type == SPVTypeData::eSampler;
res.IsTexture = res.resType != eResType_Buffer && type->type != SPVTypeData::eSampler;
if(type->type == SPVTypeData::eSampler)
{
res.resType = eResType_None;
res.IsSRV = false;
}
bool isrw = false;
SPVTypeData *sampledType = type->baseType;
if(sampledType->type == SPVTypeData::eImage)
if(type->type == SPVTypeData::eSampler)
{
isrw = (sampledType->sampled == 2);
sampledType = sampledType->baseType;
res.resType = eResType_None;
}
if(type->type == SPVTypeData::eImage)
{
isrw = true;
}
res.IsSRV = !isrw;
if(sampledType->type == SPVTypeData::eFloat)
res.variableType.descriptor.type = eVar_Float;
else if(sampledType->type == SPVTypeData::eUInt)
res.variableType.descriptor.type = eVar_UInt;
else if(sampledType->type == SPVTypeData::eSInt)
res.variableType.descriptor.type = eVar_Int;
else
RDCERR("Unexpected base type of resource %u", sampledType->type);
{
if(sampledType->type == SPVTypeData::eImage)
{
isrw = (sampledType->sampled == 2);
sampledType = sampledType->baseType;
}
if(type->type == SPVTypeData::eImage)
{
isrw = (type->sampled == 2);
}
res.IsSRV = !isrw;
if(sampledType->type == SPVTypeData::eFloat)
res.variableType.descriptor.type = eVar_Float;
else if(sampledType->type == SPVTypeData::eUInt)
res.variableType.descriptor.type = eVar_UInt;
else if(sampledType->type == SPVTypeData::eSInt)
res.variableType.descriptor.type = eVar_Int;
else
RDCERR("Unexpected base type of resource %u", sampledType->type);
}
res.variableType.descriptor.rows = 1;
res.variableType.descriptor.cols = 1;