Manually merging trunk revs 95836 and 96904 to 835 branch (third attempt, nacl should be fixed)

gpu/command_buffer/client/gles2_implementation.h

 // Copyright (c) 2011 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.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 #define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_
 
 #include <GLES2/gl2.h>
 
 #include <map>
@@ skipping 57 matching lines @@
     GPU_CLIENT_VALIDATE_DESTINATION_INITALIZATION_ASSERT(ptr && \
         (ptr[0] == static_cast<type>(0) || ptr[0] == static_cast<type>(-1)));
 
 namespace gpu {
 
 class MappedMemoryManager;
 
 namespace gles2 {
 
 class ClientSideBufferHelper;
+class ProgramInfoManager;
 
 // Base class for IdHandlers
 class IdHandlerInterface {
  public:
   IdHandlerInterface() { }
   virtual ~IdHandlerInterface() { }
 
   // Makes some ids at or above id_offset.
   virtual void MakeIds(GLuint id_offset, GLsizei n, GLuint* ids) = 0;
 
   // Frees some ids.
-  virtual void FreeIds(GLsizei n, const GLuint* ids) = 0;
+  virtual bool FreeIds(GLsizei n, const GLuint* ids) = 0;
 
   // Marks an id as used for glBind functions. id = 0 does nothing.
   virtual bool MarkAsUsedForBind(GLuint id) = 0;
 };
 
 // This class emulates GLES2 over command buffers. It can be used by a client
 // program so that the program does not need deal with shared memory and command
 // buffer management. See gl2_lib.h.  Note that there is a performance gain to
 // be had by changing your code to use command buffers directly by using the
 // GLES2CmdHelper but that entails changing your code to use and deal with
@@ skipping 48 matching lines @@
   static const GLuint kClientSideElementArrayId = 0xFEDCBA99u;
 
   // Number of swap buffers allowed before waiting.
   static const size_t kMaxSwapBuffers = 2;
 
   GLES2Implementation(
       GLES2CmdHelper* helper,
       size_t transfer_buffer_size,
       void* transfer_buffer,
       int32 transfer_buffer_id,
-      bool share_resources);
+      bool share_resources,
+      bool bind_generates_resource = true);  // Will remove in 2 CLs!
 
   ~GLES2Implementation();
 
   // The GLES2CmdHelper being used by this GLES2Implementation. You can use
   // this to issue cmds at a lower level for certain kinds of optimization.
   GLES2CmdHelper* helper() const {
     return helper_;
   }
 
   // Include the auto-generated part of this class. We split this because
   // it means we can easily edit the non-auto generated parts right here in
   // this file instead of having to edit some template or the code generator.
   #include "../client/gles2_implementation_autogen.h"
 
   void DisableVertexAttribArray(GLuint index);
   void EnableVertexAttribArray(GLuint index);
   void GetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params);
   void GetVertexAttribiv(GLuint index, GLenum pname, GLint* params);
 
+  void GetProgramInfoCHROMIUMHelper(GLuint program, std::vector<int8>* result);
+  GLint GetAttribLocationHelper(GLuint program, const char* name);
+  GLint GetUniformLocationHelper(GLuint program, const char* name);
+  bool GetActiveAttribHelper(
+      GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
+      GLint* size, GLenum* type, char* name);
+  bool GetActiveUniformHelper(
+      GLuint program, GLuint index, GLsizei bufsize, GLsizei* length,
+      GLint* size, GLenum* type, char* name);
+
   GLuint MakeTextureId() {
     GLuint id;
     texture_id_handler_->MakeIds(0, 1, &id);
     return id;
   }
 
   void FreeTextureId(GLuint id) {
     texture_id_handler_->FreeIds(1, &id);
   }
 
@@ skipping 176 matching lines @@
 
   void BindBufferHelper(GLenum target, GLuint texture);
   void BindFramebufferHelper(GLenum target, GLuint texture);
   void BindRenderbufferHelper(GLenum target, GLuint texture);
   void BindTextureHelper(GLenum target, GLuint texture);
 
   void DeleteBuffersHelper(GLsizei n, const GLuint* buffers);
   void DeleteFramebuffersHelper(GLsizei n, const GLuint* framebuffers);
   void DeleteRenderbuffersHelper(GLsizei n, const GLuint* renderbuffers);
   void DeleteTexturesHelper(GLsizei n, const GLuint* textures);
+  bool DeleteProgramHelper(GLuint program);
+  bool DeleteShaderHelper(GLuint shader);
 
   // Helper for GetVertexAttrib
   bool GetVertexAttribHelper(GLuint index, GLenum pname, uint32* param);
 
   // Asks the service for the max index in an element array buffer.
   GLsizei GetMaxIndexInElementArrayBuffer(
       GLuint buffer_id, GLsizei count, GLenum type, GLuint offset);
 
   bool CopyRectToBufferFlipped(
       const void* pixels, GLsizei width, GLsizei height, GLenum format,
@@ skipping 71 matching lines @@
 
   // Current GL error bits.
   uint32 error_bits_;
 
   // Whether or not to print debugging info.
   bool debug_;
 
   // Whether or not this context is sharing resources.
   bool sharing_resources_;
 
+  bool bind_generates_resource_;
+
   // Map of GLenum to Strings for glGetString.  We need to cache these because
   // the pointer passed back to the client has to remain valid for eternity.
   typedef std::map<uint32, std::set<std::string> > GLStringMap;
   GLStringMap gl_strings_;
 
   // Similar cache for glGetRequestableExtensionsCHROMIUM. We don't
   // have an enum for this so handle it separately.
   std::set<std::string> requestable_extensions_set_;
 
   typedef std::map<const void*, MappedBuffer> MappedBufferMap;
   MappedBufferMap mapped_buffers_;
 
   typedef std::map<const void*, MappedTexture> MappedTextureMap;
   MappedTextureMap mapped_textures_;
 
   scoped_ptr<MappedMemoryManager> mapped_memory_;
 
+  scoped_ptr<ProgramInfoManager> program_info_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(GLES2Implementation);
 };
 
 inline bool GLES2Implementation::GetBufferParameterivHelper(
     GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
   return false;
 }
 
 inline bool GLES2Implementation::GetFramebufferAttachmentParameterivHelper(
     GLenum /* target */,
     GLenum /* attachment */,
     GLenum /* pname */,
     GLint* /* params */) {
   return false;
 }
 
-inline bool GLES2Implementation::GetProgramivHelper(
-    GLuint /* program */, GLenum /* pname */, GLint* /* params */) {
-  return false;
-}
-
 inline bool GLES2Implementation::GetRenderbufferParameterivHelper(
     GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
   return false;
 }
 
 inline bool GLES2Implementation::GetShaderivHelper(
     GLuint /* shader */, GLenum /* pname */, GLint* /* params */) {
   return false;
 }
 
 inline bool GLES2Implementation::GetTexParameterfvHelper(
     GLenum /* target */, GLenum /* pname */, GLfloat* /* params */) {
   return false;
 }
 
 inline bool GLES2Implementation::GetTexParameterivHelper(
     GLenum /* target */, GLenum /* pname */, GLint* /* params */) {
   return false;
 }
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_H_