Mesa (gallium-0.2): gallium: cleanup the after merge framebuffer update code

Zack Rusin zack at kemper.freedesktop.org
Sun Sep 21 23:26:09 UTC 2008


Module: Mesa
Branch: gallium-0.2
Commit: e61793a7c01588f2e6235f1271af4c58fa8adad4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e61793a7c01588f2e6235f1271af4c58fa8adad4

Author: Zack Rusin <zack at tungstengraphics.com>
Date:   Sun Sep 21 18:32:09 2008 -0400

gallium: cleanup the after merge framebuffer update code

adjust it and make it behave like it used to

---

 src/mesa/state_tracker/st_atom_framebuffer.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index c07ed29..b4f42c6 100644
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -144,22 +144,13 @@ update_framebuffer_state( struct st_context *st )
 
    cso_set_framebuffer(st->cso_context, framebuffer);
 
-#if 0
-   if (fb->_ColorDrawBufferMask[0] & BUFFER_BIT_FRONT_LEFT) {
+   if (fb->_ColorDrawBufferIndexes[0] == BUFFER_FRONT_LEFT) {
       if (st->frontbuffer_status == FRONT_STATUS_COPY_OF_BACK) {
          /* XXX copy back buf to front? */
       }
       /* we're assuming we'll really draw to the front buffer */
       st->frontbuffer_status = FRONT_STATUS_DIRTY;
    }
-#else
-#if !defined(PIPE_OS_WINDOWS)
-#warning "fix me"
-#endif
-   if (fb->_ColorDrawBufferIndexes[0] == BUFFER_FRONT_LEFT) {
-      st->frontbuffer_status = FRONT_STATUS_DIRTY;
-   }
-#endif
 }
 
 




More information about the mesa-commit mailing list