lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-23 06:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename ShaderVariableType/Descriptor to ShaderConstant

Browse Source 
* These structs are no longer used with ShaderVariable so the name is misleading
  at best.
This commit is contained in:
baldurk
2020-12-09 15:18:27 +00:00
parent 659fdaa235
commit 580f96c8a1
17 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/QRDUtils.cpp
+6 -6
View File
@@ -75,7 +75,7 @@ rdcstr DoStringise(const ResourceId &el)
}
QMap<QPair<ResourceId, uint32_t>, uint32_t> PointerTypeRegistry::typeMapping;
rdcarray<ShaderVariableType> PointerTypeRegistry::typeDescriptions;
rdcarray<ShaderConstantType> PointerTypeRegistry::typeDescriptions;
static const uint32_t TypeIDBit = 0x80000000;
@@ -93,7 +93,7 @@ uint32_t PointerTypeRegistry::GetTypeID(ResourceId shader, uint32_t pointerTypeI
return typeMapping[qMakePair(shader, pointerTypeId)];
}
uint32_t PointerTypeRegistry::GetTypeID(const ShaderVariableType &structDef)
uint32_t PointerTypeRegistry::GetTypeID(const ShaderConstantType &structDef)
{
// see if the type is already registered, return its existing ID
for(uint32_t i = 1; i < typeDescriptions.size(); i++)
@@ -111,13 +111,13 @@ uint32_t PointerTypeRegistry::GetTypeID(const ShaderVariableType &structDef)
return id;
}
const ShaderVariableType &PointerTypeRegistry::GetTypeDescriptor(uint32_t typeId)
const ShaderConstantType &PointerTypeRegistry::GetTypeDescriptor(uint32_t typeId)
{
return typeDescriptions[typeId & ~TypeIDBit];
}
void PointerTypeRegistry::CacheSubTypes(const ShaderReflection *reflection,
ShaderVariableType &structDef)
ShaderConstantType &structDef)
{
if((structDef.descriptor.pointerTypeID & TypeIDBit) == 0)
structDef.descriptor.pointerTypeID =
@@ -139,7 +139,7 @@ void PointerTypeRegistry::CacheShader(const ShaderReflection *reflection)
for(uint32_t i = 0; i < reflection->pointerTypes.size(); i++)
{
ShaderVariableType typeDesc = reflection->pointerTypes[i];
ShaderConstantType typeDesc = reflection->pointerTypes[i];
// first recursively cache all subtypes needed by the root struct types
CacheSubTypes(reflection, typeDesc);
@@ -789,7 +789,7 @@ bool RichResourceTextMouseEvent(const QWidget *owner, const QVariant &var, QRect
{
ICaptureContext &ctx = *(ICaptureContext *)ctxptr;
const ShaderVariableType &ptrType = PointerTypeRegistry::GetTypeDescriptor(ptr->val);
const ShaderConstantType &ptrType = PointerTypeRegistry::GetTypeDescriptor(ptr->val);
QString formatter;