commit e3ef715d01894bd114eeff88b8c8e883147fa614
author Jamie Madill <jmadill@chromium.org> Tue Apr 28 16:55:17 2015 +0000
committer Jamie Madill <jmadill@chromium.org> Tue Apr 28 16:55:40 2015 +0000
tree ce91d9352566bc589e0bbc52973b469e1605de51
parent 3fe36ebd2825144d966c4af6cf8198c9216c6e65

Revert "Revert "Remove non-const FBO attachment queries.""

Fixed build errors in prior patch.

This reverts commit 34771622d756adc52f02becd7c2b70c717dcc638.

Change-Id: I909b455f2c632a3df7d97149972e167c2adb058f
Reviewed-on: https://chromium-review.googlesource.com/267599
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index 71a9007..8019422 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -498,8 +498,8 @@
         return false;
     }
 
-    gl::Framebuffer *readFramebuffer = context->getState().getReadFramebuffer();
-    gl::Framebuffer *drawFramebuffer = context->getState().getDrawFramebuffer();
+    const gl::Framebuffer *readFramebuffer = context->getState().getReadFramebuffer();
+    const gl::Framebuffer *drawFramebuffer = context->getState().getDrawFramebuffer();
 
     if (!readFramebuffer || !drawFramebuffer)
     {
@@ -597,7 +597,7 @@
                 {
                     if (drawFramebuffer->isEnabledColorAttachment(colorAttachment))
                     {
-                        FramebufferAttachment *attachment = drawFramebuffer->getColorbuffer(colorAttachment);
+                        const FramebufferAttachment *attachment = drawFramebuffer->getColorbuffer(colorAttachment);
                         ASSERT(attachment);
 
                         if (!(attachment->type() == GL_TEXTURE && attachment->getTextureImageIndex().type == GL_TEXTURE_2D) &&