diff options
| author |  cdalton <cdalton@nvidia.com> | 2015-06-02 13:05:52 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-02 13:05:52 -0700 |
| commit | 1acea86914797bc33856ff62b5cdfbe82c58dd67 (patch) | |
| tree | 3a8dc7833d1bba2cea5de96e5f7560724deb1e8e /src/gpu/gl/builders | |
| parent | 5aa5ea3831b955097e01be83020252c2134d59e4 (diff) | |
Begin tracking driver info in GrGLContextInfo
BUG=skia:
Review URL: https://codereview.chromium.org/1165463005
Diffstat (limited to 'src/gpu/gl/builders')
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/builders/GrGLShaderStringBuilder.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 1478279fe2..1e6251ba66 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -429,7 +429,7 @@ GrGLProgram* GrGLProgramBuilder::finalize() { GL_CALL(LinkProgram(programID)); // Calling GetProgramiv is expensive in Chromium. Assume success in release builds. - bool checkLinked = !fGpu->ctxInfo().isChromium(); + bool checkLinked = kChromium_GrGLDriver != fGpu->ctxInfo().driver(); #ifdef SK_DEBUG checkLinked = true; #endif diff --git a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp b/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp index b123c035cd..52915b6f89 100644 --- a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp +++ b/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp @@ -54,7 +54,7 @@ GrGLuint GrGLCompileAndAttachShader(const GrGLContext& glCtx, GR_GL_CALL(gli, CompileShader(shaderId)); // Calling GetShaderiv in Chromium is quite expensive. Assume success in release builds. - bool checkCompiled = !glCtx.isChromium(); + bool checkCompiled = kChromium_GrGLDriver != glCtx.driver(); #ifdef SK_DEBUG checkCompiled = true; #endif |