From d023fb39288be943d1c8ec5a60e9ff5778f4642f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 14 Jul 2010 14:53:35 +0100 Subject: [PATCH] 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 insertion(+), 3 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_rast.h b/src/gallium/drivers/llvmpipe/lp_rast.h index 0991344cce9..eaf2a6f3345 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 4ceb789b775..7e432503c12 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); -- 2.11.0