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

Unified Diff: third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo.h

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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: third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo.h
diff --git a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo.h b/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo.h
deleted file mode 100644
index 8b259ba3909ef4347bf4328167c8cb5010bf9b72..0000000000000000000000000000000000000000
--- a/third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2mojo.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2012 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.
-
-// This file contains Mojo-specific GLES2 declarations.
-
-#ifndef GPU_GLES2_GL2MOJO_H_
-#define GPU_GLES2_GL2MOJO_H_
-
-#include <GLES2/gl2platform.h>
-
-#define GL_CONTEXT_LOST 0x300E
-#define GL_PATH_MODELVIEW_CHROMIUM 0x1700
-#define GL_PATH_PROJECTION_CHROMIUM 0x1701
-#define GL_PATH_MODELVIEW_MATRIX_CHROMIUM 0x0BA6
-#define GL_PATH_PROJECTION_MATRIX_CHROMIUM 0x0BA7
-
-#if defined(GLES2_USE_MOJO)
-#define GLES2_GET_FUN(name) MojoGLES2gl ## name
-#else
-// Because we are using both the real system GL and our own
-// emulated GL we need to use different names to avoid conflicts.
-#if defined(GLES2_USE_CPP_BINDINGS)
-#define GLES2_GET_FUN(name) gles2::GetGLContext()->name
-#else
-#define GLES2_GET_FUN(name) GLES2 ## name
-#endif
-#endif
-
-#include <GLES2/gl2mojo_autogen.h>
-
-#endif // GPU_GLES2_GL2MOJO_H_

Powered by Google App Engine
This is Rietveld 408576698