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

Side by Side Diff: o3d/gpu_plugin/gpu_plugin.gyp

Issue 234001: GPUProcessor uses O3D command buffer service to render to a window.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 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 | Annotate | Revision Log
« no previous file with comments | « o3d/gpu_plugin/command_buffer_unittest.cc ('k') | o3d/gpu_plugin/gpu_plugin_object.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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'includes': [ 6 'includes': [
7 '../build/common.gypi', 7 '../build/common.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 ], 99 ],
100 'include_dirs': [ 100 'include_dirs': [
101 '../..', 101 '../..',
102 '../../third_party/npapi', 102 '../../third_party/npapi',
103 ], 103 ],
104 'sources': [ 104 'sources': [
105 'system_services/shared_memory_unittest.cc', 105 'system_services/shared_memory_unittest.cc',
106 ], 106 ],
107 }, 107 },
108 108
109 # This builds a subset of the O3D command buffer common library. This is a
110 # separate library for the time being because I need a subset that is not
111 # dependent on NaCl.
112 {
113 'target_name': 'command_buffer_common_subset',
114 'type': '<(library)',
115 'include_dirs': [
116 '..',
117 '../..',
118 ],
119 'direct_dependent_settings': {
120 'include_dirs': [
121 '..',
122 ],
123 }, # 'direct_dependent_settings'
124 'sources': [
125 '../command_buffer/common/cross/bitfield_helpers.h',
126 '../command_buffer/common/cross/cmd_buffer_format.h',
127 '../command_buffer/common/cross/gapi_interface.h',
128 '../command_buffer/common/cross/logging.h',
129 '../command_buffer/common/cross/mocks.h',
130 '../command_buffer/common/cross/resource.cc',
131 '../command_buffer/common/cross/resource.h',
132 '../command_buffer/common/cross/types.h',
133 ],
134 },
135
136 # This builds a subset of the O3D command buffer service. This is a separate
137 # library for the time being because I need a subset that is not dependent
138 # on NaCl.
139 {
140 'target_name': 'command_buffer_service_subset',
141 'type': '<(library)',
142 'include_dirs': [
143 '..',
144 '../..',
145 ],
146 'direct_dependent_settings': {
147 'include_dirs': [
148 '..',
149 ],
150 }, # 'direct_dependent_settings'
151 'dependencies': [
152 'command_buffer_common_subset',
153 ],
154 'sources': [
155 '../command_buffer/service/cross/cmd_parser.cc',
156 '../command_buffer/service/cross/cmd_parser.h',
157 '../command_buffer/service/cross/effect_utils.cc',
158 '../command_buffer/service/cross/effect_utils.h',
159 '../command_buffer/service/cross/gapi_decoder.cc',
160 '../command_buffer/service/cross/gapi_decoder.h',
161 '../command_buffer/service/cross/mocks.h',
162 '../command_buffer/service/cross/precompile.cc',
163 '../command_buffer/service/cross/precompile.h',
164 '../command_buffer/service/cross/resource.cc',
165 '../command_buffer/service/cross/resource.h',
166 '../command_buffer/service/cross/texture_utils.cc',
167 '../command_buffer/service/cross/texture_utils.h',
168 ],
169
170 'conditions': [
171 ['OS == "win"',
172 {
173 'sources': [
174 '../command_buffer/service/win/d3d9/d3d9_utils.h',
175 '../command_buffer/service/win/d3d9/effect_d3d9.cc',
176 '../command_buffer/service/win/d3d9/effect_d3d9.h',
177 '../command_buffer/service/win/d3d9/gapi_d3d9.cc',
178 '../command_buffer/service/win/d3d9/gapi_d3d9.h',
179 '../command_buffer/service/win/d3d9/geometry_d3d9.cc',
180 '../command_buffer/service/win/d3d9/geometry_d3d9.h',
181 '../command_buffer/service/win/d3d9/render_surface_d3d9.cc',
182 '../command_buffer/service/win/d3d9/render_surface_d3d9.h',
183 '../command_buffer/service/win/d3d9/sampler_d3d9.cc',
184 '../command_buffer/service/win/d3d9/sampler_d3d9.h',
185 '../command_buffer/service/win/d3d9/states_d3d9.cc',
186 '../command_buffer/service/win/d3d9/texture_d3d9.cc',
187 '../command_buffer/service/win/d3d9/texture_d3d9.h',
188 ], # 'sources'
189 'include_dirs': [
190 '$(DXSDK_DIR)/Include',
191 ],
192 'direct_dependent_settings': {
193 'include_dirs': [
194 '$(DXSDK_DIR)/Include',
195 ],
196 }, # 'direct_dependent_settings'
197 },
198 ],
199 ['OS == "mac" or OS == "linux"',
200 {
201 'sources': [
202 '../command_buffer/service/cross/gl/effect_gl.cc',
203 '../command_buffer/service/cross/gl/effect_gl.h',
204 '../command_buffer/service/cross/gl/gapi_gl.cc',
205 '../command_buffer/service/cross/gl/gapi_gl.h',
206 '../command_buffer/service/cross/gl/geometry_gl.cc',
207 '../command_buffer/service/cross/gl/geometry_gl.h',
208 '../command_buffer/service/cross/gl/gl_utils.h',
209 '../command_buffer/service/cross/gl/sampler_gl.cc',
210 '../command_buffer/service/cross/gl/sampler_gl.h',
211 '../command_buffer/service/cross/gl/states_gl.cc',
212 '../command_buffer/service/cross/gl/texture_gl.cc',
213 '../command_buffer/service/cross/gl/texture_gl.h',
214 ], # 'sources'
215 },
216 ],
217 ['OS == "linux"',
218 {
219 'sources': [
220 '../command_buffer/service/linux/x_utils.cc',
221 '../command_buffer/service/linux/x_utils.h',
222 ],
223 },
224 ],
225 ],
226 },
227
109 { 228 {
110 'target_name': 'gpu_plugin', 229 'target_name': 'gpu_plugin',
111 'type': '<(library)', 230 'type': '<(library)',
112 'dependencies': [ 231 'dependencies': [
113 '../../base/base.gyp:base', 232 '../../base/base.gyp:base',
233 'command_buffer_service_subset',
114 'np_utils', 234 'np_utils',
115 ], 235 ],
116 'include_dirs': [ 236 'include_dirs': [
117 '../..', 237 '../..',
118 '../../third_party/npapi', 238 '../../third_party/npapi',
119 ], 239 ],
120 'sources': [ 240 'sources': [
121 'command_buffer.cc', 241 'command_buffer.cc',
122 'command_buffer.h', 242 'command_buffer.h',
123 'command_buffer_mock.h', 243 'command_buffer_mock.h',
124 'gpu_plugin.cc', 244 'gpu_plugin.cc',
125 'gpu_plugin.h', 245 'gpu_plugin.h',
126 'gpu_plugin_object.cc', 246 'gpu_plugin_object.cc',
127 'gpu_plugin_object.h', 247 'gpu_plugin_object.h',
128 'gpu_plugin_object_win.cc', 248 'gpu_plugin_object_win.cc',
129 'gpu_plugin_object_factory.cc', 249 'gpu_plugin_object_factory.cc',
130 'gpu_plugin_object_factory.h', 250 'gpu_plugin_object_factory.h',
131 'gpu_processor.h', 251 'gpu_processor.h',
132 'gpu_processor.cc', 252 'gpu_processor.cc',
133 'gpu_processor_win.cc', 253 'gpu_processor_win.cc',
134 ], 254 ],
135 }, 255 },
136 256
137 # This is a standalone executable until O3D is fully moved over to using 257 # This is a standalone executable until O3D is fully moved over to using
138 # gyp. At that point these can become part of the regular O3D unit tests. 258 # gyp. At that point these can become part of the regular O3D unit tests.
139 { 259 {
140 'target_name': 'gpu_plugin_unittests', 260 'target_name': 'gpu_plugin_unittests',
141 'type': 'executable', 261 'type': 'executable',
142 'dependencies': [ 262 'dependencies': [
263 'command_buffer_service_subset',
143 'gpu_plugin', 264 'gpu_plugin',
144 'np_utils', 265 'np_utils',
145 'system_services', 266 'system_services',
146 '../../testing/gmock.gyp:gmock', 267 '../../testing/gmock.gyp:gmock',
147 '../../testing/gmock.gyp:gmockmain', 268 '../../testing/gmock.gyp:gmockmain',
148 '../../testing/gtest.gyp:gtest', 269 '../../testing/gtest.gyp:gtest',
149 ], 270 ],
150 'include_dirs': [ 271 'include_dirs': [
151 '../..', 272 '../..',
152 '../../third_party/npapi', 273 '../../third_party/npapi',
153 ], 274 ],
275 'conditions': [
276 ['OS == "win" and (renderer == "d3d9" or renderer == "cb")',
277 {
278 # These dependencies are temporary until the command buffer code
279 # loads D3D and D3DX dynamically.
280 'link_settings': {
281 'libraries': [
282 '"$(DXSDK_DIR)/Lib/x86/DxErr.lib"',
283 '"$(DXSDK_DIR)/Lib/x86/d3dx9.lib"',
284 '-ld3d9.lib',
285 ],
286 },
287 },
288 ],
289 ],
154 'sources': [ 290 'sources': [
155 'command_buffer_unittest.cc', 291 'command_buffer_unittest.cc',
156 'gpu_plugin_unittest.cc', 292 'gpu_plugin_unittest.cc',
157 'gpu_plugin_object_unittest.cc', 293 'gpu_plugin_object_unittest.cc',
158 'gpu_plugin_object_factory_unittest.cc', 294 'gpu_plugin_object_factory_unittest.cc',
159 'gpu_processor_unittest.cc', 295 'gpu_processor_unittest.cc',
160 ], 296 ],
161 }, 297 },
162 ] 298 ]
163 } 299 }
OLDNEW
« no previous file with comments | « o3d/gpu_plugin/command_buffer_unittest.cc ('k') | o3d/gpu_plugin/gpu_plugin_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698