diff options
| author | rlp@google.com <rlp@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 18:42:32 +0000 |
|---|---|---|
| committer | rlp@google.com <rlp@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 18:42:32 +0000 |
| commit | ce42ccee72841c8a9ad975712c39e6ede84feb61 (patch) | |
| tree | dbee7b83a94e092b101e964f975564fb9473e155 /o3d/command_buffer/common | |
| parent | e06984d41804a00d62c0ea1f61f56733d9a095ab (diff) | |
| download | chromium_src-ce42ccee72841c8a9ad975712c39e6ede84feb61.zip chromium_src-ce42ccee72841c8a9ad975712c39e6ede84feb61.tar.gz chromium_src-ce42ccee72841c8a9ad975712c39e6ede84feb61.tar.bz2 | |
Fixing unit_test bugs. One of hte fixes is for the texture param. This quiets the unit test, but has a todo under the actual code. To make all examples run, this should be completed, but if we're going ot eliminate the texture path in favor of the sampler path, then it doesn't make sense to fill this in if we'll delete it shortly.
Review URL: http://codereview.chromium.org/146133
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/command_buffer/common')
| -rw-r--r-- | o3d/command_buffer/common/cross/resource.cc | 2 | ||||
| -rw-r--r-- | o3d/command_buffer/common/cross/resource.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/o3d/command_buffer/common/cross/resource.cc b/o3d/command_buffer/common/cross/resource.cc index 7619ba0..cf7082f 100644 --- a/o3d/command_buffer/common/cross/resource.cc +++ b/o3d/command_buffer/common/cross/resource.cc @@ -101,6 +101,8 @@ unsigned int GetDataSize(DataType type) { return sizeof(bool); // NOLINT case SAMPLER: return sizeof(ResourceID); // NOLINT + case TEXTURE: + return sizeof(ResourceID); // NOLINT default: LOG(FATAL) << "Invalid type."; return 0; diff --git a/o3d/command_buffer/common/cross/resource.h b/o3d/command_buffer/common/cross/resource.h index cbdff26..8e86723 100644 --- a/o3d/command_buffer/common/cross/resource.h +++ b/o3d/command_buffer/common/cross/resource.h @@ -101,6 +101,7 @@ enum DataType { INT, BOOL, SAMPLER, + TEXTURE, NUM_TYPES, MAKE_32_BIT = 0x7fffffff, }; |