aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
authorGravatar kkinnunen <kkinnunen@nvidia.com>2015-10-13 12:58:37 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-10-13 12:58:38 -0700
commit0adfffba1bee55eee9e31e809cd0089840722b26 (patch)
treeddd0ad070007a5c3c52c4ce6a0303f2ed53debd4 /src/gpu
parentfdb47571a3b5e72469b67de44e32ac14d9352ab4 (diff)
Fix dm with Chromium command buffer driver
Fix a crash in dm when run with Chromium command buffer driver. Also removes glCopyTextureCHROMIUM, it does not seem to be used. This is removed on the grounds that it would need similar change, if it was used. The variable fCopyTextureCHROMIUM does not seem to be populated in the Chromium side, either. BUG=skia:2992 Review URL: https://codereview.chromium.org/1389213004
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/gl/GrGLAssembleInterface.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp
index 82c4457c92..294e6dfaef 100644
--- a/src/gpu/gl/GrGLAssembleInterface.cpp
+++ b/src/gpu/gl/GrGLAssembleInterface.cpp
@@ -765,6 +765,10 @@ const GrGLInterface* GrGLAssembleGLESInterface(void* ctx, GrGLGetProc get) {
}
}
+ if (extensions.has("GL_CHROMIUM_bind_uniform_location")) {
+ GET_PROC_SUFFIX(BindUniformLocation, CHROMIUM);
+ }
+
interface->fStandard = kGLES_GrGLStandard;
interface->fExtensions.swap(&extensions);