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

Unified Diff: mojo/public/platform/native/gles2/call_visitor.h

Issue 1354353002: Add GetProcAddress to OpenGL control interface (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Unit test added Created 5 years, 3 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
Index: mojo/public/platform/native/gles2/call_visitor.h
diff --git a/mojo/gles2/gles2_impl.cc b/mojo/public/platform/native/gles2/call_visitor.h
similarity index 65%
copy from mojo/gles2/gles2_impl.cc
copy to mojo/public/platform/native/gles2/call_visitor.h
index 4049f6d8772a7aaceaa096b643aa49e233c593ec..76d8ed000e1bf0888bb55eb1f911ed1ac78a9fdd 100644
--- a/mojo/gles2/gles2_impl.cc
+++ b/mojo/public/platform/native/gles2/call_visitor.h
@@ -1,20 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "gpu/command_buffer/client/gles2_interface.h"
-#include "mojo/gles2/control_thunks_impl.h"
-#include "mojo/public/c/gpu/GLES2/gl2.h"
-#include "mojo/public/c/gpu/MGL/mgl.h"
+// Note: This header intentionally does not have a header guard.
-extern "C" {
-
-#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \
- ReturnType GL_APIENTRY gl##Function PARAMETERS { \
- auto interface = gles2::ControlThunksImpl::Get()->CurrentGLES2Interface(); \
- DCHECK(interface); \
- return interface->Function ARGUMENTS; \
- }
#include "mojo/public/platform/native/gles2/call_visitor_autogen.h"
#include "mojo/public/platform/native/gles2/call_visitor_chromium_bind_uniform_location_autogen.h"
#include "mojo/public/platform/native/gles2/call_visitor_chromium_map_sub_autogen.h"
@@ -29,6 +18,3 @@ extern "C" {
#include "mojo/public/platform/native/gles2/call_visitor_ext_texture_storage_autogen.h"
#include "mojo/public/platform/native/gles2/call_visitor_khr_blend_equation_advanced_autogen.h"
#include "mojo/public/platform/native/gles2/call_visitor_oes_vertex_array_object_autogen.h"
-#undef VISIT_GL_CALL
-
-} // extern "C"

Powered by Google App Engine
This is Rietveld 408576698