Mesa (master): mesa: Clean up bad code formatting left from previous commit

Ian Romanick idr at kemper.freedesktop.org
Mon Jan 27 21:22:30 UTC 2014


Module: Mesa
Branch: master
Commit: 764be9f9e8b20fffa7b8a35dbdf65fe2a6b4e20c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=764be9f9e8b20fffa7b8a35dbdf65fe2a6b4e20c

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Nov 13 14:00:06 2013 -0800

mesa: Clean up bad code formatting left from previous commit

Also s/_EXT// on enums that are now part of core.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/main/fbobject.c |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 38b2727..4f510ee 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -2175,19 +2175,16 @@ _mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
             ASSERT(fb == &DummyFramebuffer || fb->Name == framebuffers[i]);
 
             /* check if deleting currently bound framebuffer object */
-
-               /* separate draw/read binding points */
-               if (fb == ctx->DrawBuffer) {
-                  /* bind default */
-                  ASSERT(fb->RefCount >= 2);
-                  _mesa_BindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, 0);
-               }
-               if (fb == ctx->ReadBuffer) {
-                  /* bind default */
-                  ASSERT(fb->RefCount >= 2);
-                  _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER_EXT, 0);
-               }
-
+            if (fb == ctx->DrawBuffer) {
+               /* bind default */
+               ASSERT(fb->RefCount >= 2);
+               _mesa_BindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+            }
+            if (fb == ctx->ReadBuffer) {
+               /* bind default */
+               ASSERT(fb->RefCount >= 2);
+               _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER, 0);
+            }
 
 	    /* remove from hash table immediately, to free the ID */
 	    _mesa_HashRemove(ctx->Shared->FrameBuffers, framebuffers[i]);




More information about the mesa-commit mailing list