Fixing EffectTest.LogOpenGLCalls and cleaning up a line in DrawPassTest.

core/cross/command_buffer/buffer_cb.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 29 matching lines @@
 namespace o3d {
 using command_buffer::CommandBufferEntry;
 using command_buffer::CommandBufferHelper;
 using command_buffer::FencedAllocator;
 
 VertexBufferCB::VertexBufferCB(ServiceLocator* service_locator,
                                RendererCB *renderer)
     : VertexBuffer(service_locator),
       lock_pointer_(NULL),
       has_data_(false),
-      resource_id_(0),
+      resource_id_(command_buffer::kInvalidResource),
       renderer_(renderer) {
 }
 
 
 VertexBufferCB::~VertexBufferCB() {
   ConcreteFree();
 }
 
 // Sends the DESTROY_VERTEX_BUFFER command, and frees the ID from the allocator.
 void VertexBufferCB::ConcreteFree() {
-  if (GetSizeInBytes() != 0) {
+  if (resource_id_ != command_buffer::kInvalidResource) {
     CommandBufferHelper *helper = renderer_->helper();
     CommandBufferEntry args[1];
     args[0].value_uint32 = resource_id_;
     helper->AddCommand(command_buffer::DESTROY_VERTEX_BUFFER, 1, args);
     renderer_->vertex_buffer_ids().FreeID(resource_id_);
+    resource_id_ = command_buffer::kInvalidResource;
   }
 }
 
 // Allocates a resource ID, and sends the CREATE_VERTEX_BUFFER command.
 bool VertexBufferCB::ConcreteAllocate(size_t size_in_bytes) {
   ConcreteFree();
   if (size_in_bytes > 0) {
     resource_id_ = renderer_->vertex_buffer_ids().AllocateID();
     CommandBufferHelper *helper = renderer_->helper();
     CommandBufferEntry args[3];
@@ skipping 48 matching lines @@
   lock_pointer_ = NULL;
   has_data_ = true;
   return true;
 }
 
 IndexBufferCB::IndexBufferCB(ServiceLocator* service_locator,
                              RendererCB *renderer)
     : IndexBuffer(service_locator),
       lock_pointer_(NULL),
       has_data_(false),
-      resource_id_(0),
+      resource_id_(command_buffer::kInvalidResource),
       renderer_(renderer) {
 }
 
 
 IndexBufferCB::~IndexBufferCB() {
   ConcreteFree();
 }
 
 // Sends the DESTROY_INDEX_BUFFER command, and frees the ID from the allocator.
 void IndexBufferCB::ConcreteFree() {
-  if (GetSizeInBytes() != 0) {
+  if (resource_id_ != command_buffer::kInvalidResource) {
     CommandBufferHelper *helper = renderer_->helper();
     CommandBufferEntry args[1];
     args[0].value_uint32 = resource_id_;
     helper->AddCommand(command_buffer::DESTROY_INDEX_BUFFER, 1, args);
     renderer_->index_buffer_ids().FreeID(resource_id_);
+    resource_id_ = command_buffer::kInvalidResource;
   }
 }
 
 // Allocates a resource ID, and sends the CREATE_INDEX_BUFFER command.
 bool IndexBufferCB::ConcreteAllocate(size_t size_in_bytes) {
   ConcreteFree();
   if (size_in_bytes > 0) {
     resource_id_ = renderer_->index_buffer_ids().AllocateID();
     CommandBufferHelper *helper = renderer_->helper();
     CommandBufferEntry args[3];
@@ skipping 44 matching lines @@
   args[4].value_uint32 = renderer_->allocator()->GetOffset(lock_pointer_);
   helper->AddCommand(command_buffer::SET_INDEX_BUFFER_DATA, 5, args);
   renderer_->allocator()->FreePendingToken(lock_pointer_,
                                            helper->InsertToken());
   lock_pointer_ = NULL;
   has_data_ = true;
   return true;
 }
 
 }  // namespace o3d