Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Side by Side Diff: ui/gl/gl_bindings.cc

Issue 1203513004: Respect the disabled extension list during binding initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: EGL_KHR_fence_sync must be unconditionally enabled; ANGLE GetPlatformExtensions reqires client exte… Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZ ONE) 5 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZ ONE)
6 #include <EGL/egl.h> 6 #include <EGL/egl.h>
7 #endif 7 #endif
8 8
9 #include "ui/gl/gl_bindings.h" 9 #include "ui/gl/gl_bindings.h"
10 10
(...skipping 26 matching lines...) Expand all
37 } 37 }
38 return str ? std::string(str) : ""; 38 return str ? std::string(str) : "";
39 } 39 }
40 #endif 40 #endif
41 41
42 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZ ONE) 42 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZ ONE)
43 std::string DriverEGL::GetPlatformExtensions() { 43 std::string DriverEGL::GetPlatformExtensions() {
44 EGLDisplay display = GLSurfaceEGL::InitializeDisplay(); 44 EGLDisplay display = GLSurfaceEGL::InitializeDisplay();
45 if (display == EGL_NO_DISPLAY) 45 if (display == EGL_NO_DISPLAY)
46 return ""; 46 return "";
47 47 const char* str = eglQueryString(display, EGL_EXTENSIONS);
48 DCHECK(g_driver_egl.fn.eglQueryStringFn);
49 const char* str = g_driver_egl.fn.eglQueryStringFn(display, EGL_EXTENSIONS);
50 return str ? std::string(str) : ""; 48 return str ? std::string(str) : "";
51 } 49 }
52 50
53 // static 51 // static
54 std::string DriverEGL::GetClientExtensions() { 52 std::string DriverEGL::GetClientExtensions() {
55 DCHECK(g_driver_egl.fn.eglQueryStringFn); 53 const char* str = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
56 const char* str =
57 g_driver_egl.fn.eglQueryStringFn(EGL_NO_DISPLAY, EGL_EXTENSIONS);
58 return str ? std::string(str) : ""; 54 return str ? std::string(str) : "";
59 } 55 }
60 #endif 56 #endif
61 57
62 #if defined(USE_X11) 58 #if defined(USE_X11)
63 std::string DriverGLX::GetPlatformExtensions() { 59 std::string DriverGLX::GetPlatformExtensions() {
64 DCHECK(g_driver_glx.fn.glXQueryExtensionsStringFn); 60 DCHECK(g_driver_glx.fn.glXQueryExtensionsStringFn);
65 const char* str = 61 const char* str =
66 g_driver_glx.fn.glXQueryExtensionsStringFn(gfx::GetXDisplay(), 0); 62 g_driver_glx.fn.glXQueryExtensionsStringFn(gfx::GetXDisplay(), 0);
67 return str ? std::string(str) : ""; 63 return str ? std::string(str) : "";
68 } 64 }
69 #endif 65 #endif
70 66
71 } // namespace gfx 67 } // namespace gfx
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698