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

Fix for 2056

Browse Source 
BUG=skia:2056

Review URL: https://codereview.chromium.org/1376293003
This commit is contained in:
joshualitt 2015-10-01 06:28:11 -07:00 committed by Commit bot
parent 7b60c2cd1a
commit 7bdd70ab91
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gpu/gl/GrGLCaps.cpp
View File

@ -304,6 +304,8 @@ void GrGLCaps::init(const GrContextOptions& contextOptions,
}
}
fBindUniformLocationSupport = ctxInfo.hasExtension("GL_CHROMIUM_bind_uniform_location");
#ifdef SK_BUILD_FOR_WIN
// We're assuming that on Windows Chromium we're using ANGLE.
bool isANGLE = kANGLE_GrGLDriver == ctxInfo.driver() ||
@ -1113,6 +1115,7 @@ SkString GrGLCaps::dump() const {
r.appendf("SRGB write contol: %s\n", (fSRGBWriteControl ? "YES" : "NO"));
r.appendf("RGBA 8888 pixel ops are slow: %s\n", (fRGBA8888PixelsOpsAreSlow ? "YES" : "NO"));
r.appendf("Partial FBO read is slow: %s\n", (fPartialFBOReadIsSlow ? "YES" : "NO"));
r.appendf("Bind uniform location support: %s\n", (fBindUniformLocationSupport ? "YES" : "NO"));
return r;
}

3
src/gpu/gl/GrGLCaps.h
View File

@ -236,6 +236,8 @@ public:
bool bindFragDataLocationSupport() const { return fBindFragDataLocationSupport; }
bool bindUniformLocationSupport() const { return fBindUniformLocationSupport; }
/**
* Is there support for enabling/disabling sRGB writes for sRGB-capable color attachments?
* If false this does not mean sRGB is not supported but rather that if it is supported
@ -360,6 +362,7 @@ private:
bool fSRGBWriteControl : 1;
bool fRGBA8888PixelsOpsAreSlow : 1;
bool fPartialFBOReadIsSlow : 1;
bool fBindUniformLocationSupport : 1;
struct ReadPixelsSupportedFormat {
GrGLenum fFormat;

3
src/gpu/gl/builders/GrGLProgramBuilder.cpp
View File

@ -421,8 +421,7 @@ GrGLProgram* GrGLProgramBuilder::finalize() {
}
void GrGLProgramBuilder::bindProgramResourceLocations(GrGLuint programID) {
bool usingBindUniform = fGpu->glInterface()->fFunctions.fBindUniformLocation != nullptr;
if (usingBindUniform) {
if (fGpu->glCaps().bindUniformLocationSupport()) {
int count = fUniforms.count();
for (int i = 0; i < count; ++i) {
GL_CALL(BindUniformLocation(programID, i, fUniforms[i].fVariable.c_str()));