diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 03:20:50 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 03:20:50 +0000 |
| commit | 3916c97e1bb1ef3fecfdcaf9d80f239016756c06 (patch) | |
| tree | 5c756aa2feec17d4a5609bcf2a16a06a12b828e8 /gpu/gpu.gyp | |
| parent | 84aebedeaa91c3fadf523260c12afa136420c7d3 (diff) | |
| download | chromium_src-3916c97e1bb1ef3fecfdcaf9d80f239016756c06.zip chromium_src-3916c97e1bb1ef3fecfdcaf9d80f239016756c06.tar.gz chromium_src-3916c97e1bb1ef3fecfdcaf9d80f239016756c06.tar.bz2 | |
Reorangizing the GLES2 code to handle shared
resources and non-renderable texture situations.
I haven't written enough unit tests for this
but the CL is already too big.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/646070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 678fc96..9fedfb3 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -11,6 +11,8 @@ 'gpu_source_files': [ 'command_buffer/service/buffer_manager.h', 'command_buffer/service/buffer_manager.cc', + 'command_buffer/service/context_group.h', + 'command_buffer/service/context_group.cc', 'command_buffer/service/gles2_cmd_decoder.h', 'command_buffer/service/gles2_cmd_decoder_autogen.h', 'command_buffer/service/gles2_cmd_decoder.cc', @@ -242,6 +244,7 @@ }, 'dependencies': [ 'command_buffer_common', + 'gl_libs', ], 'sources': [ 'command_buffer/service/common_decoder.cc', @@ -269,7 +272,6 @@ 'command_buffer/service/x_utils.h', ], 'dependencies': [ - 'gl_libs', '../build/linux/system.gyp:gtk', ] }, @@ -320,8 +322,9 @@ '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/context_group_unittest.cc', + 'command_buffer/service/cmd_parser_test.cc', 'command_buffer/service/cmd_parser_test.cc', - 'command_buffer/service/command_buffer_service_unittest.cc', 'command_buffer/service/common_decoder_unittest.cc', 'command_buffer/service/gpu_processor_unittest.cc', 'command_buffer/service/resource_test.cc', @@ -329,8 +332,13 @@ 'command_buffer/service/gl_interface.cc', 'command_buffer/service/gl_mock.h', 'command_buffer/service/gl_mock.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_base.h', + 'command_buffer/service/gles2_cmd_decoder_unittest_base.cc', 'command_buffer/service/gles2_cmd_decoder_unittest.cc', - 'command_buffer/service/gles2_cmd_decoder_unittest_autogen.h', + 'command_buffer/service/gles2_cmd_decoder_unittest_1.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h', + 'command_buffer/service/gles2_cmd_decoder_unittest_2.cc', + 'command_buffer/service/gles2_cmd_decoder_unittest_2_autogen.h', 'command_buffer/service/id_manager_unittest.cc', 'command_buffer/service/program_manager_unittest.cc', 'command_buffer/service/shader_manager_unittest.cc', |