Skip to content

S
swiftshader
Commit 66d1f73e by Nicolas Capens Committed by Nicolas Capens
Options

Perform independent blend state optimization

Previously we were checking whether all attachments have a format which requires clamping. We now support the independentBlend feature, and independent clamping, so we can optimize the blend state more granularly and not miss opportunities. Bug: b/140193782 Change-Id: I7e663fd8ebc6a7a6e35133c0c4c5cad84278eeb3 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/47828 Presubmit-Ready: Nicolas Capens <nicolascapens@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com>
parent 44e1791f
Showing with 17 additions and 22 deletions
src/Device/Context.cpp
...@@ -119,6 +119,16 @@ BlendState Context::getBlendState(int index) const ...@@ -119,6 +119,16 @@ BlendState Context::getBlendState(int index) const
return activeBlendState; return activeBlendState;
} }
bool Context::isColorClamped(int index) const
{
if(renderTarget[index] && renderTarget[index]->getFormat().isFloatFormat())
{
return false;
}
return true;
}
bool Context::alphaBlendActive(int index) const bool Context::alphaBlendActive(int index) const
{ {
ASSERT((index >= 0) && (index < RENDERTARGETS)); ASSERT((index >= 0) && (index < RENDERTARGETS));
...@@ -185,20 +195,6 @@ VkBlendFactor Context::destBlendFactor(int index) const ...@@ -185,20 +195,6 @@ VkBlendFactor Context::destBlendFactor(int index) const
return blendState[index].destBlendFactor; return blendState[index].destBlendFactor;
} }
bool Context::allTargetsColorClamp() const
{
// TODO: remove all of this and support VkPhysicalDeviceFeatures::independentBlend instead
for(int i = 0; i < RENDERTARGETS; i++)
{
if(renderTarget[i] && renderTarget[i]->getFormat().isFloatFormat())
{
return false;
}
}
return true;
}
VkBlendOp Context::blendOperation(int index) const VkBlendOp Context::blendOperation(int index) const
{ {
ASSERT((index >= 0) && (index < RENDERTARGETS)); ASSERT((index >= 0) && (index < RENDERTARGETS));
...@@ -242,7 +238,7 @@ VkBlendOp Context::blendOperation(int index) const ...@@ -242,7 +238,7 @@ VkBlendOp Context::blendOperation(int index) const
} }
} }
case VK_BLEND_OP_SUBTRACT: case VK_BLEND_OP_SUBTRACT:
if(sourceBlendFactor(index) == VK_BLEND_FACTOR_ZERO && allTargetsColorClamp()) if(sourceBlendFactor(index) == VK_BLEND_FACTOR_ZERO && isColorClamped(index))
{ {
return VK_BLEND_OP_ZERO_EXT; // Negative, clamped to zero return VK_BLEND_OP_ZERO_EXT; // Negative, clamped to zero
} }
...@@ -282,7 +278,7 @@ VkBlendOp Context::blendOperation(int index) const ...@@ -282,7 +278,7 @@ VkBlendOp Context::blendOperation(int index) const
} }
else if(sourceBlendFactor(index) == VK_BLEND_FACTOR_ONE) else if(sourceBlendFactor(index) == VK_BLEND_FACTOR_ONE)
{ {
if(destBlendFactor(index) == VK_BLEND_FACTOR_ZERO && allTargetsColorClamp()) if(destBlendFactor(index) == VK_BLEND_FACTOR_ZERO && isColorClamped(index))
{ {
return VK_BLEND_OP_ZERO_EXT; // Negative, clamped to zero return VK_BLEND_OP_ZERO_EXT; // Negative, clamped to zero
} }
...@@ -293,7 +289,7 @@ VkBlendOp Context::blendOperation(int index) const ...@@ -293,7 +289,7 @@ VkBlendOp Context::blendOperation(int index) const
} }
else else
{ {
if(destBlendFactor(index) == VK_BLEND_FACTOR_ZERO && allTargetsColorClamp()) if(destBlendFactor(index) == VK_BLEND_FACTOR_ZERO && isColorClamped(index))
{ {
return VK_BLEND_OP_ZERO_EXT; // Negative, clamped to zero return VK_BLEND_OP_ZERO_EXT; // Negative, clamped to zero
} }
...@@ -396,7 +392,7 @@ VkBlendOp Context::blendOperationAlpha(int index) const ...@@ -396,7 +392,7 @@ VkBlendOp Context::blendOperationAlpha(int index) const
} }
} }
case VK_BLEND_OP_SUBTRACT: case VK_BLEND_OP_SUBTRACT:
if(sourceBlendFactorAlpha(index) == VK_BLEND_FACTOR_ZERO && allTargetsColorClamp()) if(sourceBlendFactorAlpha(index) == VK_BLEND_FACTOR_ZERO && isColorClamped(index))
{ {
return VK_BLEND_OP_ZERO_EXT; // Negative, clamped to zero return VK_BLEND_OP_ZERO_EXT; // Negative, clamped to zero
} }
...@@ -436,7 +432,7 @@ VkBlendOp Context::blendOperationAlpha(int index) const ...@@ -436,7 +432,7 @@ VkBlendOp Context::blendOperationAlpha(int index) const
} }
else if(sourceBlendFactorAlpha(index) == VK_BLEND_FACTOR_ONE) else if(sourceBlendFactorAlpha(index) == VK_BLEND_FACTOR_ONE)
{ {
if(destBlendFactorAlpha(index) == VK_BLEND_FACTOR_ZERO && allTargetsColorClamp()) if(destBlendFactorAlpha(index) == VK_BLEND_FACTOR_ZERO && isColorClamped(index))
{ {
return VK_BLEND_OP_ZERO_EXT; // Negative, clamped to zero return VK_BLEND_OP_ZERO_EXT; // Negative, clamped to zero
} }
...@@ -447,7 +443,7 @@ VkBlendOp Context::blendOperationAlpha(int index) const ...@@ -447,7 +443,7 @@ VkBlendOp Context::blendOperationAlpha(int index) const
} }
else else
{ {
if(destBlendFactorAlpha(index) == VK_BLEND_FACTOR_ZERO && allTargetsColorClamp()) if(destBlendFactorAlpha(index) == VK_BLEND_FACTOR_ZERO && isColorClamped(index))
{ {
return VK_BLEND_OP_ZERO_EXT; // Negative, clamped to zero return VK_BLEND_OP_ZERO_EXT; // Negative, clamped to zero
} }
......
src/Device/Context.hpp
...@@ -83,10 +83,9 @@ public: ...@@ -83,10 +83,9 @@ public:
bool depthBufferActive() const; bool depthBufferActive() const;
bool stencilActive() const; bool stencilActive() const;
bool allTargetsColorClamp() const;
void setBlendState(int index, BlendState state); void setBlendState(int index, BlendState state);
BlendState getBlendState(int index) const; BlendState getBlendState(int index) const;
bool isColorClamped(int index) const;
VkPrimitiveTopology topology; VkPrimitiveTopology topology;
VkProvokingVertexModeEXT provokingVertexMode; VkProvokingVertexModeEXT provokingVertexMode;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment