From 637d4089e26bbfea2ec57e04093a3e7f3e475501 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 30 Mar 2017 14:49:55 +0100 Subject: [PATCH] Rename colour to color in public API code * Following the principle of least surprise, color tends to be more commonly used in APIs and graphics code even outside the USA. --- qrenderdoc/Code/PersistantConfig.h | 4 +-- qrenderdoc/Code/QRDUtils.cpp | 8 ++--- qrenderdoc/Code/QRDUtils.h | 4 +-- qrenderdoc/Windows/Dialogs/SettingsDialog.cpp | 14 ++++---- qrenderdoc/Windows/Dialogs/SettingsDialog.h | 4 +-- qrenderdoc/Windows/Dialogs/SettingsDialog.ui | 16 ++++----- .../Windows/Dialogs/TextureSaveDialog.cpp | 4 +-- .../PipelineState/GLPipelineStateViewer.cpp | 2 +- .../VulkanPipelineStateViewer.cpp | 2 +- qrenderdoc/Windows/TextureViewer.cpp | 34 +++++++++---------- renderdoc/api/replay/control_types.h | 6 ++-- renderdoc/api/replay/data_types.h | 4 +-- renderdoc/api/replay/replay_enums.h | 8 ++--- renderdoc/core/image_viewer.cpp | 4 +-- renderdoc/core/replay_proxy.cpp | 6 ++-- renderdoc/core/replay_proxy.h | 4 +-- renderdoc/driver/d3d11/d3d11_analyse.cpp | 2 +- renderdoc/driver/d3d11/d3d11_context.cpp | 4 +-- renderdoc/driver/d3d11/d3d11_context_wrap.cpp | 18 +++++----- renderdoc/driver/d3d11/d3d11_debug.cpp | 8 ++--- renderdoc/driver/d3d11/d3d11_debug.h | 2 +- renderdoc/driver/d3d11/d3d11_replay.cpp | 4 +-- renderdoc/driver/d3d11/d3d11_replay.h | 2 +- .../driver/d3d12/d3d12_command_list_wrap.cpp | 2 +- renderdoc/driver/d3d12/d3d12_commands.cpp | 2 +- renderdoc/driver/d3d12/d3d12_debug.cpp | 10 +++--- renderdoc/driver/d3d12/d3d12_debug.h | 2 +- renderdoc/driver/d3d12/d3d12_replay.cpp | 4 +-- renderdoc/driver/d3d12/d3d12_replay.h | 2 +- renderdoc/driver/gl/gl_common.cpp | 2 +- renderdoc/driver/gl/gl_debug.cpp | 7 ++-- renderdoc/driver/gl/gl_driver.cpp | 4 +-- renderdoc/driver/gl/gl_replay.cpp | 4 +-- renderdoc/driver/gl/gl_replay.h | 2 +- renderdoc/driver/gl/gl_shader_refl.cpp | 2 +- .../driver/gl/wrappers/gl_draw_funcs.cpp | 8 ++--- .../driver/shaders/dxbc/dxbc_inspect.cpp | 6 ++-- .../shaders/spirv/spirv_disassemble.cpp | 2 +- renderdoc/driver/vulkan/vk_core.cpp | 2 +- renderdoc/driver/vulkan/vk_replay.cpp | 8 ++--- renderdoc/driver/vulkan/vk_replay.h | 2 +- .../driver/vulkan/wrappers/vk_cmd_funcs.cpp | 16 ++++----- .../driver/vulkan/wrappers/vk_draw_funcs.cpp | 12 +++---- renderdoc/replay/replay_driver.h | 2 +- renderdoc/replay/replay_output.cpp | 28 +++++++-------- renderdoc/replay/replay_renderer.cpp | 2 +- renderdoccmd/renderdoccmd.cpp | 4 +-- 47 files changed, 149 insertions(+), 150 deletions(-) diff --git a/qrenderdoc/Code/PersistantConfig.h b/qrenderdoc/Code/PersistantConfig.h index 112acfe12..eb2debdb0 100644 --- a/qrenderdoc/Code/PersistantConfig.h +++ b/qrenderdoc/Code/PersistantConfig.h @@ -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) \ \ diff --git a/qrenderdoc/Code/QRDUtils.cpp b/qrenderdoc/Code/QRDUtils.cpp index fff4efc01..574c9a88e 100644 --- a/qrenderdoc/Code/QRDUtils.cpp +++ b/qrenderdoc/Code/QRDUtils.cpp @@ -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); diff --git a/qrenderdoc/Code/QRDUtils.h b/qrenderdoc/Code/QRDUtils.h index e6360067a..7f2c8f543 100644 --- a/qrenderdoc/Code/QRDUtils.h +++ b/qrenderdoc/Code/QRDUtils.h @@ -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)"; diff --git a/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp b/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp index 1e95ca6a2..b2023c71d 100644 --- a/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp @@ -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(); } diff --git a/qrenderdoc/Windows/Dialogs/SettingsDialog.h b/qrenderdoc/Windows/Dialogs/SettingsDialog.h index 9a6c17958..4d6fed7f5 100644 --- a/qrenderdoc/Windows/Dialogs/SettingsDialog.h +++ b/qrenderdoc/Windows/Dialogs/SettingsDialog.h @@ -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(); diff --git a/qrenderdoc/Windows/Dialogs/SettingsDialog.ui b/qrenderdoc/Windows/Dialogs/SettingsDialog.ui index 55ab4c29d..cd8e96ae0 100644 --- a/qrenderdoc/Windows/Dialogs/SettingsDialog.ui +++ b/qrenderdoc/Windows/Dialogs/SettingsDialog.ui @@ -784,9 +784,9 @@ If {spv_disas} is not used, the tool is expected to output the disassembly on st - + - In the Event Browser and Timeline Bar, marker sections and marker labels will be coloured with an API-specified colour. + In the Event Browser and Timeline Bar, marker sections and marker labels will be colored with an API-specified color. @@ -795,9 +795,9 @@ If {spv_disas} is not used, the tool is expected to output the disassembly on st - + - 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. + 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. @@ -807,21 +807,21 @@ If {spv_disas} is not used, the tool is expected to output the disassembly on st - In the Event Browser and Timeline Bar, marker sections and marker labels will be coloured with an API-specified colour. + In the Event Browser and Timeline Bar, marker sections and marker labels will be colored with an API-specified color. - Apply marker colours (requires file reload) + Apply marker colors (requires file reload) - 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. + 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. - - Colourise whole row for marker regions + - Colorise whole row for marker regions diff --git a/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp b/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp index 884ad264c..7b0835c55 100644 --- a/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp @@ -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) diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp index 7c15ca92d..b3798ae23 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp @@ -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)); } diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp index 3e86fbab0..41f452474 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp @@ -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)); } diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp index 6e4b97e51..759472339 100644 --- a/qrenderdoc/Windows/TextureViewer.cpp +++ b/qrenderdoc/Windows/TextureViewer.cpp @@ -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()) { diff --git a/renderdoc/api/replay/control_types.h b/renderdoc/api/replay/control_types.h index c88eaa444..9cafbc5f1 100644 --- a/renderdoc/api/replay/control_types.h +++ b/renderdoc/api/replay/control_types.h @@ -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; }; diff --git a/renderdoc/api/replay/data_types.h b/renderdoc/api/replay/data_types.h index c4530aa20..bb7fdddb5 100644 --- a/renderdoc/api/replay/data_types.h +++ b/renderdoc/api/replay/data_types.h @@ -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; diff --git a/renderdoc/api/replay/replay_enums.h b/renderdoc/api/replay/replay_enums.h index a4e02ca8d..ad2b61845 100644 --- a/renderdoc/api/replay/replay_enums.h +++ b/renderdoc/api/replay/replay_enums.h @@ -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, diff --git a/renderdoc/core/image_viewer.cpp b/renderdoc/core/image_viewer.cpp index b4d487ab8..dd3c8cff3 100644 --- a/renderdoc/core/image_viewer.cpp +++ b/renderdoc/core/image_viewer.cpp @@ -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) { diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp index 7e7cbc5e8..fa6eb82d4 100644 --- a/renderdoc/core/replay_proxy.cpp +++ b/renderdoc/core/replay_proxy.cpp @@ -86,7 +86,7 @@ string ToStrHelper::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); diff --git a/renderdoc/core/replay_proxy.h b/renderdoc/core/replay_proxy.h index 40396b0e3..d24199a9c 100644 --- a/renderdoc/core/replay_proxy.h +++ b/renderdoc/core/replay_proxy.h @@ -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) { diff --git a/renderdoc/driver/d3d11/d3d11_analyse.cpp b/renderdoc/driver/d3d11/d3d11_analyse.cpp index 1b92724f0..9b8a74aab 100644 --- a/renderdoc/driver/d3d11/d3d11_analyse.cpp +++ b/renderdoc/driver/d3d11/d3d11_analyse.cpp @@ -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; diff --git a/renderdoc/driver/d3d11/d3d11_context.cpp b/renderdoc/driver/d3d11/d3d11_context.cpp index 2e60fd0cb..6485aace1 100644 --- a/renderdoc/driver/d3d11/d3d11_context.cpp +++ b/renderdoc/driver/d3d11/d3d11_context.cpp @@ -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; diff --git a/renderdoc/driver/d3d11/d3d11_context_wrap.cpp b/renderdoc/driver/d3d11/d3d11_context_wrap.cpp index 2fb6a2ad6..4742e962c 100644 --- a/renderdoc/driver/d3d11/d3d11_context_wrap.cpp +++ b/renderdoc/driver/d3d11/d3d11_context_wrap.cpp @@ -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); diff --git a/renderdoc/driver/d3d11/d3d11_debug.cpp b/renderdoc/driver/d3d11/d3d11_debug.cpp index a7798ec09..162a1ae47 100644 --- a/renderdoc/driver/d3d11/d3d11_debug.cpp +++ b/renderdoc/driver/d3d11/d3d11_debug.cpp @@ -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 &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 &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); diff --git a/renderdoc/driver/d3d11/d3d11_debug.h b/renderdoc/driver/d3d11/d3d11_debug.h index 7e1f1d68a..acfa09139 100644 --- a/renderdoc/driver/d3d11/d3d11_debug.h +++ b/renderdoc/driver/d3d11/d3d11_debug.h @@ -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); diff --git a/renderdoc/driver/d3d11/d3d11_replay.cpp b/renderdoc/driver/d3d11/d3d11_replay.cpp index 12523eb7a..e043ca49e 100644 --- a/renderdoc/driver/d3d11/d3d11_replay.cpp +++ b/renderdoc/driver/d3d11/d3d11_replay.cpp @@ -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) diff --git a/renderdoc/driver/d3d11/d3d11_replay.h b/renderdoc/driver/d3d11/d3d11_replay.h index 72afcde4d..95e31aa60 100644 --- a/renderdoc/driver/d3d11/d3d11_replay.h +++ b/renderdoc/driver/d3d11/d3d11_replay.h @@ -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); diff --git a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp index 3e0824116..7009f9620 100644 --- a/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_command_list_wrap.cpp @@ -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); diff --git a/renderdoc/driver/d3d12/d3d12_commands.cpp b/renderdoc/driver/d3d12/d3d12_commands.cpp index d0cec62ef..9c635426b 100644 --- a/renderdoc/driver/d3d12/d3d12_commands.cpp +++ b/renderdoc/driver/d3d12/d3d12_commands.cpp @@ -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(); diff --git a/renderdoc/driver/d3d12/d3d12_debug.cpp b/renderdoc/driver/d3d12/d3d12_debug.cpp index 8b23c48a4..bd3ecd33a 100644 --- a/renderdoc/driver/d3d12/d3d12_debug.cpp +++ b/renderdoc/driver/d3d12/d3d12_debug.cpp @@ -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 &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 &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 &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; diff --git a/renderdoc/driver/d3d12/d3d12_debug.h b/renderdoc/driver/d3d12/d3d12_debug.h index ae80b40f9..e1932c09e 100644 --- a/renderdoc/driver/d3d12/d3d12_debug.h +++ b/renderdoc/driver/d3d12/d3d12_debug.h @@ -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); diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp index 8f93b8d2c..a3babec2b 100644 --- a/renderdoc/driver/d3d12/d3d12_replay.cpp +++ b/renderdoc/driver/d3d12/d3d12_replay.cpp @@ -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) diff --git a/renderdoc/driver/d3d12/d3d12_replay.h b/renderdoc/driver/d3d12/d3d12_replay.h index 5276deced..eeaa7af6f 100644 --- a/renderdoc/driver/d3d12/d3d12_replay.h +++ b/renderdoc/driver/d3d12/d3d12_replay.h @@ -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); diff --git a/renderdoc/driver/gl/gl_common.cpp b/renderdoc/driver/gl/gl_common.cpp index 013fdcd38..e62d65383 100644 --- a/renderdoc/driver/gl/gl_common.cpp +++ b/renderdoc/driver/gl/gl_common.cpp @@ -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); diff --git a/renderdoc/driver/gl/gl_debug.cpp b/renderdoc/driver/gl/gl_debug.cpp index 8bc71c798..ca86592cd 100644 --- a/renderdoc/driver/gl/gl_debug.cpp +++ b/renderdoc/driver/gl/gl_debug.cpp @@ -4665,8 +4665,7 @@ void GLReplay::RenderMesh(uint32_t eventID, const vector &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 &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; diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp index 27c0c191e..e3b039017 100644 --- a/renderdoc/driver/gl/gl_driver.cpp +++ b/renderdoc/driver/gl/gl_driver.cpp @@ -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)); } } diff --git a/renderdoc/driver/gl/gl_replay.cpp b/renderdoc/driver/gl/gl_replay.cpp index f9a3c5e7f..db1eec1e3 100644 --- a/renderdoc/driver/gl/gl_replay.cpp +++ b/renderdoc/driver/gl/gl_replay.cpp @@ -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; diff --git a/renderdoc/driver/gl/gl_replay.h b/renderdoc/driver/gl/gl_replay.h index a23095a22..d6e8d75c0 100644 --- a/renderdoc/driver/gl/gl_replay.h +++ b/renderdoc/driver/gl/gl_replay.h @@ -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); diff --git a/renderdoc/driver/gl/gl_shader_refl.cpp b/renderdoc/driver/gl/gl_shader_refl.cpp index 1df965d25..d292250e6 100644 --- a/renderdoc/driver/gl/gl_shader_refl.cpp +++ b/renderdoc/driver/gl/gl_shader_refl.cpp @@ -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; diff --git a/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp b/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp index a442f2e11..d9d57fef1 100644 --- a/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp +++ b/renderdoc/driver/gl/wrappers/gl_draw_funcs.cpp @@ -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; diff --git a/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp b/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp index adb1680f3..9972ce25b 100644 --- a/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp +++ b/renderdoc/driver/shaders/dxbc/dxbc_inspect.cpp @@ -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")) diff --git a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp index e945edabf..afb6ec507 100644 --- a/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp +++ b/renderdoc/driver/shaders/spirv/spirv_disassemble.cpp @@ -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; diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index 7b0075474..e24069707 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -3020,7 +3020,7 @@ void WrappedVulkan::AddUsage(VulkanDrawcallTreeNode &drawNode, vector= 0) diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index e448c6f52..6bcb30b84 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/renderdoc/driver/vulkan/vk_replay.cpp @@ -1783,7 +1783,7 @@ void VulkanReplay::RenderMesh(uint32_t eventID, const vector &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 &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; diff --git a/renderdoc/driver/vulkan/vk_replay.h b/renderdoc/driver/vulkan/vk_replay.h index dd5bf52f9..ed821c674 100644 --- a/renderdoc/driver/vulkan/vk_replay.h +++ b/renderdoc/driver/vulkan/vk_replay.h @@ -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); diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp index 4ac3dac4a..4ee90cf7d 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp @@ -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); } diff --git a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp index 7b6d21b4a..81075cf19 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_draw_funcs.cpp @@ -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; } diff --git a/renderdoc/replay/replay_driver.h b/renderdoc/replay/replay_driver.h index d7f5401ed..bf67454bd 100644 --- a/renderdoc/replay/replay_driver.h +++ b/renderdoc/replay/replay_driver.h @@ -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; diff --git a/renderdoc/replay/replay_output.cpp b/renderdoc/replay/replay_output.cpp index 23cbf2a9b..af3cb166b 100644 --- a/renderdoc/replay/replay_output.cpp +++ b/renderdoc/replay/replay_output.cpp @@ -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); } diff --git a/renderdoc/replay/replay_renderer.cpp b/renderdoc/replay/replay_renderer.cpp index 4a7c3fa16..2aab8e91f 100644 --- a/renderdoc/replay/replay_renderer.cpp +++ b/renderdoc/replay/replay_renderer.cpp @@ -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: diff --git a/renderdoccmd/renderdoccmd.cpp b/renderdoccmd/renderdoccmd.cpp index 45ac39418..e23ded53e 100644 --- a/renderdoccmd/renderdoccmd.cpp +++ b/renderdoccmd/renderdoccmd.cpp @@ -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;