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

Replace FormatElement with ShaderConstant/ShaderVariableType

Browse Source 
* FormatElement is now a static BufferFormatter class to help generate and parse
  buffer formatting strings
This commit is contained in:
baldurk
2019-11-28 14:29:00 +00:00
parent 4214aa45bf
commit b3979262a5
21 changed files with 929 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/ConstantBufferPreviewer.cpp
+6 -16
View File
@@ -122,7 +122,7 @@ void ConstantBufferPreviewer::OnEventChanged(uint32_t eventId)
if(reflection == NULL || m_slot >= reflection->constantBlocks.size())
{
// save expansion before clearing
if(m_formatOverride.empty())
if(m_formatOverride.type.members.empty())
{
RDTreeViewExpansionState &prevShaderExpansionState =
ui->variables->getInternalExpansion(qHash(ToQStr(prevShader)));
@@ -133,7 +133,7 @@ void ConstantBufferPreviewer::OnEventChanged(uint32_t eventId)
return;
}
if(!m_formatOverride.empty())
if(!m_formatOverride.type.members.empty())
{
m_Ctx.Replay().AsyncInvoke([this, offs, size, wasEmpty](IReplayController *r) {
bytebuf data = r->GetBufferData(m_cbuffer, offs, size);
@@ -265,14 +265,14 @@ void ConstantBufferPreviewer::processFormat(const QString &format)
{
if(format.isEmpty())
{
m_formatOverride.clear();
m_formatOverride = ShaderConstant();
ui->formatSpecifier->setErrors(QString());
}
else
{
QString errors;
m_formatOverride = FormatElement::ParseFormatString(format, 0, false, errors);
m_formatOverride = BufferFormatter::ParseFormatString(format, 0, false, errors);
ui->formatSpecifier->setErrors(errors);
}
@@ -348,17 +348,7 @@ void ConstantBufferPreviewer::updateLabels()
rdcarray<ShaderVariable> ConstantBufferPreviewer::applyFormatOverride(const bytebuf &bytes)
{
QVector<ShaderVariable> variables;
ShaderVariable var = InterpretShaderVar(m_formatOverride, bytes.begin(), bytes.end());
variables.resize(m_formatOverride.length());
for(int i = 0; i < m_formatOverride.length(); i++)
{
const byte *b = bytes.begin() + m_formatOverride[i].offset;
variables[i] = m_formatOverride[i].GetShaderVar(b, bytes.end());
}
rdcarray<ShaderVariable> ret;
ret = variables.toStdVector();
return ret;
return var.members;
}