AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ganesh: Clamp blend inputs when using F16_Clamped pixel config

Browse Source 
This ensures that we stay in [0,1], except for plus mode, which
requires a larger and more invasive change.

Bug: skia:
Change-Id: I97f6bcea8b10e70e55ba24bcff759ddbb1761794
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/201460
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2019-03-14 17:01:57 -04:00 committed by Skia Commit-Bot
parent 3101dade99
commit 65cdd61304
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/private/GrTypesPriv.h
View File

@ -1031,6 +1031,10 @@ static inline bool GrPixelConfigIsFloatingPoint(GrPixelConfig config) {
return false;
}
static inline bool GrPixelConfigNeedsClamp(GrPixelConfig config) {
return kRGBA_half_Clamped_GrPixelConfig == config;
}
/**
* Returns true if the pixel config is a GPU-specific compressed format
* representation.

1
src/gpu/GrProgramDesc.cpp
View File

@ -253,5 +253,6 @@ bool GrProgramDesc::Build(
SkASSERT(header->processorFeatures() == processorFeatures); // Ensure enough bits.
header->fSnapVerticesToPixelCenters = pipeline.snapVerticesToPixelCenters();
header->fHasPointSize = hasPointSize ? 1 : 0;
header->fClampBlendInput = GrPixelConfigNeedsClamp(renderTarget->config()) ? 1 : 0;
return true;
}

3
src/gpu/GrProgramDesc.h
View File

@ -103,7 +103,8 @@ public:
uint8_t fProcessorFeatures : 1;
bool fSnapVerticesToPixelCenters : 1;
bool fHasPointSize : 1;
uint8_t fPad : 3;
bool fClampBlendInput : 1;
uint8_t fPad : 2;
};
GR_STATIC_ASSERT(sizeof(KeyHeader) == 6);

13
src/gpu/glsl/GrGLSLProgramBuilder.cpp
View File

@ -253,11 +253,22 @@ void GrGLSLProgramBuilder::emitAndInstallXferProc(const SkString& colorIn,
SkASSERT(dstTexture->texturePriv().textureType() != GrTextureType::kExternal);
}
SkString finalInColor;
if (colorIn.size()) {
if (this->desc()->header().fClampBlendInput) {
finalInColor.printf("saturate(%s)", colorIn.c_str());
} else {
finalInColor = colorIn;
}
} else {
finalInColor = "float4(1)";
}
GrGLSLXferProcessor::EmitArgs args(&fFS,
this->uniformHandler(),
this->shaderCaps(),
xp,
colorIn.size() ? colorIn.c_str() : "float4(1)",
finalInColor.c_str(),
coverageIn.size() ? coverageIn.c_str() : "float4(1)",
fFS.getPrimaryColorOutputName(),
fFS.getSecondaryColorOutputName(),