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 /third_party | |
| 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 'third_party')
| -rw-r--r-- | third_party/khronos/DEPS | 2 | ||||
| -rw-r--r-- | third_party/khronos/KHR/khrplatform.h | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/third_party/khronos/DEPS b/third_party/khronos/DEPS index 48e8875..6e3cb20 100644 --- a/third_party/khronos/DEPS +++ b/third_party/khronos/DEPS @@ -1,2 +1,4 @@ include_rules = [ + "+mojo/public/gles2/gles2_export.h", + "+gpu/command_buffer/client/gles2_c_lib_export.h", ] diff --git a/third_party/khronos/KHR/khrplatform.h b/third_party/khronos/KHR/khrplatform.h index 444ec66..bdac1e9 100644 --- a/third_party/khronos/KHR/khrplatform.h +++ b/third_party/khronos/KHR/khrplatform.h @@ -123,18 +123,12 @@ *-----------------------------------------------------------------------*/ #undef KHRONOS_APICALL -#if defined(COMPONENT_BUILD) -#if defined(WIN32) -#if defined(GLES2_C_LIB_IMPLEMENTATION) -# define KHRONOS_APICALL __declspec(dllexport) -#else -# define KHRONOS_APICALL __declspec(dllimport) -#endif /* defined(GLES2_C_LIB_IMPLEMENTATION) */ -#else -# define KHRONOS_APICALL __attribute__((visibility("default"))) -#endif /* defined(WIN32) */ +#if defined(GLES2_USE_MOJO) +#include "mojo/public/gles2/gles2_export.h" +#define KHRONOS_APICALL MOJO_GLES2_EXPORT #else -# define KHRONOS_APICALL +#include "gpu/command_buffer/client/gles2_c_lib_export.h" +#define KHRONOS_APICALL GLES2_C_LIB_EXPORT #endif #undef KHRONOS_APIENTRY |