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

Split buffer-centric properties out of FormatElement

Browse Source
This commit is contained in:
baldurk
2019-11-28 11:36:38 +00:00
parent 93add323e5
commit f046423664
3 changed files with 128 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/FormatElement.cpp
+6 -15
View File
@@ -119,32 +119,23 @@ struct StructFormatData
FormatElement::FormatElement()
{
buffer = 0;
offset = 0;
perinstance = false;
instancerate = 1;
rowmajor = false;
matrixdim = 0;
hex = false;
rgb = false;
systemValue = ShaderBuiltin::Undefined;
}
FormatElement::FormatElement(const QString &Name, int buf, uint offs, bool perInst, int instRate,
bool rowMat, uint matDim, ResourceFormat f, bool hexDisplay,
bool rgbDisplay)
FormatElement::FormatElement(const QString &Name, uint offs, bool rowMat, uint matDim,
ResourceFormat f, bool hexDisplay, bool rgbDisplay)
{
name = Name;
buffer = buf;
offset = offs;
format = f;
perinstance = perInst;
instancerate = instRate;
rowmajor = rowMat;
matrixdim = matDim;
hex = hexDisplay;
rgb = rgbDisplay;
systemValue = ShaderBuiltin::Undefined;
}
QList<FormatElement> FormatElement::ParseFormatString(const QString &formatString, uint64_t maxLen,
@@ -474,7 +465,7 @@ QList<FormatElement> FormatElement::ParseFormatString(const QString &formatStrin
if(arrayCount == 1)
{
FormatElement elem(name, 0, cur->offset, false, 1, row_major, matrixCount, fmt, hex, rgb);
FormatElement elem(name, cur->offset, row_major, matrixCount, fmt, hex, rgb);
uint32_t advance = elem.byteSize();
@@ -508,8 +499,8 @@ QList<FormatElement> FormatElement::ParseFormatString(const QString &formatStrin
for(uint a = 0; a < arrayCount; a++)
{
FormatElement elem(QFormatStr("%1[%2]").arg(name).arg(a), 0, cur->offset, false, 1,
row_major, matrixCount, fmt, hex, rgb);
FormatElement elem(QFormatStr("%1[%2]").arg(name).arg(a), cur->offset, row_major,
matrixCount, fmt, hex, rgb);
cur->elems.push_back(elem);
@@ -545,7 +536,7 @@ QList<FormatElement> FormatElement::ParseFormatString(const QString &formatStrin
if(maxLen > 0 && maxLen < 4)
fmt.compByteWidth = 1;
root.elems.push_back(FormatElement(lit("data"), 0, 0, false, 1, false, 1, fmt, true, false));
root.elems.push_back(FormatElement(lit("data"), 0, false, 1, fmt, true, false));
}
return root.elems;
qrenderdoc/Code/QRDUtils.h
+3 -6
View File
@@ -80,8 +80,8 @@ struct FormatElement
public:
FormatElement();
FormatElement(const QString &Name, int buf, uint offs, bool perInst, int instRate, bool rowMat,
uint matDim, ResourceFormat f, bool hexDisplay, bool rgbDisplay);
FormatElement(const QString &Name, uint offs, bool rowMat, uint matDim, ResourceFormat f,
bool hexDisplay, bool rgbDisplay);
static QList<FormatElement> ParseFormatString(const QString &formatString, uint64_t maxLen,
bool tightPacking, QString &errors);
@@ -95,13 +95,10 @@ public:
QString name;
ResourceFormat format;
ShaderBuiltin systemValue;
int buffer;
uint32_t offset;
int instancerate;
uint32_t matrixdim;
bool perinstance;
bool rowmajor;
bool hex, rgb;
};