diff options
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. |