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

Rename colour to color in public API code

Browse Source 
* Following the principle of least surprise, color tends to be more
  commonly used in APIs and graphics code even outside the USA.
This commit is contained in:
baldurk
2017-03-30 14:49:55 +01:00
parent d94f387399
commit 637d4089e2
47 changed files with 149 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/PersistantConfig.h
+2 -2
View File
@@ -104,9 +104,9 @@ struct SPIRVDisassembler
\
CONFIG_SETTING_VAL(public, bool, bool, EventBrowser_HideAPICalls, false) \
\
CONFIG_SETTING_VAL(public, bool, bool, EventBrowser_ApplyColours, true) \
CONFIG_SETTING_VAL(public, bool, bool, EventBrowser_ApplyColors, true) \
\
CONFIG_SETTING_VAL(public, bool, bool, EventBrowser_ColourEventRow, true) \
CONFIG_SETTING_VAL(public, bool, bool, EventBrowser_ColorEventRow, true) \
\
CONFIG_SETTING_VAL(public, int, int, Formatter_MinFigures, 2) \
\
qrenderdoc/Code/QRDUtils.cpp
+4 -4
View File
@@ -73,8 +73,8 @@ QString ToQStr(const ResourceUsage usage, const GraphicsAPI apitype)
case ResourceUsage::CS_RWResource: return "CS - UAV";
case ResourceUsage::All_RWResource: return "All - UAV";
case ResourceUsage::InputTarget: return "Colour Input";
case ResourceUsage::ColourTarget: return "Rendertarget";
case ResourceUsage::InputTarget: return "Color Input";
case ResourceUsage::ColorTarget: return "Rendertarget";
case ResourceUsage::DepthStencilTarget: return "Depthstencil";
case ResourceUsage::Indirect: return "Indirect argument";
@@ -129,7 +129,7 @@ QString ToQStr(const ResourceUsage usage, const GraphicsAPI apitype)
case ResourceUsage::All_RWResource: return "All - Image/SSBO";
case ResourceUsage::InputTarget: return "FBO Input";
case ResourceUsage::ColourTarget: return "FBO Colour";
case ResourceUsage::ColorTarget: return "FBO Color";
case ResourceUsage::DepthStencilTarget: return "FBO Depthstencil";
case ResourceUsage::Indirect: return "Indirect argument";
@@ -215,7 +215,7 @@ QString D3DSemanticString(const SigParameter &sig)
QString ret = ToQStr(sig.systemValue);
// need to include the index if it's a system value semantic that's numbered
if(sig.systemValue == ShaderBuiltin::ColourOutput ||
if(sig.systemValue == ShaderBuiltin::ColorOutput ||
sig.systemValue == ShaderBuiltin::CullDistance || sig.systemValue == ShaderBuiltin::ClipDistance)
ret += QString::number(sig.semanticIndex);
qrenderdoc/Code/QRDUtils.h
+2 -2
View File
@@ -123,7 +123,7 @@ struct ToStr
switch(el)
{
case AlphaMapping::Discard: return "Discard";
case AlphaMapping::BlendToColour: return "Blend to Colour";
case AlphaMapping::BlendToColor: return "Blend to Color";
case AlphaMapping::BlendToCheckerboard: return "Blend to Checkerboard";
case AlphaMapping::Preserve: return "Preserve";
default: break;
@@ -284,7 +284,7 @@ struct ToStr
case ShaderBuiltin::PatchNumVertices: return "Patch NumVertices";
case ShaderBuiltin::OuterTessFactor: return "Outer TessFactor";
case ShaderBuiltin::InsideTessFactor: return "Inside TessFactor";
case ShaderBuiltin::ColourOutput: return "Colour Output";
case ShaderBuiltin::ColorOutput: return "Color Output";
case ShaderBuiltin::DepthOutput: return "Depth Output";
case ShaderBuiltin::DepthOutputGreaterEqual: return "Depth Output (GEqual)";
case ShaderBuiltin::DepthOutputLessEqual: return "Depth Output (LEqual)";
qrenderdoc/Windows/Dialogs/SettingsDialog.cpp
+7 -7
View File
@@ -77,11 +77,11 @@ SettingsDialog::SettingsDialog(CaptureContext &ctx, QWidget *parent)
ui->EventBrowser_TimeUnit->setCurrentIndex((int)m_Ctx.Config.EventBrowser_TimeUnit);
ui->EventBrowser_HideEmpty->setChecked(m_Ctx.Config.EventBrowser_HideEmpty);
ui->EventBrowser_HideAPICalls->setChecked(m_Ctx.Config.EventBrowser_HideAPICalls);
ui->EventBrowser_ApplyColours->setChecked(m_Ctx.Config.EventBrowser_ApplyColours);
ui->EventBrowser_ColourEventRow->setChecked(m_Ctx.Config.EventBrowser_ColourEventRow);
ui->EventBrowser_ApplyColors->setChecked(m_Ctx.Config.EventBrowser_ApplyColors);
ui->EventBrowser_ColorEventRow->setChecked(m_Ctx.Config.EventBrowser_ColorEventRow);
// disable sub-checkbox
ui->EventBrowser_ColourEventRow->setEnabled(ui->EventBrowser_ApplyColours->isChecked());
ui->EventBrowser_ColorEventRow->setEnabled(ui->EventBrowser_ApplyColors->isChecked());
ui->Formatter_MinFigures->setValue(m_Ctx.Config.Formatter_MinFigures);
ui->Formatter_MaxFigures->setValue(m_Ctx.Config.Formatter_MaxFigures);
@@ -301,16 +301,16 @@ void SettingsDialog::on_EventBrowser_HideAPICalls_toggled(bool checked)
m_Ctx.Config.Save();
}
void SettingsDialog::on_EventBrowser_ApplyColours_toggled(bool checked)
void SettingsDialog::on_EventBrowser_ApplyColors_toggled(bool checked)
{
m_Ctx.Config.EventBrowser_ApplyColours = ui->EventBrowser_ApplyColours->isChecked();
m_Ctx.Config.EventBrowser_ApplyColors = ui->EventBrowser_ApplyColors->isChecked();
m_Ctx.Config.Save();
}
void SettingsDialog::on_EventBrowser_ColourEventRow_toggled(bool checked)
void SettingsDialog::on_EventBrowser_ColorEventRow_toggled(bool checked)
{
m_Ctx.Config.EventBrowser_ColourEventRow = ui->EventBrowser_ColourEventRow->isChecked();
m_Ctx.Config.EventBrowser_ColorEventRow = ui->EventBrowser_ColorEventRow->isChecked();
m_Ctx.Config.Save();
}
qrenderdoc/Windows/Dialogs/SettingsDialog.h
+2 -2
View File
@@ -77,8 +77,8 @@ private slots:
void on_EventBrowser_TimeUnit_currentIndexChanged(int index);
void on_EventBrowser_HideEmpty_toggled(bool checked);
void on_EventBrowser_HideAPICalls_toggled(bool checked);
void on_EventBrowser_ApplyColours_toggled(bool checked);
void on_EventBrowser_ColourEventRow_toggled(bool checked);
void on_EventBrowser_ApplyColors_toggled(bool checked);
void on_EventBrowser_ColorEventRow_toggled(bool checked);
// android
void on_browseTempCaptureDirectory_clicked();
qrenderdoc/Windows/Dialogs/SettingsDialog.ui
+8 -8
View File
@@ -784,9 +784,9 @@ If {spv_disas} is not used, the tool is expected to output the disassembly on st
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="EventBrowser_ApplyColours">
<widget class="QCheckBox" name="EventBrowser_ApplyColors">
<property name="toolTip">
<string>In the Event Browser and Timeline Bar, marker sections and marker labels will be coloured with an API-specified colour.
<string>In the Event Browser and Timeline Bar, marker sections and marker labels will be colored with an API-specified color.
</string>
</property>
<property name="text">
@@ -795,9 +795,9 @@ If {spv_disas} is not used, the tool is expected to output the disassembly on st
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="EventBrowser_ColourEventRow">
<widget class="QCheckBox" name="EventBrowser_ColorEventRow">
<property name="toolTip">
<string>When colouring marker sections in the Event Browser, the whole row of a marker region will be coloured, not just a bar to the left of its children.</string>
<string>When coloring marker sections in the Event Browser, the whole row of a marker region will be colored, not just a bar to the left of its children.</string>
</property>
<property name="text">
<string/>
@@ -807,21 +807,21 @@ If {spv_disas} is not used, the tool is expected to output the disassembly on st
<item row="3" column="0">
<widget class="QLabel" name="label_22">
<property name="toolTip">
<string>In the Event Browser and Timeline Bar, marker sections and marker labels will be coloured with an API-specified colour.
<string>In the Event Browser and Timeline Bar, marker sections and marker labels will be colored with an API-specified color.
</string>
</property>
<property name="text">
<string>Apply marker colours (requires file reload)</string>
<string>Apply marker colors (requires file reload)</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_23">
<property name="toolTip">
<string>When colouring marker sections in the Event Browser, the whole row of a marker region will be coloured, not just a bar to the left of its children.</string>
<string>When coloring marker sections in the Event Browser, the whole row of a marker region will be colored, not just a bar to the left of its children.</string>
</property>
<property name="text">
<string> - Colourise whole row for marker regions</string>
<string> - Colorise whole row for marker regions</string>
</property>
</widget>
</item>
qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp
+2 -2
View File
@@ -185,7 +185,7 @@ void TextureSaveDialog::on_fileFormat_currentIndexChanged(int index)
ui->alphaMap->setEnabled(tex.format.compCount == 4 && noAlphaFormat);
ui->alphaCol->setEnabled(saveData.alpha == AlphaMapping::BlendToColour &&
ui->alphaCol->setEnabled(saveData.alpha == AlphaMapping::BlendToColor &&
tex.format.compCount == 4 && noAlphaFormat);
if(saveData.destType == FileType::DDS)
@@ -472,7 +472,7 @@ void TextureSaveDialog::on_alphaMap_currentIndexChanged(int index)
{
saveData.alpha = (AlphaMapping)index;
ui->alphaCol->setEnabled(saveData.alpha == AlphaMapping::BlendToColour);
ui->alphaCol->setEnabled(saveData.alpha == AlphaMapping::BlendToColor);
}
void TextureSaveDialog::on_blackPoint_textEdited(const QString &arg)
qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
+1 -1
View File
@@ -1651,7 +1651,7 @@ void GLPipelineStateViewer::setState()
{
if(state.m_FS.ShaderDetails->OutputSig[s].regIndex == (uint32_t)db &&
(state.m_FS.ShaderDetails->OutputSig[s].systemValue == ShaderBuiltin::Undefined ||
state.m_FS.ShaderDetails->OutputSig[s].systemValue == ShaderBuiltin::ColourOutput))
state.m_FS.ShaderDetails->OutputSig[s].systemValue == ShaderBuiltin::ColorOutput))
{
name = QString("<%1>").arg(ToQStr(state.m_FS.ShaderDetails->OutputSig[s].varName));
}
qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+1 -1
View File
@@ -1819,7 +1819,7 @@ void VulkanPipelineStateViewer::setState()
{
if(state.m_FS.ShaderDetails->OutputSig[s].regIndex == (uint32_t)colIdx &&
(state.m_FS.ShaderDetails->OutputSig[s].systemValue == ShaderBuiltin::Undefined ||
state.m_FS.ShaderDetails->OutputSig[s].systemValue == ShaderBuiltin::ColourOutput))
state.m_FS.ShaderDetails->OutputSig[s].systemValue == ShaderBuiltin::ColorOutput))
{
name = QString("<%1>").arg(ToQStr(state.m_FS.ShaderDetails->OutputSig[s].varName));
}
qrenderdoc/Windows/TextureViewer.cpp
+17 -17
View File
@@ -2480,9 +2480,9 @@ void TextureViewer::OnLogfileLoaded()
model->reset(TextureListItemModel::String, "", m_Ctx);
m_TexDisplay.darkBackgroundColour =
m_TexDisplay.darkBackgroundColor =
FloatVector(darkBack.redF(), darkBack.greenF(), darkBack.blueF(), 1.0f);
m_TexDisplay.lightBackgroundColour =
m_TexDisplay.lightBackgroundColor =
FloatVector(lightBack.redF(), lightBack.greenF(), lightBack.blueF(), 1.0f);
m_Ctx.Renderer().BlockInvoke([renderID, contextID, this](IReplayRenderer *r) {
@@ -2513,9 +2513,9 @@ void TextureViewer::Reset()
m_CachedTexture = NULL;
memset(&m_TexDisplay, 0, sizeof(m_TexDisplay));
m_TexDisplay.darkBackgroundColour =
m_TexDisplay.darkBackgroundColor =
FloatVector(darkBack.redF(), darkBack.greenF(), darkBack.blueF(), 1.0f);
m_TexDisplay.lightBackgroundColour =
m_TexDisplay.lightBackgroundColor =
FloatVector(lightBack.redF(), lightBack.greenF(), lightBack.blueF(), 1.0f);
m_Output = NULL;
@@ -2730,9 +2730,9 @@ void TextureViewer::setPersistData(const QVariant &persistData)
ui->checkerBack->setChecked(false);
}
m_TexDisplay.darkBackgroundColour =
m_TexDisplay.darkBackgroundColor =
FloatVector(darkBack.redF(), darkBack.greenF(), darkBack.blueF(), 1.0f);
m_TexDisplay.lightBackgroundColour =
m_TexDisplay.lightBackgroundColor =
FloatVector(lightBack.redF(), lightBack.greenF(), lightBack.blueF(), 1.0f);
ui->render->setColours(darkBack, lightBack);
@@ -3061,7 +3061,7 @@ void TextureViewer::on_backcolorPick_clicked()
col = QColor(0, 0, 0);
col = col.toRgb();
m_TexDisplay.darkBackgroundColour = m_TexDisplay.lightBackgroundColour =
m_TexDisplay.darkBackgroundColor = m_TexDisplay.lightBackgroundColor =
FloatVector(col.redF(), col.greenF(), col.blueF(), 1.0f);
darkBack = lightBack = col;
@@ -3086,16 +3086,16 @@ void TextureViewer::on_checkerBack_clicked()
ui->checkerBack->setChecked(true);
ui->backcolorPick->setChecked(false);
m_TexDisplay.lightBackgroundColour = FloatVector(0.81f, 0.81f, 0.81f, 1.0f);
m_TexDisplay.darkBackgroundColour = FloatVector(0.57f, 0.57f, 0.57f, 1.0f);
m_TexDisplay.lightBackgroundColor = FloatVector(0.81f, 0.81f, 0.81f, 1.0f);
m_TexDisplay.darkBackgroundColor = FloatVector(0.57f, 0.57f, 0.57f, 1.0f);
darkBack = QColor::fromRgb(int(m_TexDisplay.darkBackgroundColour.x * 255.0f),
int(m_TexDisplay.darkBackgroundColour.y * 255.0f),
int(m_TexDisplay.darkBackgroundColour.z * 255.0f));
darkBack = QColor::fromRgb(int(m_TexDisplay.darkBackgroundColor.x * 255.0f),
int(m_TexDisplay.darkBackgroundColor.y * 255.0f),
int(m_TexDisplay.darkBackgroundColor.z * 255.0f));
lightBack = QColor::fromRgb(int(m_TexDisplay.lightBackgroundColour.x * 255.0f),
int(m_TexDisplay.lightBackgroundColour.y * 255.0f),
int(m_TexDisplay.lightBackgroundColour.z * 255.0f));
lightBack = QColor::fromRgb(int(m_TexDisplay.lightBackgroundColor.x * 255.0f),
int(m_TexDisplay.lightBackgroundColor.y * 255.0f),
int(m_TexDisplay.lightBackgroundColor.z * 255.0f));
ui->render->setColours(darkBack, lightBack);
ui->pixelContext->setColours(darkBack, lightBack);
@@ -3255,10 +3255,10 @@ void TextureViewer::on_saveTex_clicked()
config.comp.blackPoint = m_TexDisplay.rangemin;
config.comp.whitePoint = m_TexDisplay.rangemax;
config.alphaCol = m_TexDisplay.lightBackgroundColour;
config.alphaCol = m_TexDisplay.lightBackgroundColor;
config.alpha = m_TexDisplay.Alpha ? AlphaMapping::BlendToCheckerboard : AlphaMapping::Discard;
if(m_TexDisplay.Alpha && !ui->checkerBack->isChecked())
config.alpha = AlphaMapping::BlendToColour;
config.alpha = AlphaMapping::BlendToColor;
if(m_TexDisplay.CustomShader != ResourceId())
{
renderdoc/api/replay/control_types.h
+3 -3
View File
@@ -64,7 +64,7 @@ struct MeshFormat
bool32 bgraOrder;
SpecialFormat specialFormat;
FloatVector meshColour;
FloatVector meshColor;
bool showAlpha;
@@ -127,8 +127,8 @@ struct TextureDisplay
float offx, offy;
FloatVector lightBackgroundColour;
FloatVector darkBackgroundColour;
FloatVector lightBackgroundColor;
FloatVector darkBackgroundColor;
DebugOverlay overlay;
};
renderdoc/api/replay/data_types.h
+2 -2
View File
@@ -374,7 +374,7 @@ struct DrawcallDescription
eventID = 0;
drawcallID = 0;
flags = DrawFlags::NoFlags;
markerColour[0] = markerColour[1] = markerColour[2] = markerColour[3] = 0.0f;
markerColor[0] = markerColor[1] = markerColor[2] = markerColor[3] = 0.0f;
numIndices = 0;
numInstances = 0;
indexOffset = 0;
@@ -406,7 +406,7 @@ struct DrawcallDescription
DrawFlags flags;
float markerColour[4];
float markerColor[4];
uint32_t numIndices;
uint32_t numInstances;
renderdoc/api/replay/replay_enums.h
+4 -4
View File
@@ -274,7 +274,7 @@ enum class ShaderBuiltin : uint32_t
PatchNumVertices,
OuterTessFactor,
InsideTessFactor,
ColourOutput,
ColorOutput,
DepthOutput,
DepthOutputGreaterEqual,
DepthOutputLessEqual,
@@ -335,7 +335,7 @@ enum class AlphaMapping : uint32_t
{
Discard,
First = Discard,
BlendToColour,
BlendToColor,
BlendToCheckerboard,
Preserve,
Count,
@@ -621,7 +621,7 @@ enum class ResourceUsage : uint32_t
All_RWResource,
InputTarget,
ColourTarget,
ColorTarget,
DepthStencilTarget,
Indirect,
@@ -696,7 +696,7 @@ enum class DrawFlags : uint32_t
Instanced = 0x020000,
Auto = 0x040000,
Indirect = 0x080000,
ClearColour = 0x100000,
ClearColor = 0x100000,
ClearDepthStencil = 0x200000,
BeginPass = 0x400000,
EndPass = 0x800000,
renderdoc/core/image_viewer.cpp
+2 -2
View File
@@ -82,9 +82,9 @@ public:
{
m_Proxy->GetOutputWindowDimensions(id, w, h);
}
void ClearOutputWindowColour(uint64_t id, float col[4])
void ClearOutputWindowColor(uint64_t id, float col[4])
{
m_Proxy->ClearOutputWindowColour(id, col);
m_Proxy->ClearOutputWindowColor(id, col);
}
void ClearOutputWindowDepth(uint64_t id, float depth, uint8_t stencil)
{
renderdoc/core/replay_proxy.cpp
+3 -3
View File
@@ -86,7 +86,7 @@ string ToStrHelper<false, ShaderBuiltin>::Get(const ShaderBuiltin &el)
TOSTR_CASE_STRINGIZE_SCOPED(ShaderBuiltin, PatchNumVertices)
TOSTR_CASE_STRINGIZE_SCOPED(ShaderBuiltin, OuterTessFactor)
TOSTR_CASE_STRINGIZE_SCOPED(ShaderBuiltin, InsideTessFactor)
TOSTR_CASE_STRINGIZE_SCOPED(ShaderBuiltin, ColourOutput)
TOSTR_CASE_STRINGIZE_SCOPED(ShaderBuiltin, ColorOutput)
TOSTR_CASE_STRINGIZE_SCOPED(ShaderBuiltin, DepthOutput)
TOSTR_CASE_STRINGIZE_SCOPED(ShaderBuiltin, DepthOutputGreaterEqual)
TOSTR_CASE_STRINGIZE_SCOPED(ShaderBuiltin, DepthOutputLessEqual)
@@ -1335,7 +1335,7 @@ void Serialiser::Serialise(const char *name, DrawcallDescription &el)
Serialise("", el.flags);
SerialisePODArray<4>("", el.markerColour);
SerialisePODArray<4>("", el.markerColor);
Serialise("", el.numIndices);
Serialise("", el.numInstances);
@@ -1591,7 +1591,7 @@ void Serialiser::Serialise(const char *name, MeshFormat &el)
Serialise("", el.compType);
Serialise("", el.bgraOrder);
Serialise("", el.specialFormat);
Serialise("", el.meshColour);
Serialise("", el.meshColor);
Serialise("", el.showAlpha);
Serialise("", el.topo);
Serialise("", el.numVerts);
renderdoc/core/replay_proxy.h
+2 -2
View File
@@ -149,10 +149,10 @@ public:
if(m_Proxy)
return m_Proxy->GetOutputWindowDimensions(id, w, h);
}
void ClearOutputWindowColour(uint64_t id, float col[4])
void ClearOutputWindowColor(uint64_t id, float col[4])
{
if(m_Proxy)
return m_Proxy->ClearOutputWindowColour(id, col);
return m_Proxy->ClearOutputWindowColor(id, col);
}
void ClearOutputWindowDepth(uint64_t id, float depth, uint8_t stencil)
{
renderdoc/driver/d3d11/d3d11_analyse.cpp
+1 -1
View File
@@ -3356,7 +3356,7 @@ ResourceId D3D11DebugManager::ApplyCustomShader(ResourceId shader, ResourceId te
disp.CustomShader = shader;
disp.texid = texid;
disp.typeHint = typeHint;
disp.lightBackgroundColour = disp.darkBackgroundColour = FloatVector(0, 0, 0, 0);
disp.lightBackgroundColor = disp.darkBackgroundColor = FloatVector(0, 0, 0, 0);
disp.HDRMul = -1.0f;
disp.linearDisplayAsGamma = false;
disp.mip = mip;
renderdoc/driver/d3d11/d3d11_context.cpp
+2 -2
View File
@@ -942,7 +942,7 @@ void WrappedID3D11DeviceContext::AddUsage(const DrawcallDescription &d)
WrappedID3D11RenderTargetView1 *view =
(WrappedID3D11RenderTargetView1 *)pipe->OM.RenderTargets[i];
m_ResourceUses[view->GetResourceResID()].push_back(
EventUsage(e, ResourceUsage::ColourTarget, view->GetResourceID()));
EventUsage(e, ResourceUsage::ColorTarget, view->GetResourceID()));
}
}
}
@@ -1538,7 +1538,7 @@ void WrappedID3D11DeviceContext::ReplayLog(LogState readType, uint32_t startEven
if(u == ResourceUsage::StreamOut ||
(u >= ResourceUsage::VS_RWResource && u <= ResourceUsage::CS_RWResource) ||
u == ResourceUsage::DepthStencilTarget || u == ResourceUsage::ColourTarget)
u == ResourceUsage::DepthStencilTarget || u == ResourceUsage::ColorTarget)
{
written = true;
break;
renderdoc/driver/d3d11/d3d11_context_wrap.cpp
+9 -9
View File
@@ -64,10 +64,10 @@ bool WrappedID3D11DeviceContext::Serialise_SetMarker(uint32_t col, const wchar_t
byte green = (colour >> 8) & 0xff;
byte blue = (colour >> 0) & 0xff;
draw.markerColour[0] = float(red) / 255.0f;
draw.markerColour[1] = float(green) / 255.0f;
draw.markerColour[2] = float(blue) / 255.0f;
draw.markerColour[3] = float(alpha) / 255.0f;
draw.markerColor[0] = float(red) / 255.0f;
draw.markerColor[1] = float(green) / 255.0f;
draw.markerColor[2] = float(blue) / 255.0f;
draw.markerColor[3] = float(alpha) / 255.0f;
AddDrawcall(draw, false);
}
@@ -100,10 +100,10 @@ bool WrappedID3D11DeviceContext::Serialise_PushEvent(uint32_t col, const wchar_t
byte green = (colour >> 8) & 0xff;
byte blue = (colour >> 0) & 0xff;
draw.markerColour[0] = float(red) / 255.0f;
draw.markerColour[1] = float(green) / 255.0f;
draw.markerColour[2] = float(blue) / 255.0f;
draw.markerColour[3] = float(alpha) / 255.0f;
draw.markerColor[0] = float(red) / 255.0f;
draw.markerColor[1] = float(green) / 255.0f;
draw.markerColor[2] = float(blue) / 255.0f;
draw.markerColor[3] = float(alpha) / 255.0f;
AddDrawcall(draw, false);
}
@@ -6321,7 +6321,7 @@ bool WrappedID3D11DeviceContext::Serialise_ClearRenderTargetView(
DrawcallDescription draw;
draw.name = name;
draw.flags |= DrawFlags::Clear | DrawFlags::ClearColour;
draw.flags |= DrawFlags::Clear | DrawFlags::ClearColor;
AddDrawcall(draw, true);
renderdoc/driver/d3d11/d3d11_debug.cpp
+4 -4
View File
@@ -1660,7 +1660,7 @@ void D3D11DebugManager::GetOutputWindowDimensions(uint64_t id, int32_t &w, int32
h = m_OutputWindows[id].height;
}
void D3D11DebugManager::ClearOutputWindowColour(uint64_t id, float col[4])
void D3D11DebugManager::ClearOutputWindowColor(uint64_t id, float col[4])
{
if(id == 0 || m_OutputWindows.find(id) == m_OutputWindows.end())
return;
@@ -4785,7 +4785,7 @@ void D3D11DebugManager::RenderMesh(uint32_t eventID, const vector<MeshFormat> &s
if(fmt.buf != ResourceId())
{
meshColour = Vec4f(fmt.meshColour.x, fmt.meshColour.y, fmt.meshColour.z, 1.0f);
meshColour = Vec4f(fmt.meshColor.x, fmt.meshColor.y, fmt.meshColor.z, 1.0f);
FillCBuffer(meshColourBuf, &meshColour, sizeof(meshColour));
m_pImmediateContext->PSSetConstantBuffers(2, 1, &meshColourBuf);
@@ -4908,8 +4908,8 @@ void D3D11DebugManager::RenderMesh(uint32_t eventID, const vector<MeshFormat> &s
pixelData.OutputDisplayFormat = MESHDISPLAY_SOLID;
FillCBuffer(m_DebugRender.GenericPSCBuffer, &pixelData, sizeof(DebugPixelCBufferData));
meshColour = Vec4f(cfg.position.meshColour.x, cfg.position.meshColour.y,
cfg.position.meshColour.z, 1.0f);
meshColour =
Vec4f(cfg.position.meshColor.x, cfg.position.meshColor.y, cfg.position.meshColor.z, 1.0f);
FillCBuffer(meshColourBuf, &meshColour, sizeof(meshColour));
m_pImmediateContext->PSSetConstantBuffers(2, 1, &meshColourBuf);
renderdoc/driver/d3d11/d3d11_debug.h
+1 -1
View File
@@ -111,7 +111,7 @@ public:
void DestroyOutputWindow(uint64_t id);
bool CheckResizeOutputWindow(uint64_t id);
void GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h);
void ClearOutputWindowColour(uint64_t id, float col[4]);
void ClearOutputWindowColor(uint64_t id, float col[4]);
void ClearOutputWindowDepth(uint64_t id, float depth, uint8_t stencil);
void BindOutputWindow(uint64_t id, bool depth);
bool IsOutputWindowVisible(uint64_t id);
renderdoc/driver/d3d11/d3d11_replay.cpp
+2 -2
View File
@@ -1364,9 +1364,9 @@ void D3D11Replay::GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h)
m_pDevice->GetDebugManager()->GetOutputWindowDimensions(id, w, h);
}
void D3D11Replay::ClearOutputWindowColour(uint64_t id, float col[4])
void D3D11Replay::ClearOutputWindowColor(uint64_t id, float col[4])
{
m_pDevice->GetDebugManager()->ClearOutputWindowColour(id, col);
m_pDevice->GetDebugManager()->ClearOutputWindowColor(id, col);
}
void D3D11Replay::ClearOutputWindowDepth(uint64_t id, float depth, uint8_t stencil)
renderdoc/driver/d3d11/d3d11_replay.h
+1 -1
View File
@@ -86,7 +86,7 @@ public:
void DestroyOutputWindow(uint64_t id);
bool CheckResizeOutputWindow(uint64_t id);
void GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h);
void ClearOutputWindowColour(uint64_t id, float col[4]);
void ClearOutputWindowColor(uint64_t id, float col[4]);
void ClearOutputWindowDepth(uint64_t id, float depth, uint8_t stencil);
void BindOutputWindow(uint64_t id, bool depth);
bool IsOutputWindowVisible(uint64_t id);
renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp
+1 -1
View File
@@ -4219,7 +4219,7 @@ bool WrappedID3D12GraphicsCommandList::Serialise_ClearRenderTargetView(
DrawcallDescription draw;
draw.name = name;
draw.flags |= DrawFlags::Clear | DrawFlags::ClearColour;
draw.flags |= DrawFlags::Clear | DrawFlags::ClearColor;
m_Cmd->AddDrawcall(draw, true);
renderdoc/driver/d3d12/d3d12_commands.cpp
+1 -1
View File
@@ -1040,7 +1040,7 @@ void D3D12CommandData::AddUsage(D3D12DrawcallTreeNode &drawNode)
{
if(rts[i] != ResourceId())
drawNode.resourceUsage.push_back(
std::make_pair(rts[i], EventUsage(e, ResourceUsage::ColourTarget)));
std::make_pair(rts[i], EventUsage(e, ResourceUsage::ColorTarget)));
}
ResourceId id = state.GetDSVID();
renderdoc/driver/d3d12/d3d12_debug.cpp
+5 -5
View File
@@ -2067,7 +2067,7 @@ void D3D12DebugManager::GetOutputWindowDimensions(uint64_t id, int32_t &w, int32
h = m_OutputWindows[id].height;
}
void D3D12DebugManager::ClearOutputWindowColour(uint64_t id, float col[4])
void D3D12DebugManager::ClearOutputWindowColor(uint64_t id, float col[4])
{
if(id == 0 || m_OutputWindows.find(id) == m_OutputWindows.end())
return;
@@ -5354,7 +5354,7 @@ void D3D12DebugManager::RenderMesh(uint32_t eventID, const vector<MeshFormat> &s
if(fmt.buf != ResourceId())
{
list->SetGraphicsRoot32BitConstants(3, 4, &fmt.meshColour.x, 0);
list->SetGraphicsRoot32BitConstants(3, 4, &fmt.meshColor.x, 0);
MeshDisplayPipelines secondaryCache =
CacheMeshDisplayPipelines(secondaryDraws[i], secondaryDraws[i]);
@@ -5498,7 +5498,7 @@ void D3D12DebugManager::RenderMesh(uint32_t eventID, const vector<MeshFormat> &s
cfg.position.topo >= Topology::PatchList)
{
Vec4f wireCol =
Vec4f(cfg.position.meshColour.x, cfg.position.meshColour.y, cfg.position.meshColour.z, 1.0f);
Vec4f(cfg.position.meshColor.x, cfg.position.meshColor.y, cfg.position.meshColor.z, 1.0f);
pixelData.OutputDisplayFormat = MESHDISPLAY_SOLID;
@@ -5509,7 +5509,7 @@ void D3D12DebugManager::RenderMesh(uint32_t eventID, const vector<MeshFormat> &s
list->SetGraphicsRootConstantBufferView(1, UploadConstants(&pixelData, sizeof(pixelData)));
list->SetGraphicsRootConstantBufferView(2, vsCB);
list->SetGraphicsRoot32BitConstants(3, 4, &cfg.position.meshColour.x, 0);
list->SetGraphicsRoot32BitConstants(3, 4, &cfg.position.meshColor.x, 0);
if(cfg.position.idxByteWidth && cfg.position.idxbuf != ResourceId())
{
@@ -7064,7 +7064,7 @@ ResourceId D3D12DebugManager::ApplyCustomShader(ResourceId shader, ResourceId te
disp.CustomShader = shader;
disp.texid = texid;
disp.typeHint = typeHint;
disp.lightBackgroundColour = disp.darkBackgroundColour = FloatVector(0, 0, 0, 0);
disp.lightBackgroundColor = disp.darkBackgroundColor = FloatVector(0, 0, 0, 0);
disp.HDRMul = -1.0f;
disp.linearDisplayAsGamma = false;
disp.mip = mip;
renderdoc/driver/d3d12/d3d12_debug.h
+1 -1
View File
@@ -46,7 +46,7 @@ public:
void DestroyOutputWindow(uint64_t id);
bool CheckResizeOutputWindow(uint64_t id);
void GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h);
void ClearOutputWindowColour(uint64_t id, float col[4]);
void ClearOutputWindowColor(uint64_t id, float col[4]);
void ClearOutputWindowDepth(uint64_t id, float depth, uint8_t stencil);
void BindOutputWindow(uint64_t id, bool depth);
bool IsOutputWindowVisible(uint64_t id);
renderdoc/driver/d3d12/d3d12_replay.cpp
+2 -2
View File
@@ -1494,9 +1494,9 @@ void D3D12Replay::GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h)
m_pDevice->GetDebugManager()->GetOutputWindowDimensions(id, w, h);
}
void D3D12Replay::ClearOutputWindowColour(uint64_t id, float col[4])
void D3D12Replay::ClearOutputWindowColor(uint64_t id, float col[4])
{
m_pDevice->GetDebugManager()->ClearOutputWindowColour(id, col);
m_pDevice->GetDebugManager()->ClearOutputWindowColor(id, col);
}
void D3D12Replay::ClearOutputWindowDepth(uint64_t id, float depth, uint8_t stencil)
renderdoc/driver/d3d12/d3d12_replay.h
+1 -1
View File
@@ -84,7 +84,7 @@ public:
void DestroyOutputWindow(uint64_t id);
bool CheckResizeOutputWindow(uint64_t id);
void GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h);
void ClearOutputWindowColour(uint64_t id, float col[4]);
void ClearOutputWindowColor(uint64_t id, float col[4]);
void ClearOutputWindowDepth(uint64_t id, float depth, uint8_t stencil);
void BindOutputWindow(uint64_t id, bool depth);
bool IsOutputWindowVisible(uint64_t id);
renderdoc/driver/gl/gl_common.cpp
+1 -1
View File
@@ -2215,7 +2215,7 @@ void CopyProgramFragDataBindings(const GLHookSet &gl, GLuint progsrc, GLuint pro
for(int32_t i = 0; i < refl->OutputSig.count; i++)
{
// only look at colour outputs (should be the only outputs from fs)
if(refl->OutputSig[i].systemValue != ShaderBuiltin::ColourOutput)
if(refl->OutputSig[i].systemValue != ShaderBuiltin::ColorOutput)
continue;
GLint idx = gl.glGetFragDataLocation(progsrc, refl->OutputSig[i].varName.elems);
renderdoc/driver/gl/gl_debug.cpp
+3 -4
View File
@@ -4665,8 +4665,7 @@ void GLReplay::RenderMesh(uint32_t eventID, const vector<MeshFormat> &secondaryD
if(fmt.buf != ResourceId())
{
uboParams.color =
Vec4f(fmt.meshColour.x, fmt.meshColour.y, fmt.meshColour.z, fmt.meshColour.w);
uboParams.color = Vec4f(fmt.meshColor.x, fmt.meshColor.y, fmt.meshColor.z, fmt.meshColor.w);
uboptr = (MeshUBOData *)gl.glMapBufferRange(eGL_UNIFORM_BUFFER, 0, sizeof(MeshUBOData),
GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT);
@@ -4875,8 +4874,8 @@ void GLReplay::RenderMesh(uint32_t eventID, const vector<MeshFormat> &secondaryD
// wireframe render
if(cfg.solidShadeMode == SolidShade::NoSolid || cfg.wireframeDraw || topo == eGL_PATCHES)
{
uboParams.color = Vec4f(cfg.position.meshColour.x, cfg.position.meshColour.y,
cfg.position.meshColour.z, cfg.position.meshColour.w);
uboParams.color = Vec4f(cfg.position.meshColor.x, cfg.position.meshColor.y,
cfg.position.meshColor.z, cfg.position.meshColor.w);
uboParams.displayFormat = MESHDISPLAY_SOLID;
renderdoc/driver/gl/gl_driver.cpp
+2 -2
View File
@@ -4113,10 +4113,10 @@ void WrappedOpenGL::AddUsage(const DrawcallDescription &d)
{
if(type == eGL_TEXTURE)
m_ResourceUses[rm->GetID(TextureRes(ctx, attachment))].push_back(
EventUsage(e, ResourceUsage::ColourTarget));
EventUsage(e, ResourceUsage::ColorTarget));
else
m_ResourceUses[rm->GetID(RenderbufferRes(ctx, attachment))].push_back(
EventUsage(e, ResourceUsage::ColourTarget));
EventUsage(e, ResourceUsage::ColorTarget));
}
}
renderdoc/driver/gl/gl_replay.cpp
+2 -2
View File
@@ -315,7 +315,7 @@ void GLReplay::BindOutputWindow(uint64_t id, bool depth)
DebugData.outHeight = float(outw.height);
}
void GLReplay::ClearOutputWindowColour(uint64_t id, float col[4])
void GLReplay::ClearOutputWindowColor(uint64_t id, float col[4])
{
if(id == 0 || m_OutputWindows.find(id) == m_OutputWindows.end())
return;
@@ -2674,7 +2674,7 @@ ResourceId GLReplay::ApplyCustomShader(ResourceId shader, ResourceId texid, uint
disp.CustomShader = shader;
disp.texid = texid;
disp.typeHint = typeHint;
disp.lightBackgroundColour = disp.darkBackgroundColour = FloatVector(0, 0, 0, 0);
disp.lightBackgroundColor = disp.darkBackgroundColor = FloatVector(0, 0, 0, 0);
disp.HDRMul = -1.0f;
disp.linearDisplayAsGamma = false;
disp.mip = mip;
renderdoc/driver/gl/gl_replay.h
+1 -1
View File
@@ -135,7 +135,7 @@ public:
void DestroyOutputWindow(uint64_t id);
bool CheckResizeOutputWindow(uint64_t id);
void GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h);
void ClearOutputWindowColour(uint64_t id, float col[4]);
void ClearOutputWindowColor(uint64_t id, float col[4]);
void ClearOutputWindowDepth(uint64_t id, float depth, uint8_t stencil);
void BindOutputWindow(uint64_t id, bool depth);
bool IsOutputWindowVisible(uint64_t id);
renderdoc/driver/gl/gl_shader_refl.cpp
+1 -1
View File
@@ -1912,7 +1912,7 @@ void MakeShaderReflection(const GLHookSet &gl, GLenum shadType, GLuint sepProg,
#undef IS_BUILTIN
if(shadType == eGL_FRAGMENT_SHADER && sigEnum == eGL_PROGRAM_OUTPUT &&
sig.systemValue == ShaderBuiltin::Undefined)
sig.systemValue = ShaderBuiltin::ColourOutput;
sig.systemValue = ShaderBuiltin::ColorOutput;
if(sig.systemValue == ShaderBuiltin::Undefined)
sig.regIndex = values[2] >= 0 ? values[2] : i;
renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp
+4 -4
View File
@@ -3032,7 +3032,7 @@ bool WrappedOpenGL::Serialise_glClearNamedFramebufferfv(GLuint framebuffer, GLen
draw.name = name;
draw.flags |= DrawFlags::Clear;
if(buf == eGL_COLOR)
draw.flags |= DrawFlags::ClearColour;
draw.flags |= DrawFlags::ClearColor;
else
draw.flags |= DrawFlags::ClearDepthStencil;
@@ -3170,7 +3170,7 @@ bool WrappedOpenGL::Serialise_glClearNamedFramebufferiv(GLuint framebuffer, GLen
draw.name = name;
draw.flags |= DrawFlags::Clear;
if(buf == eGL_COLOR)
draw.flags |= DrawFlags::ClearColour;
draw.flags |= DrawFlags::ClearColor;
else
draw.flags |= DrawFlags::ClearDepthStencil;
@@ -3285,7 +3285,7 @@ bool WrappedOpenGL::Serialise_glClearNamedFramebufferuiv(GLuint framebuffer, GLe
DrawcallDescription draw;
draw.name = name;
draw.flags |= DrawFlags::Clear | DrawFlags::ClearColour;
draw.flags |= DrawFlags::Clear | DrawFlags::ClearColor;
AddDrawcall(draw, true);
@@ -3776,7 +3776,7 @@ bool WrappedOpenGL::Serialise_glClear(GLbitfield mask)
draw.name = name;
draw.flags |= DrawFlags::Clear;
if(Mask & GL_COLOR_BUFFER_BIT)
draw.flags |= DrawFlags::ClearColour;
draw.flags |= DrawFlags::ClearColor;
if(Mask & (eGL_DEPTH_BUFFER_BIT | eGL_STENCIL_BUFFER_BIT))
draw.flags |= DrawFlags::ClearDepthStencil;
renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp
+3 -3
View File
@@ -261,7 +261,7 @@ ShaderBuiltin GetSystemValue(SVSemantic systemValue)
case SVNAME_FINAL_TRI_INSIDE_TESSFACTOR: return ShaderBuiltin::InsideTessFactor;
case SVNAME_FINAL_LINE_DETAIL_TESSFACTOR: return ShaderBuiltin::OuterTessFactor;
case SVNAME_FINAL_LINE_DENSITY_TESSFACTOR: return ShaderBuiltin::InsideTessFactor;
case SVNAME_TARGET: return ShaderBuiltin::ColourOutput;
case SVNAME_TARGET: return ShaderBuiltin::ColorOutput;
case SVNAME_DEPTH: return ShaderBuiltin::DepthOutput;
case SVNAME_COVERAGE: return ShaderBuiltin::MSAACoverage;
case SVNAME_DEPTH_GREATER_EQUAL: return ShaderBuiltin::DepthOutputGreaterEqual;
@@ -892,7 +892,7 @@ DXBCFile::DXBCFile(const void *ByteCode, size_t ByteCodeLength)
// pixel shader outputs with registers are always targets
if(m_Type == D3D11_ShaderType_Pixel && output &&
desc.systemValue == ShaderBuiltin::Undefined && desc.regIndex >= 0 && desc.regIndex <= 16)
desc.systemValue = ShaderBuiltin::ColourOutput;
desc.systemValue = ShaderBuiltin::ColorOutput;
// check system value semantics
if(desc.systemValue == ShaderBuiltin::Undefined)
@@ -936,7 +936,7 @@ DXBCFile::DXBCFile(const void *ByteCode, size_t ByteCodeLength)
if(!_stricmp(desc.semanticName.elems, "SV_InsideTessFactor"))
desc.systemValue = ShaderBuiltin::InsideTessFactor;
if(!_stricmp(desc.semanticName.elems, "SV_Target"))
desc.systemValue = ShaderBuiltin::ColourOutput;
desc.systemValue = ShaderBuiltin::ColorOutput;
if(!_stricmp(desc.semanticName.elems, "SV_Depth"))
desc.systemValue = ShaderBuiltin::DepthOutput;
if(!_stricmp(desc.semanticName.elems, "SV_Coverage"))
renderdoc/driver/shaders/spirv/spirv_disassemble.cpp
+1 -1
View File
@@ -3733,7 +3733,7 @@ void AddSignatureParameter(ShaderStage stage, uint32_t id, uint32_t childIdx, st
// fragment shader outputs are implicitly colour outputs
if(stage == ShaderStage::Fragment && type->storage == spv::StorageClassOutput)
sig.systemValue = ShaderBuiltin::ColourOutput;
sig.systemValue = ShaderBuiltin::ColorOutput;
if(type->type == SPVTypeData::ePointer)
type = type->baseType;
renderdoc/driver/vulkan/vk_core.cpp
+1 -1
View File
@@ -3020,7 +3020,7 @@ void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode, vector<DebugMessa
continue;
drawNode.resourceUsage.push_back(
std::make_pair(c.m_ImageView[fb.attachments[att].view].image,
EventUsage(e, ResourceUsage::ColourTarget, fb.attachments[att].view)));
EventUsage(e, ResourceUsage::ColorTarget, fb.attachments[att].view)));
}
if(rp.subpasses[state.subpass].depthstencilAttachment >= 0)
renderdoc/driver/vulkan/vk_replay.cpp
+4 -4
View File
@@ -1783,7 +1783,7 @@ void VulkanReplay::RenderMesh(uint32_t eventID, const vector<MeshFormat> &second
MeshUBOData *data = (MeshUBOData *)GetDebugManager()->m_MeshUBO.Map(&uboOffs);
data->mvp = ModelViewProj;
data->color = Vec4f(fmt.meshColour.x, fmt.meshColour.y, fmt.meshColour.z, fmt.meshColour.w);
data->color = Vec4f(fmt.meshColor.x, fmt.meshColor.y, fmt.meshColor.z, fmt.meshColor.w);
data->homogenousInput = cfg.position.unproject;
data->pointSpriteSize = Vec2f(0.0f, 0.0f);
data->displayFormat = MESHDISPLAY_SOLID;
@@ -1957,7 +1957,7 @@ void VulkanReplay::RenderMesh(uint32_t eventID, const vector<MeshFormat> &second
cfg.position.topo >= Topology::PatchList)
{
Vec4f wireCol =
Vec4f(cfg.position.meshColour.x, cfg.position.meshColour.y, cfg.position.meshColour.z, 1.0f);
Vec4f(cfg.position.meshColor.x, cfg.position.meshColor.y, cfg.position.meshColor.z, 1.0f);
uint32_t uboOffs = 0;
MeshUBOData *data = (MeshUBOData *)GetDebugManager()->m_MeshUBO.Map(&uboOffs);
@@ -2894,7 +2894,7 @@ void VulkanReplay::BindOutputWindow(uint64_t id, bool depth)
#endif
}
void VulkanReplay::ClearOutputWindowColour(uint64_t id, float col[4])
void VulkanReplay::ClearOutputWindowColor(uint64_t id, float col[4])
{
auto it = m_OutputWindows.find(id);
if(id == 0 || it == m_OutputWindows.end())
@@ -5424,7 +5424,7 @@ ResourceId VulkanReplay::ApplyCustomShader(ResourceId shader, ResourceId texid,
disp.CustomShader = shader;
disp.texid = texid;
disp.typeHint = typeHint;
disp.lightBackgroundColour = disp.darkBackgroundColour = FloatVector(0, 0, 0, 0);
disp.lightBackgroundColor = disp.darkBackgroundColor = FloatVector(0, 0, 0, 0);
disp.HDRMul = -1.0f;
disp.linearDisplayAsGamma = false;
disp.mip = mip;
renderdoc/driver/vulkan/vk_replay.h
+1 -1
View File
@@ -167,7 +167,7 @@ public:
void DestroyOutputWindow(uint64_t id);
bool CheckResizeOutputWindow(uint64_t id);
void GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h);
void ClearOutputWindowColour(uint64_t id, float col[4]);
void ClearOutputWindowColor(uint64_t id, float col[4]);
void ClearOutputWindowDepth(uint64_t id, float depth, uint8_t stencil);
void BindOutputWindow(uint64_t id, bool depth);
bool IsOutputWindowVisible(uint64_t id);
renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
+8 -8
View File
@@ -2641,10 +2641,10 @@ bool WrappedVulkan::Serialise_vkCmdDebugMarkerBeginEXT(Serialiser *localSerialis
draw.name = name;
draw.flags |= DrawFlags::PushMarker;
draw.markerColour[0] = RDCCLAMP(color[0], 0.0f, 1.0f);
draw.markerColour[1] = RDCCLAMP(color[1], 0.0f, 1.0f);
draw.markerColour[2] = RDCCLAMP(color[2], 0.0f, 1.0f);
draw.markerColour[3] = RDCCLAMP(color[3], 0.0f, 1.0f);
draw.markerColor[0] = RDCCLAMP(color[0], 0.0f, 1.0f);
draw.markerColor[1] = RDCCLAMP(color[1], 0.0f, 1.0f);
draw.markerColor[2] = RDCCLAMP(color[2], 0.0f, 1.0f);
draw.markerColor[3] = RDCCLAMP(color[3], 0.0f, 1.0f);
AddDrawcall(draw, false);
}
@@ -2743,10 +2743,10 @@ bool WrappedVulkan::Serialise_vkCmdDebugMarkerInsertEXT(Serialiser *localSeriali
draw.name = name;
draw.flags |= DrawFlags::SetMarker;
draw.markerColour[0] = RDCCLAMP(color[0], 0.0f, 1.0f);
draw.markerColour[1] = RDCCLAMP(color[1], 0.0f, 1.0f);
draw.markerColour[2] = RDCCLAMP(color[2], 0.0f, 1.0f);
draw.markerColour[3] = RDCCLAMP(color[3], 0.0f, 1.0f);
draw.markerColor[0] = RDCCLAMP(color[0], 0.0f, 1.0f);
draw.markerColor[1] = RDCCLAMP(color[1], 0.0f, 1.0f);
draw.markerColor[2] = RDCCLAMP(color[2], 0.0f, 1.0f);
draw.markerColor[3] = RDCCLAMP(color[3], 0.0f, 1.0f);
AddDrawcall(draw, false);
}
renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp
+6 -6
View File
@@ -1786,20 +1786,20 @@ bool WrappedVulkan::Serialise_vkCmdClearColorImage(Serialiser *localSerialiser,
commandBuffer = RerecordCmdBuf(cmdid);
uint32_t eventID =
HandlePreCallback(commandBuffer, DrawFlags(DrawFlags::Clear | DrawFlags::ClearColour));
HandlePreCallback(commandBuffer, DrawFlags(DrawFlags::Clear | DrawFlags::ClearColor));
ObjDisp(commandBuffer)
->CmdClearColorImage(Unwrap(commandBuffer), Unwrap(image), layout, &col, count, ranges);
if(eventID &&
m_DrawcallCallback->PostMisc(eventID, DrawFlags(DrawFlags::Clear | DrawFlags::ClearColour),
m_DrawcallCallback->PostMisc(eventID, DrawFlags(DrawFlags::Clear | DrawFlags::ClearColor),
commandBuffer))
{
ObjDisp(commandBuffer)
->CmdClearColorImage(Unwrap(commandBuffer), Unwrap(image), layout, &col, count, ranges);
m_DrawcallCallback->PostRemisc(
eventID, DrawFlags(DrawFlags::Clear | DrawFlags::ClearColour), commandBuffer);
m_DrawcallCallback->PostRemisc(eventID, DrawFlags(DrawFlags::Clear | DrawFlags::ClearColor),
commandBuffer);
}
}
}
@@ -1819,7 +1819,7 @@ bool WrappedVulkan::Serialise_vkCmdClearColorImage(Serialiser *localSerialiser,
DrawcallDescription draw;
draw.name = name;
draw.flags |= DrawFlags::Clear | DrawFlags::ClearColour;
draw.flags |= DrawFlags::Clear | DrawFlags::ClearColor;
AddDrawcall(draw, true);
@@ -2027,7 +2027,7 @@ bool WrappedVulkan::Serialise_vkCmdClearAttachments(Serialiser *localSerialiser,
for(uint32_t a = 0; a < acount; a++)
{
if(atts[a].aspectMask & VK_IMAGE_ASPECT_COLOR_BIT)
draw.flags |= DrawFlags::ClearColour;
draw.flags |= DrawFlags::ClearColor;
if(atts[a].aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT)
draw.flags |= DrawFlags::ClearDepthStencil;
}
renderdoc/replay/replay_driver.h
+1 -1
View File
@@ -165,7 +165,7 @@ public:
virtual void DestroyOutputWindow(uint64_t id) = 0;
virtual bool CheckResizeOutputWindow(uint64_t id) = 0;
virtual void GetOutputWindowDimensions(uint64_t id, int32_t &w, int32_t &h) = 0;
virtual void ClearOutputWindowColour(uint64_t id, float col[4]) = 0;
virtual void ClearOutputWindowColor(uint64_t id, float col[4]) = 0;
virtual void ClearOutputWindowDepth(uint64_t id, float depth, uint8_t stencil) = 0;
virtual void BindOutputWindow(uint64_t id, bool depth) = 0;
virtual bool IsOutputWindowVisible(uint64_t id) = 0;
renderdoc/replay/replay_output.cpp
+14 -14
View File
@@ -518,7 +518,7 @@ void ReplayOutput::DisplayContext()
return;
}
m_pDevice->ClearOutputWindowColour(m_PixelContext.outputID, color);
m_pDevice->ClearOutputWindowColor(m_PixelContext.outputID, color);
TextureDisplay disp = m_RenderData.texDisplay;
disp.rawoutput = false;
@@ -598,7 +598,7 @@ bool ReplayOutput::Display()
m_pDevice->BindOutputWindow(m_Thumbnails[i].outputID, false);
color[0] = 0.4f;
m_pDevice->ClearOutputWindowColour(m_Thumbnails[i].outputID, color);
m_pDevice->ClearOutputWindowColor(m_Thumbnails[i].outputID, color);
m_pDevice->RenderCheckerboard(Vec3f(0.6f, 0.6f, 0.7f), Vec3f(0.5f, 0.5f, 0.6f));
@@ -607,7 +607,7 @@ bool ReplayOutput::Display()
}
m_pDevice->BindOutputWindow(m_Thumbnails[i].outputID, false);
m_pDevice->ClearOutputWindowColour(m_Thumbnails[i].outputID, color);
m_pDevice->ClearOutputWindowColor(m_Thumbnails[i].outputID, color);
TextureDisplay disp;
@@ -630,7 +630,7 @@ bool ReplayOutput::Display()
disp.rawoutput = false;
disp.overlay = DebugOverlay::NoOverlay;
disp.lightBackgroundColour = disp.darkBackgroundColour = FloatVector();
disp.lightBackgroundColor = disp.darkBackgroundColor = FloatVector();
if(m_Thumbnails[i].typeHint == CompType::SNorm)
disp.rangemin = -1.0f;
@@ -683,7 +683,7 @@ void ReplayOutput::DisplayTex()
{
float color[4] = {0.0f, 0.0f, 0.0f, 0.0f};
m_pDevice->BindOutputWindow(m_MainOutput.outputID, false);
m_pDevice->ClearOutputWindowColour(m_MainOutput.outputID, color);
m_pDevice->ClearOutputWindowColor(m_MainOutput.outputID, color);
return;
}
if(m_Width <= 0 || m_Height <= 0)
@@ -723,13 +723,13 @@ void ReplayOutput::DisplayTex()
float color[4] = {0.0f, 0.0f, 0.0f, 0.0f};
m_pDevice->BindOutputWindow(m_MainOutput.outputID, false);
m_pDevice->ClearOutputWindowColour(m_MainOutput.outputID, color);
m_pDevice->ClearOutputWindowColor(m_MainOutput.outputID, color);
m_pDevice->RenderCheckerboard(
Vec3f(texDisplay.lightBackgroundColour.x, texDisplay.lightBackgroundColour.y,
texDisplay.lightBackgroundColour.z),
Vec3f(texDisplay.darkBackgroundColour.x, texDisplay.darkBackgroundColour.y,
texDisplay.darkBackgroundColour.z));
Vec3f(texDisplay.lightBackgroundColor.x, texDisplay.lightBackgroundColor.y,
texDisplay.lightBackgroundColor.z),
Vec3f(texDisplay.darkBackgroundColor.x, texDisplay.darkBackgroundColor.y,
texDisplay.darkBackgroundColor.z));
m_pDevice->RenderTexture(texDisplay);
@@ -763,7 +763,7 @@ void ReplayOutput::DisplayMesh()
{
float color[4] = {0.0f, 0.0f, 0.0f, 0.0f};
m_pDevice->BindOutputWindow(m_MainOutput.outputID, false);
m_pDevice->ClearOutputWindowColour(m_MainOutput.outputID, color);
m_pDevice->ClearOutputWindowColor(m_MainOutput.outputID, color);
m_pDevice->ClearOutputWindowDepth(m_MainOutput.outputID, 1.0f, 0);
m_pDevice->RenderCheckerboard(Vec3f(0.81f, 0.81f, 0.81f), Vec3f(0.57f, 0.57f, 0.57f));
@@ -821,7 +821,7 @@ void ReplayOutput::DisplayMesh()
if(fmt.buf == ResourceId())
fmt = m_pDevice->GetPostVSBuffers(passEvents[i], inst, MeshDataStage::VSOut);
fmt.meshColour = passDraws;
fmt.meshColor = passDraws;
// if unproject is marked, this output had a 'real' system position output
if(fmt.unproject)
@@ -846,7 +846,7 @@ void ReplayOutput::DisplayMesh()
if(fmt.buf == ResourceId())
fmt = m_pDevice->GetPostVSBuffers(draw->eventID, inst, MeshDataStage::VSOut);
fmt.meshColour = otherInstances;
fmt.meshColor = otherInstances;
// if unproject is marked, this output had a 'real' system position output
if(fmt.unproject)
@@ -855,7 +855,7 @@ void ReplayOutput::DisplayMesh()
}
}
mesh.position.meshColour = drawItself;
mesh.position.meshColor = drawItself;
m_pDevice->RenderMesh(m_EventID, secondaryDraws, mesh);
}
renderdoc/replay/replay_renderer.cpp
+1 -1
View File
@@ -1316,7 +1316,7 @@ bool ReplayRenderer::PixelHistory(ResourceId target, uint32_t x, uint32_t y, uin
case ResourceUsage::PS_RWResource:
case ResourceUsage::CS_RWResource:
case ResourceUsage::All_RWResource:
case ResourceUsage::ColourTarget:
case ResourceUsage::ColorTarget:
case ResourceUsage::DepthStencilTarget:
case ResourceUsage::Clear:
case ResourceUsage::Copy:
renderdoccmd/renderdoccmd.cpp
+2 -2
View File
@@ -69,8 +69,8 @@ void DisplayRendererPreview(IReplayRenderer *renderer, uint32_t width, uint32_t
d.offy = 0.0f;
d.sliceFace = 0;
d.rawoutput = false;
d.lightBackgroundColour = FloatVector(0.81f, 0.81f, 0.81f, 1.0f);
d.darkBackgroundColour = FloatVector(0.57f, 0.57f, 0.57f, 1.0f);
d.lightBackgroundColor = FloatVector(0.81f, 0.81f, 0.81f, 1.0f);
d.darkBackgroundColor = FloatVector(0.57f, 0.57f, 0.57f, 1.0f);
d.Red = d.Green = d.Blue = true;
d.Alpha = false;