This fixes the Linux GYP build, fixing a number of (ahem!) problems

in command buffer code.  Watch those signed/unsigned comparisons!

Also, introduced an "invalid" value for CommandBufferOffset
(INVALID_COMMAND_BUFFER_OFFSET) instead of using -1, since it's an
unsigned value.

Review URL: http://codereview.chromium.org/246038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27635 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 14 insertions, 13 deletions

diff --git a/o3d/command_buffer/common/cross/bitfield_helpers_test.cc b/o3d/command_buffer/common/cross/bitfield_helpers_test.cc
index ab88de42..4f42fcf 100644
--- a/o3d/command_buffer/common/cross/bitfield_helpers_test.cc
+++ b/o3d/command_buffer/common/cross/bitfield_helpers_test.cc
@@ -40,28 +40,28 @@ namespace command_buffer {
 
 // Tests that BitField<>::Get returns the right bits.
 TEST(BitFieldTest, TestGet) {
-  unsigned int value = 0x12345678;
-  EXPECT_EQ(0x8, (BitField<0, 4>::Get(value)));
-  EXPECT_EQ(0x45, (BitField<12, 8>::Get(value)));
-  EXPECT_EQ(0x12345678, (BitField<0, 32>::Get(value)));
+  unsigned int value = 0x12345678u;
+  EXPECT_EQ(0x8u, (BitField<0, 4>::Get(value)));
+  EXPECT_EQ(0x45u, (BitField<12, 8>::Get(value)));
+  EXPECT_EQ(0x12345678u, (BitField<0, 32>::Get(value)));
 }
 
 // Tests that BitField<>::MakeValue generates the right bits.
 TEST(BitFieldTest, TestMakeValue) {
-  EXPECT_EQ(0x00000003, (BitField<0, 4>::MakeValue(0x3)));
-  EXPECT_EQ(0x00023000, (BitField<12, 8>::MakeValue(0x123)));
-  EXPECT_EQ(0x87654321, (BitField<0, 32>::MakeValue(0x87654321)));
+  EXPECT_EQ(0x00000003u, (BitField<0, 4>::MakeValue(0x3)));
+  EXPECT_EQ(0x00023000u, (BitField<12, 8>::MakeValue(0x123)));
+  EXPECT_EQ(0x87654321u, (BitField<0, 32>::MakeValue(0x87654321)));
 }
 
 // Tests that BitField<>::Set modifies the right bits.
 TEST(BitFieldTest, TestSet) {
-  unsigned int value = 0x12345678;
+  unsigned int value = 0x12345678u;
   BitField<0, 4>::Set(&value, 0x9);
-  EXPECT_EQ(0x12345679, value);
+  EXPECT_EQ(0x12345679u, value);
   BitField<12, 8>::Set(&value, 0x123);
-  EXPECT_EQ(0x12323679, value);
+  EXPECT_EQ(0x12323679u, value);
   BitField<0, 32>::Set(&value, 0x87654321);
-  EXPECT_EQ(0x87654321, value);
+  EXPECT_EQ(0x87654321u, value);
 }
 
 }  // namespace command_buffer
diff --git a/o3d/command_buffer/common/cross/buffer_sync_api.h b/o3d/command_buffer/common/cross/buffer_sync_api.h
index e216e7a..bd61b5e 100644
--- a/o3d/command_buffer/common/cross/buffer_sync_api.h
+++ b/o3d/command_buffer/common/cross/buffer_sync_api.h
@@ -42,6 +42,7 @@ namespace command_buffer {
 
 // Command buffer type.
 typedef size_t CommandBufferOffset;
+const CommandBufferOffset kInvalidCommandBufferOffset = ~0u;
 
 // Interface class for the Command Buffer Synchronous API.
 // This is the part of the command buffer API that is accessible through the
diff --git a/o3d/command_buffer/common/cross/resource.h b/o3d/command_buffer/common/cross/resource.h
index a556c19..3cd4d3b 100644
--- a/o3d/command_buffer/common/cross/resource.h
+++ b/o3d/command_buffer/common/cross/resource.h
@@ -199,7 +199,7 @@ unsigned int GetBlockSizeY(Format format);
 // Gets the dimension of a mipmap level given the dimension of the base
 // level. Every mipmap level is half the size of the previous level, rounding
 // down.
-static unsigned int GetMipMapDimension(unsigned int base,
+inline unsigned int GetMipMapDimension(unsigned int base,
                                        unsigned int level) {
   DCHECK_GT(base, 0U);
   return std::max(1U, base >> level);
diff --git a/o3d/command_buffer/common/cross/rpc_imc.cc b/o3d/command_buffer/common/cross/rpc_imc.cc
index f5c3c9e..391f139 100644
--- a/o3d/command_buffer/common/cross/rpc_imc.cc
+++ b/o3d/command_buffer/common/cross/rpc_imc.cc
@@ -127,7 +127,7 @@ RPCImplInterface::ReturnValue IMCSender::SendCall(
 
   RPCImplInterface::ReturnValue ret;
   result = NaclReceiveData(handle_, &ret, sizeof(ret), 0);
-  DCHECK_EQ(sizeof(ret), result);
+  DCHECK_EQ(sizeof(ret), static_cast<size_t>(result));
   return ret;
 }