summaryrefslogtreecommitdiffstats
path: root/gpu/gpu.gyp
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-16 23:03:47 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-16 23:03:47 +0000
commita93bb846c70d2491171bd7211d24f6f0fa56e853 (patch)
tree8cb20ea75cf5f9a175d756d0605ddaa302f6d751 /gpu/gpu.gyp
parent024d468c601e94f26717c1ddc68f68cfcdf4c23c (diff)
downloadchromium_src-a93bb846c70d2491171bd7211d24f6f0fa56e853.zip
chromium_src-a93bb846c70d2491171bd7211d24f6f0fa56e853.tar.gz
chromium_src-a93bb846c70d2491171bd7211d24f6f0fa56e853.tar.bz2
Adds texture tracking.
I need to add a bunch more unit tests for the TextureManager but this CL is getting large so if you don't mind I'll do that in the next CL. I still need to use the texture tracking at draw time but that's going to require uniform tracking! UGH! Also breaks out a bunch of the tracking classes into their own files. TEST=none BUG=none Review URL: http://codereview.chromium.org/605018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39153 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
-rw-r--r--gpu/gpu.gyp23
1 files changed, 19 insertions, 4 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index df0a25f..c5ace2a 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -9,6 +9,8 @@
# twice with different defines. Once so it calls real GL, again so it
# calls mock GL for the unit tests.
'gpu_source_files': [
+ 'command_buffer/service/buffer_manager.h',
+ 'command_buffer/service/buffer_manager.cc',
'command_buffer/service/gles2_cmd_decoder.h',
'command_buffer/service/gles2_cmd_decoder_autogen.h',
'command_buffer/service/gles2_cmd_decoder.cc',
@@ -17,6 +19,14 @@
'command_buffer/service/gles2_cmd_validation_autogen.h',
'command_buffer/service/gles2_cmd_validation_implementation_autogen.h',
'command_buffer/service/gl_utils.h',
+ 'command_buffer/service/id_manager.h',
+ 'command_buffer/service/id_manager.cc',
+ 'command_buffer/service/program_manager.h',
+ 'command_buffer/service/program_manager.cc',
+ 'command_buffer/service/shader_manager.h',
+ 'command_buffer/service/shader_manager.cc',
+ 'command_buffer/service/texture_manager.h',
+ 'command_buffer/service/texture_manager.cc',
],
},
'targets': [
@@ -303,6 +313,11 @@
'direct_dependent_settings': {
'sources': [
'<@(gpu_source_files)',
+ 'command_buffer/common/gles2_cmd_format_test.cc',
+ 'command_buffer/common/gles2_cmd_format_test_autogen.h',
+ 'command_buffer/common/gles2_cmd_id_test.cc',
+ 'command_buffer/common/gles2_cmd_id_test_autogen.h',
+ 'command_buffer/service/buffer_manager_unittest.cc',
'command_buffer/service/cmd_parser_test.cc',
'command_buffer/service/command_buffer_service_unittest.cc',
'command_buffer/service/common_decoder_unittest.cc',
@@ -314,10 +329,10 @@
'command_buffer/service/gl_mock.cc',
'command_buffer/service/gles2_cmd_decoder_unittest.cc',
'command_buffer/service/gles2_cmd_decoder_unittest_autogen.h',
- 'command_buffer/common/gles2_cmd_format_test.cc',
- 'command_buffer/common/gles2_cmd_format_test_autogen.h',
- 'command_buffer/common/gles2_cmd_id_test.cc',
- 'command_buffer/common/gles2_cmd_id_test_autogen.h',
+ 'command_buffer/service/id_manager_unittest.cc',
+ 'command_buffer/service/program_manager_unittest.cc',
+ 'command_buffer/service/shader_manager_unittest.cc',
+ 'command_buffer/service/texture_manager_unittest.cc',
],
},
},