Mesa (master): st/mesa: fix code/declaration mixing

Keith Whitwell keithw at kemper.freedesktop.org
Fri Aug 20 10:52:34 UTC 2010


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

Author: Keith Whitwell <keithw at vmware.com>
Date:   Fri Aug 20 11:52:01 2010 +0100

st/mesa: fix code/declaration mixing

---

 src/mesa/state_tracker/st_cb_bitmap.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index d40e413..8da5cbb 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -322,6 +322,8 @@ setup_bitmap_vertex_data(struct st_context *st, bool normalized,
    const GLfloat clip_y0 = (GLfloat)(y0 / fb_height * 2.0 - 1.0);
    const GLfloat clip_x1 = (GLfloat)(x1 / fb_width * 2.0 - 1.0);
    const GLfloat clip_y1 = (GLfloat)(y1 / fb_height * 2.0 - 1.0);
+   const GLuint max_slots = 1; /* 4096 / sizeof(st->bitmap.vertices); */
+   GLuint i;
 
    if(!normalized)
    {
@@ -339,9 +341,6 @@ setup_bitmap_vertex_data(struct st_context *st, bool normalized,
     * price of allocating a new buffer for each bitmap cache-flush to
     * avoid synchronous rendering.
     */
-   const GLuint max_slots = 1; /* 4096 / sizeof(st->bitmap.vertices); */
-   GLuint i;
-
    if (st->bitmap.vbuf_slot >= max_slots) {
       pipe_resource_reference(&st->bitmap.vbuf, NULL);
       st->bitmap.vbuf_slot = 0;




More information about the mesa-commit mailing list