Mesa (master): llvmpipe: Remove unused framebuffer stuff from the rasterizer.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sun May 30 15:40:16 UTC 2010
Module: Mesa
Branch: master
Commit: 7f1c0078408eee3ab320e782e776bad0795b60fd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f1c0078408eee3ab320e782e776bad0795b60fd
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu May 27 16:38:02 2010 +0100
llvmpipe: Remove unused framebuffer stuff from the rasterizer.
---
src/gallium/drivers/llvmpipe/lp_rast.c | 17 ++++++-----------
src/gallium/drivers/llvmpipe/lp_rast_priv.h | 7 -------
2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_rast.c b/src/gallium/drivers/llvmpipe/lp_rast.c
index 5e659a4..386387b 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast.c
+++ b/src/gallium/drivers/llvmpipe/lp_rast.c
@@ -61,16 +61,12 @@ lp_rast_begin( struct lp_rasterizer *rast,
for (i = 0; i < rast->state.nr_cbufs; i++) {
struct pipe_surface *cbuf = scene->fb.cbufs[i];
- rast->cbuf[i].format = cbuf->texture->format;
- rast->cbuf[i].tiles_per_row = align(cbuf->width, TILE_SIZE) / TILE_SIZE;
- rast->cbuf[i].blocksize =
- util_format_get_blocksize(cbuf->texture->format);
- rast->cbuf[i].map = llvmpipe_resource_map(cbuf->texture,
- cbuf->face,
- cbuf->level,
- cbuf->zslice,
- LP_TEX_USAGE_READ_WRITE,
- LP_TEX_LAYOUT_NONE);
+ llvmpipe_resource_map(cbuf->texture,
+ cbuf->face,
+ cbuf->level,
+ cbuf->zslice,
+ LP_TEX_USAGE_READ_WRITE,
+ LP_TEX_LAYOUT_NONE);
}
if (fb->zsbuf) {
@@ -105,7 +101,6 @@ lp_rast_end( struct lp_rasterizer *rast )
cbuf->face,
cbuf->level,
cbuf->zslice);
- rast->cbuf[i].map = NULL;
}
/* Unmap z/stencil buffer */
diff --git a/src/gallium/drivers/llvmpipe/lp_rast_priv.h b/src/gallium/drivers/llvmpipe/lp_rast_priv.h
index 9c2d445..d33dd49 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast_priv.h
+++ b/src/gallium/drivers/llvmpipe/lp_rast_priv.h
@@ -80,13 +80,6 @@ struct lp_rasterizer
/* Framebuffer stuff
*/
struct {
- void *map;
- unsigned tiles_per_row;
- unsigned blocksize;
- enum pipe_format format;
- } cbuf[PIPE_MAX_COLOR_BUFS];
-
- struct {
uint8_t *map;
unsigned stride;
unsigned blocksize;
More information about the mesa-commit
mailing list