First batch of GCC fixes for GPU code.

gpu/command_buffer/client/gles2_implementation.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // A class to emluate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 // TODO(gman): remove when all functions have been implemented.
 #include "gpu/command_buffer/client/gles2_implementation_gen.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 
 namespace command_buffer {
 namespace gles2 {
 
+// A 32-bit and 64-bit compatible way of converting a pointer to a GLuint.
+static GLuint ToGLuint(const void* ptr) {
+  return static_cast<GLuint>(reinterpret_cast<size_t>(ptr));
+}
+
 GLES2Implementation::GLES2Implementation(
       GLES2CmdHelper* helper,
       size_t transfer_buffer_size,
       void* transfer_buffer,
       int32 transfer_buffer_id)
     : util_(0),  // TODO(gman): Get real number of compressed texture formats.
       helper_(helper),
       transfer_buffer_(transfer_buffer_size, helper, transfer_buffer),
       transfer_buffer_id_(transfer_buffer_id),
       pack_alignment_(4),
@@ skipping 18 matching lines @@
   }
 }
 
 void GLES2Implementation::WaitForCmd() {
   int32 token = helper_->InsertToken();
   helper_->WaitForToken(token);
 }
 
 void GLES2Implementation::DrawElements(
     GLenum mode, GLsizei count, GLenum type, const void* indices) {
-  helper_->DrawElements(mode, count, type, reinterpret_cast<GLuint>(indices));
+  helper_->DrawElements(mode, count, type, ToGLuint(indices));
 }
 
 GLint GLES2Implementation::GetAttribLocation(
     GLuint program, const char* name) {
   helper_->GetAttribLocationImmediate(
       program, name, result_shm_id(), result_shm_offset());
   WaitForCmd();
   return GetResultAs<GLint>();
 }
 
@@ skipping 17 matching lines @@
       break;
   }
   helper_->PixelStorei(pname, param);
 }
 
 
 void GLES2Implementation::VertexAttribPointer(
     GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride,
     const void* ptr) {
   helper_->VertexAttribPointer(index, size, type, normalized, stride,
-                               reinterpret_cast<GLuint>(ptr));
+                               ToGLuint(ptr));
 }
 
 void GLES2Implementation::ShaderSource(
     GLuint shader, GLsizei count, const char** source, const GLint* length) {
   // TODO(gman): change to use buckets and check that there is enough room.
 
   // Compute the total size.
   uint32 total_size = count * sizeof(total_size);
   for (GLsizei ii = 0; ii < count; ++ii) {
     total_size += length ? length[ii] : strlen(source[ii]);
@@ skipping 140 matching lines @@
       }
       ++yoffset;
       source += padded_row_size;
     }
   }
 }
 
 
 }  // namespace gles2
 }  // namespace command_buffer
-
-