Mesa (master): llvmpipe: Remove redundant alignments.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Wed Jul 14 13:54:08 UTC 2010


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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Jul 14 14:53:35 2010 +0100

llvmpipe: Remove redundant alignments.

The lp_rast_shader_inputs' alignment is irrelevant now that it contains
pointers instead of actual data.

Likewise, lp_rast_triangle's size alignment is meaningless.

---

 src/gallium/drivers/llvmpipe/lp_rast.h      |    2 +-
 src/gallium/drivers/llvmpipe/lp_setup_tri.c |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_rast.h b/src/gallium/drivers/llvmpipe/lp_rast.h
index 0991344..eaf2a6f 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast.h
+++ b/src/gallium/drivers/llvmpipe/lp_rast.h
@@ -117,7 +117,7 @@ struct lp_rast_plane {
  */
 struct lp_rast_triangle {
    /* inputs for the shader */
-   PIPE_ALIGN_VAR(16) struct lp_rast_shader_inputs inputs;
+   struct lp_rast_shader_inputs inputs;
 
    int step[3][16];
 
diff --git a/src/gallium/drivers/llvmpipe/lp_setup_tri.c b/src/gallium/drivers/llvmpipe/lp_setup_tri.c
index 4ceb789..7e43250 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_tri.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup_tri.c
@@ -342,8 +342,6 @@ alloc_triangle(struct lp_scene *scene,
    unsigned tri_bytes, bytes;
    char *inputs;
 
-   assert(sizeof(*tri) % 16 == 0);
-
    tri_bytes = align(Offset(struct lp_rast_triangle, plane[nr_planes]), 16);
    bytes = tri_bytes + (3 * input_array_sz);
 




More information about the mesa-commit mailing list