commit aa2ab7d8c9112231b623ea3ebb85e3f28c26e526
author Shannon Woods <shannonwoods@chromium.org> Tue Jun 24 17:51:51 2014 -0400
committer Shannon Woods <shannonwoods@chromium.org> Tue Jul 15 15:34:27 2014 +0000
tree 948f0376456ab0bff328faa921dec6508f8eca79
parent a1851e8fbb596b5cd8da1ba585ce69641f7f3337

Cache bound FBO and VAO objects themselves in State

BUG=angle:685

Change-Id: I19ae6752d1a7490122dd9ca076efb08564e1901d
Reviewed-on: https://chromium-review.googlesource.com/205835
Tested-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libGLESv2/Framebuffer.cpp

diff --git a/src/libGLESv2/Framebuffer.cpp b/src/libGLESv2/Framebuffer.cpp
index bcd174a..331f075 100644
--- a/src/libGLESv2/Framebuffer.cpp
+++ b/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 @@
 }
 
 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);