summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2010-07-14 14:53:35 +0100
committerJosé Fonseca <[email protected]>2010-07-14 14:53:35 +0100
commitd023fb39288be943d1c8ec5a60e9ff5778f4642f (patch)
treeeef6f8415ca204a1461858dfe217f8e79184c270
parentbed78862d4db044a87d6c3808548abd6df95dd7d (diff)
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.
-rw-r--r--src/gallium/drivers/llvmpipe/lp_rast.h2
-rw-r--r--src/gallium/drivers/llvmpipe/lp_setup_tri.c2
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 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);