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

Side by Side Diff: gpu/command_buffer_service.gypi

Issue 1278333003: Fix crash caused by concurrent access to framebuffer_combo_complete_map_. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 5 years, 4 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 | « gpu/command_buffer/tests/gl_manager.cc ('k') | gpu/gles2_conform_support/egl/display.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'include_dirs': [ 6 'include_dirs': [
7 '..', 7 '..',
8 ], 8 ],
9 'all_dependent_settings': { 9 'all_dependent_settings': {
10 'include_dirs': [ 10 'include_dirs': [
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 'command_buffer/service/context_group.cc', 54 'command_buffer/service/context_group.cc',
55 'command_buffer/service/context_group.h', 55 'command_buffer/service/context_group.h',
56 'command_buffer/service/context_state.cc', 56 'command_buffer/service/context_state.cc',
57 'command_buffer/service/context_state.h', 57 'command_buffer/service/context_state.h',
58 'command_buffer/service/context_state_autogen.h', 58 'command_buffer/service/context_state_autogen.h',
59 'command_buffer/service/context_state_impl_autogen.h', 59 'command_buffer/service/context_state_impl_autogen.h',
60 'command_buffer/service/error_state.cc', 60 'command_buffer/service/error_state.cc',
61 'command_buffer/service/error_state.h', 61 'command_buffer/service/error_state.h',
62 'command_buffer/service/feature_info.cc', 62 'command_buffer/service/feature_info.cc',
63 'command_buffer/service/feature_info.h', 63 'command_buffer/service/feature_info.h',
64 "command_buffer/service/framebuffer_completeness_cache.cc",
65 "command_buffer/service/framebuffer_completeness_cache.h",
64 'command_buffer/service/framebuffer_manager.cc', 66 'command_buffer/service/framebuffer_manager.cc',
65 'command_buffer/service/framebuffer_manager.h', 67 'command_buffer/service/framebuffer_manager.h',
66 'command_buffer/service/gl_context_virtual.cc', 68 'command_buffer/service/gl_context_virtual.cc',
67 'command_buffer/service/gl_context_virtual.h', 69 'command_buffer/service/gl_context_virtual.h',
68 'command_buffer/service/gl_state_restorer_impl.cc', 70 'command_buffer/service/gl_state_restorer_impl.cc',
69 'command_buffer/service/gl_state_restorer_impl.h', 71 'command_buffer/service/gl_state_restorer_impl.h',
70 'command_buffer/service/gl_utils.h', 72 'command_buffer/service/gl_utils.h',
71 'command_buffer/service/gles2_cmd_clear_framebuffer.cc', 73 'command_buffer/service/gles2_cmd_clear_framebuffer.cc',
72 'command_buffer/service/gles2_cmd_clear_framebuffer.h', 74 'command_buffer/service/gles2_cmd_clear_framebuffer.h',
73 'command_buffer/service/gles2_cmd_copy_texture_chromium.cc', 75 'command_buffer/service/gles2_cmd_copy_texture_chromium.cc',
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 }, 157 },
156 }], 158 }],
157 ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', { 159 ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', {
158 'sources': [ 160 'sources': [
159 'command_buffer/service/async_pixel_transfer_manager_egl.cc', 161 'command_buffer/service/async_pixel_transfer_manager_egl.cc',
160 'command_buffer/service/async_pixel_transfer_manager_egl.h', 162 'command_buffer/service/async_pixel_transfer_manager_egl.h',
161 ], 163 ],
162 }], 164 }],
163 ], 165 ],
164 } 166 }
OLDNEW
« no previous file with comments | « gpu/command_buffer/tests/gl_manager.cc ('k') | gpu/gles2_conform_support/egl/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698