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

Side by Side Diff: shell/native_application_support.cc

Issue 1347823005: Rename occlusion_query_ext -> ext_occlusion_query (OcclusionQueryEXT -> EXTOcclusionQuery, etc.). (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: doh Created 5 years, 3 months 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 unified diff | Download patch
« no previous file with comments | « mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.c ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "shell/native_application_support.h" 5 #include "shell/native_application_support.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "mojo/public/platform/native/gles2_impl_chromium_bind_uniform_location_ thunks.h" 10 #include "mojo/public/platform/native/gles2_impl_chromium_bind_uniform_location_ thunks.h"
11 #include "mojo/public/platform/native/gles2_impl_chromium_map_sub_thunks.h" 11 #include "mojo/public/platform/native/gles2_impl_chromium_map_sub_thunks.h"
12 #include "mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.h " 12 #include "mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.h "
13 #include "mojo/public/platform/native/gles2_impl_chromium_resize_thunks.h" 13 #include "mojo/public/platform/native/gles2_impl_chromium_resize_thunks.h"
14 #include "mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h" 14 #include "mojo/public/platform/native/gles2_impl_chromium_sync_point_thunks.h"
15 #include "mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks .h" 15 #include "mojo/public/platform/native/gles2_impl_chromium_texture_mailbox_thunks .h"
16 #include "mojo/public/platform/native/gles2_impl_ext_debug_marker_thunks.h" 16 #include "mojo/public/platform/native/gles2_impl_ext_debug_marker_thunks.h"
17 #include "mojo/public/platform/native/gles2_impl_ext_discard_framebuffer_thunks. h" 17 #include "mojo/public/platform/native/gles2_impl_ext_discard_framebuffer_thunks. h"
18 #include "mojo/public/platform/native/gles2_impl_ext_multisampled_render_to_text ure_thunks.h" 18 #include "mojo/public/platform/native/gles2_impl_ext_multisampled_render_to_text ure_thunks.h"
19 #include "mojo/public/platform/native/gles2_impl_ext_occlusion_query_thunks.h"
19 #include "mojo/public/platform/native/gles2_impl_ext_texture_storage_thunks.h" 20 #include "mojo/public/platform/native/gles2_impl_ext_texture_storage_thunks.h"
20 #include "mojo/public/platform/native/gles2_impl_khr_blend_equation_advanced_thu nks.h" 21 #include "mojo/public/platform/native/gles2_impl_khr_blend_equation_advanced_thu nks.h"
21 #include "mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.h"
22 #include "mojo/public/platform/native/gles2_impl_oes_vertex_array_object_thunks. h" 22 #include "mojo/public/platform/native/gles2_impl_oes_vertex_array_object_thunks. h"
23 #include "mojo/public/platform/native/gles2_impl_thunks.h" 23 #include "mojo/public/platform/native/gles2_impl_thunks.h"
24 #include "mojo/public/platform/native/mgl_onscreen_thunks.h" 24 #include "mojo/public/platform/native/mgl_onscreen_thunks.h"
25 #include "mojo/public/platform/native/mgl_signal_sync_point_thunks.h" 25 #include "mojo/public/platform/native/mgl_signal_sync_point_thunks.h"
26 #include "mojo/public/platform/native/mgl_thunks.h" 26 #include "mojo/public/platform/native/mgl_thunks.h"
27 #include "mojo/public/platform/native/system_impl_private_thunks.h" 27 #include "mojo/public/platform/native/system_impl_private_thunks.h"
28 #include "mojo/public/platform/native/system_thunks.h" 28 #include "mojo/public/platform/native/system_thunks.h"
29 29
30 namespace shell { 30 namespace shell {
31 31
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 "MojoSetSystemImplControlThunksPrivate", app_library); 79 "MojoSetSystemImplControlThunksPrivate", app_library);
80 SetThunks(&MojoMakeSystemImplThunksPrivate, "MojoSetSystemImplThunksPrivate", 80 SetThunks(&MojoMakeSystemImplThunksPrivate, "MojoSetSystemImplThunksPrivate",
81 app_library); 81 app_library);
82 82
83 SetThunks(&MojoMakeGLES2ImplThunks, "MojoSetGLES2ImplThunks", 83 SetThunks(&MojoMakeGLES2ImplThunks, "MojoSetGLES2ImplThunks",
84 app_library); 84 app_library);
85 SetThunks(MojoMakeGLES2ImplEXTDebugMarkerThunks, 85 SetThunks(MojoMakeGLES2ImplEXTDebugMarkerThunks,
86 "MojoSetGLES2ImplEXTDebugMarkerThunks", app_library); 86 "MojoSetGLES2ImplEXTDebugMarkerThunks", app_library);
87 SetThunks(MojoMakeGLES2ImplEXTDiscardFramebufferThunks, 87 SetThunks(MojoMakeGLES2ImplEXTDiscardFramebufferThunks,
88 "MojoSetGLES2ImplEXTDiscardFramebufferThunks", app_library); 88 "MojoSetGLES2ImplEXTDiscardFramebufferThunks", app_library);
89 SetThunks(MojoMakeGLES2ImplEXTOcclusionQueryThunks,
90 "MojoSetGLES2ImplEXTOcclusionQueryThunks", app_library);
89 SetThunks(MojoMakeGLES2ImplEXTTextureStorageThunks, 91 SetThunks(MojoMakeGLES2ImplEXTTextureStorageThunks,
90 "MojoSetGLES2ImplEXTTextureStorageThunks", app_library); 92 "MojoSetGLES2ImplEXTTextureStorageThunks", app_library);
91 SetThunks(MojoMakeGLES2ImplEXTMultisampledRenderToTextureThunks, 93 SetThunks(MojoMakeGLES2ImplEXTMultisampledRenderToTextureThunks,
92 "MojoSetGLES2ImplEXTMultisampledRenderToTextureThunks", 94 "MojoSetGLES2ImplEXTMultisampledRenderToTextureThunks",
93 app_library); 95 app_library);
94 SetThunks(MojoMakeGLES2ImplKHRBlendEquationAdvancedThunks, 96 SetThunks(MojoMakeGLES2ImplKHRBlendEquationAdvancedThunks,
95 "MojoSetGLES2ImplKHRBlendEquationAdvancedThunks", app_library); 97 "MojoSetGLES2ImplKHRBlendEquationAdvancedThunks", app_library);
96 SetThunks(MojoMakeGLES2ImplOcclusionQueryEXTThunks,
97 "MojoSetGLES2ImplOcclusionQueryEXTThunks", app_library);
98 SetThunks(MojoMakeGLES2ImplOESVertexArrayObjectThunks, 98 SetThunks(MojoMakeGLES2ImplOESVertexArrayObjectThunks,
99 "MojoSetGLES2ImplOESVertexArrayObjectThunks", app_library); 99 "MojoSetGLES2ImplOESVertexArrayObjectThunks", app_library);
100 // Deprecated name for "MojoSetGLES2ImplEXTOcclusionQueryThunks" (TODO(vtl):
101 // when no app is using this name any longer, delete it):
102 SetThunks(MojoMakeGLES2ImplEXTOcclusionQueryThunks,
103 "MojoSetGLES2ImplOcclusionQueryEXTThunks", app_library);
100 // "Chromium" extensions: 104 // "Chromium" extensions:
101 SetThunks(MojoMakeGLES2ImplCHROMIUMBindUniformLocationThunks, 105 SetThunks(MojoMakeGLES2ImplCHROMIUMBindUniformLocationThunks,
102 "MojoSetGLES2ImplCHROMIUMBindUniformLocationThunks", app_library); 106 "MojoSetGLES2ImplCHROMIUMBindUniformLocationThunks", app_library);
103 SetThunks(MojoMakeGLES2ImplCHROMIUMMapSubThunks, 107 SetThunks(MojoMakeGLES2ImplCHROMIUMMapSubThunks,
104 "MojoSetGLES2ImplCHROMIUMMapSubThunks", app_library); 108 "MojoSetGLES2ImplCHROMIUMMapSubThunks", app_library);
105 SetThunks(MojoMakeGLES2ImplCHROMIUMMiscellaneousThunks, 109 SetThunks(MojoMakeGLES2ImplCHROMIUMMiscellaneousThunks,
106 "MojoSetGLES2ImplCHROMIUMMiscellaneousThunks", app_library); 110 "MojoSetGLES2ImplCHROMIUMMiscellaneousThunks", app_library);
107 SetThunks(MojoMakeGLES2ImplCHROMIUMResizeThunks, 111 SetThunks(MojoMakeGLES2ImplCHROMIUMResizeThunks,
108 "MojoSetGLES2ImplCHROMIUMResizeThunks", app_library); 112 "MojoSetGLES2ImplCHROMIUMResizeThunks", app_library);
109 SetThunks(MojoMakeGLES2ImplCHROMIUMSyncPointThunks, 113 SetThunks(MojoMakeGLES2ImplCHROMIUMSyncPointThunks,
(...skipping 20 matching lines...) Expand all
130 } 134 }
131 // |MojoMain()| takes ownership of the Application request handle. 135 // |MojoMain()| takes ownership of the Application request handle.
132 MojoHandle handle = application_request.PassMessagePipe().release().value(); 136 MojoHandle handle = application_request.PassMessagePipe().release().value();
133 MojoResult result = main_function(handle); 137 MojoResult result = main_function(handle);
134 LOG_IF(ERROR, result != MOJO_RESULT_OK) 138 LOG_IF(ERROR, result != MOJO_RESULT_OK)
135 << "MojoMain returned error (result: " << result << ")"; 139 << "MojoMain returned error (result: " << result << ")";
136 return true; 140 return true;
137 } 141 }
138 142
139 } // namespace shell 143 } // namespace shell
OLDNEW
« no previous file with comments | « mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698