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

Unified Diff: ui/gl/gl_bindings_autogen_wgl.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/gl_bindings_autogen_osmesa.cc ('k') | ui/gl/gl_context_cgl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_bindings_autogen_wgl.cc
diff --git a/ui/gl/gl_bindings_autogen_wgl.cc b/ui/gl/gl_bindings_autogen_wgl.cc
index a28aaf66f44623579d221ad5272dd8deb8049532..b70f929286b13dc8de1e0116dbe298a427db6637 100644
--- a/ui/gl/gl_bindings_autogen_wgl.cc
+++ b/ui/gl/gl_bindings_autogen_wgl.cc
@@ -10,7 +10,7 @@
#include <string>
-#include "base/debug/trace_event.h"
+#include "base/trace_event/trace_event.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_enums.h"
@@ -24,20 +24,17 @@ static bool g_debugBindingsInitialized;
DriverWGL g_driver_wgl;
void DriverWGL::InitializeStaticBindings() {
- fn.wglChoosePixelFormatARBFn = reinterpret_cast<wglChoosePixelFormatARBProc>(
- GetGLProcAddress("wglChoosePixelFormatARB"));
+ fn.wglChoosePixelFormatARBFn = 0;
fn.wglCopyContextFn =
reinterpret_cast<wglCopyContextProc>(GetGLProcAddress("wglCopyContext"));
fn.wglCreateContextFn = reinterpret_cast<wglCreateContextProc>(
GetGLProcAddress("wglCreateContext"));
fn.wglCreateLayerContextFn = reinterpret_cast<wglCreateLayerContextProc>(
GetGLProcAddress("wglCreateLayerContext"));
- fn.wglCreatePbufferARBFn = reinterpret_cast<wglCreatePbufferARBProc>(
- GetGLProcAddress("wglCreatePbufferARB"));
+ fn.wglCreatePbufferARBFn = 0;
fn.wglDeleteContextFn = reinterpret_cast<wglDeleteContextProc>(
GetGLProcAddress("wglDeleteContext"));
- fn.wglDestroyPbufferARBFn = reinterpret_cast<wglDestroyPbufferARBProc>(
- GetGLProcAddress("wglDestroyPbufferARB"));
+ fn.wglDestroyPbufferARBFn = 0;
fn.wglGetCurrentContextFn = reinterpret_cast<wglGetCurrentContextProc>(
GetGLProcAddress("wglGetCurrentContext"));
fn.wglGetCurrentDCFn = reinterpret_cast<wglGetCurrentDCProc>(
@@ -48,27 +45,18 @@ void DriverWGL::InitializeStaticBindings() {
fn.wglGetExtensionsStringEXTFn =
reinterpret_cast<wglGetExtensionsStringEXTProc>(
GetGLProcAddress("wglGetExtensionsStringEXT"));
- fn.wglGetPbufferDCARBFn = reinterpret_cast<wglGetPbufferDCARBProc>(
- GetGLProcAddress("wglGetPbufferDCARB"));
+ fn.wglGetPbufferDCARBFn = 0;
fn.wglMakeCurrentFn =
reinterpret_cast<wglMakeCurrentProc>(GetGLProcAddress("wglMakeCurrent"));
- fn.wglQueryPbufferARBFn = reinterpret_cast<wglQueryPbufferARBProc>(
- GetGLProcAddress("wglQueryPbufferARB"));
- fn.wglReleasePbufferDCARBFn = reinterpret_cast<wglReleasePbufferDCARBProc>(
- GetGLProcAddress("wglReleasePbufferDCARB"));
+ fn.wglQueryPbufferARBFn = 0;
+ fn.wglReleasePbufferDCARBFn = 0;
fn.wglShareListsFn =
reinterpret_cast<wglShareListsProc>(GetGLProcAddress("wglShareLists"));
- fn.wglSwapIntervalEXTFn = reinterpret_cast<wglSwapIntervalEXTProc>(
- GetGLProcAddress("wglSwapIntervalEXT"));
+ fn.wglSwapIntervalEXTFn = 0;
fn.wglSwapLayerBuffersFn = reinterpret_cast<wglSwapLayerBuffersProc>(
GetGLProcAddress("wglSwapLayerBuffers"));
-}
-
-void DriverWGL::InitializeDynamicBindings(GLContext* context) {
- DCHECK(context && context->IsCurrent(NULL));
- const GLVersionInfo* ver = context->GetVersionInfo();
- ALLOW_UNUSED_LOCAL(ver);
- std::string extensions = context->GetExtensions() + " ";
+ std::string extensions(GetPlatformExtensions());
+ extensions += " ";
ALLOW_UNUSED_LOCAL(extensions);
ext.b_WGL_ARB_extensions_string =
@@ -82,6 +70,56 @@ void DriverWGL::InitializeDynamicBindings(GLContext* context) {
ext.b_WGL_EXT_swap_control =
extensions.find("WGL_EXT_swap_control ") != std::string::npos;
+ debug_fn.wglChoosePixelFormatARBFn = 0;
+ if (ext.b_WGL_ARB_pixel_format) {
+ fn.wglChoosePixelFormatARBFn =
+ reinterpret_cast<wglChoosePixelFormatARBProc>(
+ GetGLProcAddress("wglChoosePixelFormatARB"));
+ DCHECK(fn.wglChoosePixelFormatARBFn);
+ }
+
+ debug_fn.wglCreatePbufferARBFn = 0;
+ if (ext.b_WGL_ARB_pbuffer) {
+ fn.wglCreatePbufferARBFn = reinterpret_cast<wglCreatePbufferARBProc>(
+ GetGLProcAddress("wglCreatePbufferARB"));
+ DCHECK(fn.wglCreatePbufferARBFn);
+ }
+
+ debug_fn.wglDestroyPbufferARBFn = 0;
+ if (ext.b_WGL_ARB_pbuffer) {
+ fn.wglDestroyPbufferARBFn = reinterpret_cast<wglDestroyPbufferARBProc>(
+ GetGLProcAddress("wglDestroyPbufferARB"));
+ DCHECK(fn.wglDestroyPbufferARBFn);
+ }
+
+ debug_fn.wglGetPbufferDCARBFn = 0;
+ if (ext.b_WGL_ARB_pbuffer) {
+ fn.wglGetPbufferDCARBFn = reinterpret_cast<wglGetPbufferDCARBProc>(
+ GetGLProcAddress("wglGetPbufferDCARB"));
+ DCHECK(fn.wglGetPbufferDCARBFn);
+ }
+
+ debug_fn.wglQueryPbufferARBFn = 0;
+ if (ext.b_WGL_ARB_pbuffer) {
+ fn.wglQueryPbufferARBFn = reinterpret_cast<wglQueryPbufferARBProc>(
+ GetGLProcAddress("wglQueryPbufferARB"));
+ DCHECK(fn.wglQueryPbufferARBFn);
+ }
+
+ debug_fn.wglReleasePbufferDCARBFn = 0;
+ if (ext.b_WGL_ARB_pbuffer) {
+ fn.wglReleasePbufferDCARBFn = reinterpret_cast<wglReleasePbufferDCARBProc>(
+ GetGLProcAddress("wglReleasePbufferDCARB"));
+ DCHECK(fn.wglReleasePbufferDCARBFn);
+ }
+
+ debug_fn.wglSwapIntervalEXTFn = 0;
+ if (ext.b_WGL_EXT_swap_control) {
+ fn.wglSwapIntervalEXTFn = reinterpret_cast<wglSwapIntervalEXTProc>(
+ GetGLProcAddress("wglSwapIntervalEXT"));
+ DCHECK(fn.wglSwapIntervalEXTFn);
+ }
+
if (g_debugBindingsInitialized)
InitializeDebugBindings();
}
« no previous file with comments | « ui/gl/gl_bindings_autogen_osmesa.cc ('k') | ui/gl/gl_context_cgl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698