Cache bound FBO and VAO objects themselves in State

src/libGLESv2/Context.cpp

@@ -698,12 +698,12 @@ void Context::setActiveSampler(unsigned int active)
 
 GLuint Context::getReadFramebufferHandle() const
 {
-    return mState.readFramebuffer;
+    return mState.readFramebuffer->id();
 }
 
 GLuint Context::getDrawFramebufferHandle() const
 {
-    return mState.drawFramebuffer;
+    return mState.drawFramebuffer->id();
 }
 
 GLuint Context::getRenderbufferHandle() const
@@ -713,7 +713,7 @@ GLuint Context::getRenderbufferHandle() const
 
 GLuint Context::getVertexArrayHandle() const
 {
-    return mState.vertexArray;
+    return mState.vertexArray->id();
 }
 
 GLuint Context::getSamplerHandle(GLuint textureUnit) const
@@ -871,8 +871,8 @@ GLuint Context::createVertexArray()
     // Although the spec states VAO state is not initialized until the object is bound,
     // we create it immediately. The resulting behaviour is transparent to the application,
     // since it's not currently possible to access the state until the object is bound.
-    mVertexArrayMap[handle] = new VertexArray(mRenderer->createVertexArray(), handle, MAX_VERTEX_ATTRIBS);
-
+    VertexArray *vertexArray = new VertexArray(mRenderer->createVertexArray(), handle, MAX_VERTEX_ATTRIBS);
+    mVertexArrayMap[handle] = vertexArray;
     return handle;
 }
 
@@ -1108,24 +1108,23 @@ TransformFeedback *Context::getTransformFeedback(GLuint handle) const
 
 Framebuffer *Context::getReadFramebuffer() const
 {
-    return getFramebuffer(mState.readFramebuffer);
+    return mState.readFramebuffer;
 }
 
 Framebuffer *Context::getDrawFramebuffer()
 {
-    return mBoundDrawFramebuffer;
+    return mState.drawFramebuffer;
 }
 
 const Framebuffer *Context::getDrawFramebuffer() const
 {
-    return mBoundDrawFramebuffer;
+    return mState.drawFramebuffer;
 }
 
 VertexArray *Context::getCurrentVertexArray() const
 {
-    VertexArray *vao = getVertexArray(mState.vertexArray);
-    ASSERT(vao != NULL);
-    return vao;
+    ASSERT(mState.vertexArray != NULL);
+    return mState.vertexArray;
 }
 
 TransformFeedback *Context::getCurrentTransformFeedback() const
@@ -1184,22 +1183,20 @@ void Context::bindReadFramebuffer(GLuint framebuffer)
 {
     if (!getFramebuffer(framebuffer))
     {
-        mFramebufferMap[framebuffer] = new Framebuffer(mRenderer);
+        mFramebufferMap[framebuffer] = new Framebuffer(mRenderer, framebuffer);
     }
 
-    mState.readFramebuffer = framebuffer;
+    mState.readFramebuffer = getFramebuffer(framebuffer);
 }
 
 void Context::bindDrawFramebuffer(GLuint framebuffer)
 {
     if (!getFramebuffer(framebuffer))
     {
-        mFramebufferMap[framebuffer] = new Framebuffer(mRenderer);
+        mFramebufferMap[framebuffer] = new Framebuffer(mRenderer, framebuffer);
     }
 
-    mState.drawFramebuffer = framebuffer;
-
-    mBoundDrawFramebuffer = getFramebuffer(framebuffer);
+    mState.drawFramebuffer = getFramebuffer(framebuffer);
 }
 
 void Context::bindRenderbuffer(GLuint renderbuffer)
@@ -1213,10 +1210,11 @@ void Context::bindVertexArray(GLuint vertexArray)
 {
     if (!getVertexArray(vertexArray))
     {
-        mVertexArrayMap[vertexArray] = new VertexArray(mRenderer->createVertexArray(), vertexArray, MAX_VERTEX_ATTRIBS);
+        VertexArray *vertexArrayObject = new VertexArray(mRenderer->createVertexArray(), vertexArray, MAX_VERTEX_ATTRIBS);
+        mVertexArrayMap[vertexArray] = vertexArrayObject;
     }
 
-    mState.vertexArray = vertexArray;
+    mState.vertexArray = getVertexArray(vertexArray);
 }
 
 void Context::bindSampler(GLuint textureUnit, GLuint sampler)
@@ -1371,12 +1369,21 @@ void Context::endQuery(GLenum target)
 
 void Context::setFramebufferZero(Framebuffer *buffer)
 {
-    delete mFramebufferMap[0];
-    mFramebufferMap[0] = buffer;
-    if (mState.drawFramebuffer == 0)
+    // First, check to see if the old default framebuffer
+    // was set for draw or read framebuffer, and change
+    // the bindings to point to the new one before deleting it.
+    if (mState.drawFramebuffer->id() == 0)
+    {
+        mState.drawFramebuffer = buffer;
+    }
+
+    if (mState.readFramebuffer->id() == 0)
     {
-        mBoundDrawFramebuffer = buffer;
+        mState.readFramebuffer = buffer;
     }
+
+    delete mFramebufferMap[0];
+    mFramebufferMap[0] = buffer;
 }
 
 void Context::setRenderbufferStorage(GLsizei width, GLsizei height, GLenum internalformat, GLsizei samples)
@@ -1515,11 +1522,11 @@ GLuint Context::getTargetFramebufferHandle(GLenum target) const
 
     if (target == GL_READ_FRAMEBUFFER_ANGLE)
     {
-        return mState.readFramebuffer;
+        return mState.readFramebuffer->id();
     }
     else
     {
-        return mState.drawFramebuffer;
+        return mState.drawFramebuffer->id();
     }
 }
 
@@ -1712,10 +1719,10 @@ void Context::getIntegerv(GLenum pname, GLint *params)
       case GL_ARRAY_BUFFER_BINDING:                     *params = mState.arrayBuffer.id();                              break;
       case GL_ELEMENT_ARRAY_BUFFER_BINDING:             *params = getCurrentVertexArray()->getElementArrayBufferId();   break;
       //case GL_FRAMEBUFFER_BINDING:                    // now equivalent to GL_DRAW_FRAMEBUFFER_BINDING_ANGLE
-      case GL_DRAW_FRAMEBUFFER_BINDING_ANGLE:           *params = mState.drawFramebuffer;                               break;
-      case GL_READ_FRAMEBUFFER_BINDING_ANGLE:           *params = mState.readFramebuffer;                               break;
+      case GL_DRAW_FRAMEBUFFER_BINDING_ANGLE:           *params = mState.drawFramebuffer->id();                         break;
+      case GL_READ_FRAMEBUFFER_BINDING_ANGLE:           *params = mState.readFramebuffer->id();                         break;
       case GL_RENDERBUFFER_BINDING:                     *params = mState.renderbuffer.id();                             break;
-      case GL_VERTEX_ARRAY_BINDING:                     *params = mState.vertexArray;                                   break;
+      case GL_VERTEX_ARRAY_BINDING:                     *params = mState.vertexArray->id();                             break;
       case GL_CURRENT_PROGRAM:                          *params = mState.currentProgram;                                break;
       case GL_PACK_ALIGNMENT:                           *params = mState.pack.alignment;                                break;
       case GL_PACK_REVERSE_ROW_ORDER_ANGLE:             *params = mState.pack.reverseRowOrder;                          break;
@@ -3209,12 +3216,12 @@ void Context::detachFramebuffer(GLuint framebuffer)
     // If a framebuffer that is currently bound to the target FRAMEBUFFER is deleted, it is as though
     // BindFramebuffer had been executed with the target of FRAMEBUFFER and framebuffer of zero.
 
-    if (mState.readFramebuffer == framebuffer)
+    if (mState.readFramebuffer->id() == framebuffer)
     {
         bindReadFramebuffer(0);
     }
 
-    if (mState.drawFramebuffer == framebuffer)
+    if (mState.drawFramebuffer->id() == framebuffer)
     {
         bindDrawFramebuffer(0);
     }
@@ -3255,7 +3262,7 @@ void Context::detachVertexArray(GLuint vertexArray)
     // [OpenGL ES 3.0.2] section 2.10 page 43:
     // If a vertex array object that is currently bound is deleted, the binding
     // for that object reverts to zero and the default vertex array becomes current.
-    if (mState.vertexArray == vertexArray)
+    if (mState.vertexArray->id() == vertexArray)
     {
         bindVertexArray(0);
     }

src/libGLESv2/Context.h

@@ -96,13 +96,13 @@ struct State
 
     unsigned int activeSampler;   // Active texture unit selector - GL_TEXTURE0
     BindingPointer<Buffer> arrayBuffer;
-    GLuint readFramebuffer;
-    GLuint drawFramebuffer;
+    Framebuffer *drawFramebuffer;
+    Framebuffer *readFramebuffer;
     BindingPointer<Renderbuffer> renderbuffer;
     GLuint currentProgram;
 
     VertexAttribCurrentValueData vertexAttribCurrentValues[MAX_VERTEX_ATTRIBS]; // From glVertexAttrib
-    unsigned int vertexArray;
+    VertexArray *vertexArray;
 
     BindingPointer<Texture> samplerTexture[TEXTURE_TYPE_COUNT][IMPLEMENTATION_MAX_COMBINED_TEXTURE_IMAGE_UNITS];
     GLuint samplers[IMPLEMENTATION_MAX_COMBINED_TEXTURE_IMAGE_UNITS];
@@ -527,7 +527,6 @@ class Context
     bool mRobustAccess;
 
     BindingPointer<ProgramBinary> mCurrentProgramBinary;
-    Framebuffer *mBoundDrawFramebuffer;
 
     int mMajorShaderModel;
     bool mSupportsVertexTexture;

src/libGLESv2/Framebuffer.cpp

@@ -22,8 +22,9 @@
 namespace gl
 {
 
-Framebuffer::Framebuffer(rx::Renderer *renderer)
+Framebuffer::Framebuffer(rx::Renderer *renderer, GLuint id)
     : mRenderer(renderer),
+      mId(id),
       mReadBufferState(GL_COLOR_ATTACHMENT0_EXT),
       mDepthbuffer(NULL),
       mStencilbuffer(NULL)
@@ -563,7 +564,7 @@ GLenum Framebuffer::completeness() const
 }
 
 DefaultFramebuffer::DefaultFramebuffer(rx::Renderer *renderer, Colorbuffer *colorbuffer, DepthStencilbuffer *depthStencil)
-    : Framebuffer(renderer)
+    : Framebuffer(renderer, 0)
 {
     Renderbuffer *colorRenderbuffer = new Renderbuffer(0, colorbuffer);
     mColorbuffers[0] = new RenderbufferAttachment(colorRenderbuffer);

src/libGLESv2/Framebuffer.h

@@ -30,10 +30,12 @@ class DepthStencilbuffer;
 class Framebuffer
 {
   public:
-    explicit Framebuffer(rx::Renderer *renderer);
+    Framebuffer(rx::Renderer *renderer, GLuint id);
 
     virtual ~Framebuffer();
 
+    GLuint id() const { return mId; }
+
     void setColorbuffer(unsigned int colorAttachment, GLenum type, GLuint colorbuffer, GLint level, GLint layer);
     void setDepthbuffer(GLenum type, GLuint depthbuffer, GLint level, GLint layer);
     void setStencilbuffer(GLenum type, GLuint stencilbuffer, GLint level, GLint layer);
@@ -68,6 +70,8 @@ class Framebuffer
   protected:
     rx::Renderer *mRenderer;
 
+    GLuint mId;
+
     FramebufferAttachment *mColorbuffers[IMPLEMENTATION_MAX_DRAW_BUFFERS];
     GLenum mDrawBufferStates[IMPLEMENTATION_MAX_DRAW_BUFFERS];
     GLenum mReadBufferState;

src/libGLESv2/VertexArray.cpp

@@ -15,7 +15,7 @@ namespace gl
 {
 
 VertexArray::VertexArray(rx::VertexArrayImpl *impl, GLuint id, size_t maxAttribs)
-    : RefCountObject(id),
+    : mId(id),
       mVertexArray(impl),
       mVertexAttributes(maxAttribs)
 {
@@ -33,6 +33,11 @@ VertexArray::~VertexArray()
     mElementArrayBuffer.set(NULL);
 }
 
+GLuint VertexArray::id() const
+{
+    return mId;
+}
+
 void VertexArray::detachBuffer(GLuint bufferName)
 {
     for (size_t attribute = 0; attribute < getMaxAttribs(); attribute++)

src/libGLESv2/VertexArray.h

@@ -27,12 +27,14 @@ namespace gl
 {
 class Buffer;
 
-class VertexArray : public RefCountObject
+class VertexArray
 {
   public:
     VertexArray(rx::VertexArrayImpl *impl, GLuint id, size_t maxAttribs);
     ~VertexArray();
 
+    GLuint id() const;
+
     const VertexAttribute& getVertexAttribute(size_t attributeIndex) const;
     void detachBuffer(GLuint bufferName);
     void setVertexAttribDivisor(GLuint index, GLuint divisor);
@@ -47,6 +49,8 @@ class VertexArray : public RefCountObject
     size_t getMaxAttribs() const { return mVertexAttributes.size(); }
 
   private:
+    GLuint mId;
+
     rx::VertexArrayImpl *mVertexArray;
     std::vector<VertexAttribute> mVertexAttributes;
     BindingPointer<Buffer> mElementArrayBuffer;