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.
This commit is contained in:
baldurk
2017-04-18 14:57:37 +01:00
parent d94f387399
commit 637d4089e2
47 changed files with 149 additions and 150 deletions
+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) \
\
+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);
+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)";