| Index: shell/native_application_support.cc
|
| diff --git a/shell/native_application_support.cc b/shell/native_application_support.cc
|
| index 3bdd197b584c4ea88da596d4319d156cc13800e6..ce171dcbefe9a9e3961a645ac9ac9ebcba1a396f 100644
|
| --- a/shell/native_application_support.cc
|
| +++ b/shell/native_application_support.cc
|
| @@ -16,9 +16,9 @@
|
| #include "mojo/public/platform/native/gles2_impl_ext_debug_marker_thunks.h"
|
| #include "mojo/public/platform/native/gles2_impl_ext_discard_framebuffer_thunks.h"
|
| #include "mojo/public/platform/native/gles2_impl_ext_multisampled_render_to_texture_thunks.h"
|
| +#include "mojo/public/platform/native/gles2_impl_ext_occlusion_query_thunks.h"
|
| #include "mojo/public/platform/native/gles2_impl_ext_texture_storage_thunks.h"
|
| #include "mojo/public/platform/native/gles2_impl_khr_blend_equation_advanced_thunks.h"
|
| -#include "mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.h"
|
| #include "mojo/public/platform/native/gles2_impl_oes_vertex_array_object_thunks.h"
|
| #include "mojo/public/platform/native/gles2_impl_thunks.h"
|
| #include "mojo/public/platform/native/mgl_onscreen_thunks.h"
|
| @@ -86,6 +86,8 @@ bool RunNativeApplication(
|
| "MojoSetGLES2ImplEXTDebugMarkerThunks", app_library);
|
| SetThunks(MojoMakeGLES2ImplEXTDiscardFramebufferThunks,
|
| "MojoSetGLES2ImplEXTDiscardFramebufferThunks", app_library);
|
| + SetThunks(MojoMakeGLES2ImplEXTOcclusionQueryThunks,
|
| + "MojoSetGLES2ImplEXTOcclusionQueryThunks", app_library);
|
| SetThunks(MojoMakeGLES2ImplEXTTextureStorageThunks,
|
| "MojoSetGLES2ImplEXTTextureStorageThunks", app_library);
|
| SetThunks(MojoMakeGLES2ImplEXTMultisampledRenderToTextureThunks,
|
| @@ -93,10 +95,12 @@ bool RunNativeApplication(
|
| app_library);
|
| SetThunks(MojoMakeGLES2ImplKHRBlendEquationAdvancedThunks,
|
| "MojoSetGLES2ImplKHRBlendEquationAdvancedThunks", app_library);
|
| - SetThunks(MojoMakeGLES2ImplOcclusionQueryEXTThunks,
|
| - "MojoSetGLES2ImplOcclusionQueryEXTThunks", app_library);
|
| SetThunks(MojoMakeGLES2ImplOESVertexArrayObjectThunks,
|
| "MojoSetGLES2ImplOESVertexArrayObjectThunks", app_library);
|
| + // Deprecated name for "MojoSetGLES2ImplEXTOcclusionQueryThunks" (TODO(vtl):
|
| + // when no app is using this name any longer, delete it):
|
| + SetThunks(MojoMakeGLES2ImplEXTOcclusionQueryThunks,
|
| + "MojoSetGLES2ImplOcclusionQueryEXTThunks", app_library);
|
| // "Chromium" extensions:
|
| SetThunks(MojoMakeGLES2ImplCHROMIUMBindUniformLocationThunks,
|
| "MojoSetGLES2ImplCHROMIUMBindUniformLocationThunks", app_library);
|
|
|