From: Keith Whitwell <keithw@vmware.com>
Date: Fri, 9 Oct 2009 12:55:04 +0000 (+0100)
Subject: llvmpipe: fix crash on init
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b0475a4b0d1eaa1179bc399301ed46b0b8e63497;p=mesa.git

llvmpipe: fix crash on init
---

diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c
index 030a19ef301..2eef63badcb 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup.c
@@ -229,8 +229,8 @@ begin_binning( struct setup_context *setup )
                               setup->fb.zsbuf->height);
    }
 
-   setup->tiles_x = align(setup->fb.width, TILESIZE);
-   setup->tiles_y = align(setup->fb.height, TILESIZE);
+   setup->tiles_x = align(setup->fb.width, TILESIZE) / TILESIZE;
+   setup->tiles_y = align(setup->fb.height, TILESIZE) / TILESIZE;
 
    if (setup->fb.cbuf) {
       if (setup->clear.flags & PIPE_CLEAR_COLOR)
@@ -312,18 +312,10 @@ lp_setup_bind_framebuffer( struct setup_context *setup,
                            struct pipe_surface *color,
                            struct pipe_surface *zstencil )
 {
-   unsigned width, height;
-
    set_state( setup, SETUP_FLUSHED );
 
    pipe_surface_reference( &setup->fb.cbuf, color );
    pipe_surface_reference( &setup->fb.zsbuf, zstencil );
-
-   width = MAX2( color->width, zstencil->width );
-   height = MAX2( color->height, zstencil->height );
-
-   setup->tiles_x = align( width, TILESIZE ) / TILESIZE;
-   setup->tiles_y = align( height, TILESIZE ) / TILESIZE;
 }
 
 void