diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 22:19:27 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 22:19:27 +0000 |
| commit | 826360a32bad92c49f16538ef807eb7b576d2349 (patch) | |
| tree | ba75a748a49f3194b7003e48b45c90e956909318 /gpu/GLES2 | |
| parent | 92a4b0ae784ee79e08d3a579cc30815533592cb0 (diff) | |
| download | chromium_src-826360a32bad92c49f16538ef807eb7b576d2349.zip chromium_src-826360a32bad92c49f16538ef807eb7b576d2349.tar.gz chromium_src-826360a32bad92c49f16538ef807eb7b576d2349.tar.bz2 | |
Make mojo_gles2 a stub shared library
This follows the mojo_system pattern, separating mojo_gles2 into a client-side
shared library which is just a trampoline into a shell-provided mojo_gles2_impl
component.
This includes core GLES2 functions which are auto-generated, replacing the use
of gles2_c_lib.
BUG=333157
R=darin@chromium.org, kbr@chromium.org
Review URL: https://codereview.chromium.org/140513003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2')
| -rw-r--r-- | gpu/GLES2/gl2chromium.h | 4 | ||||
| -rw-r--r-- | gpu/GLES2/gl2chromium_autogen.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gpu/GLES2/gl2chromium.h b/gpu/GLES2/gl2chromium.h index 3b42904..42889dd 100644 --- a/gpu/GLES2/gl2chromium.h +++ b/gpu/GLES2/gl2chromium.h @@ -11,6 +11,9 @@ #define GL_CONTEXT_LOST 0x300E +#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) @@ -18,6 +21,7 @@ #else #define GLES2_GET_FUN(name) GLES2 ## name #endif +#endif #include <GLES2/gl2chromium_autogen.h> diff --git a/gpu/GLES2/gl2chromium_autogen.h b/gpu/GLES2/gl2chromium_autogen.h index 53e5728..968962be 100644 --- a/gpu/GLES2/gl2chromium_autogen.h +++ b/gpu/GLES2/gl2chromium_autogen.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2014 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. |