diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-01-16 23:21:06 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-01-16 23:21:06 +0000 |
| commit | ba5d600c90f7075cf2c33a0c5c679ef822e8746e (patch) | |
| tree | ec6794fba9f2fe563a8bbc03ca06e288b7f51c28 /src/gallium/drivers/llvmpipe/lp_rast.h | |
| parent | fdfe06ad804ea13e6e436d66c1bcafe0bde2f545 (diff) | |
| parent | 164fd16cfbc09970676c2e6866e062a5c9b410db (diff) | |
Merge remote branch 'origin/master' into lp-binning
Conflicts:
src/gallium/drivers/llvmpipe/lp_quad.h
src/gallium/drivers/llvmpipe/lp_setup.c
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_rast.h')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_rast.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_rast.h b/src/gallium/drivers/llvmpipe/lp_rast.h index 21ebfa7ca9..e4c56f153f 100644 --- a/src/gallium/drivers/llvmpipe/lp_rast.h +++ b/src/gallium/drivers/llvmpipe/lp_rast.h @@ -86,7 +86,7 @@ struct lp_rast_shader_inputs { float (*dady)[4]; /* edge/step info for 3 edges and 4x4 block of pixels */ - int ALIGN16_ATTRIB step[3][16]; + PIPE_ALIGN_VAR(16) int step[3][16]; }; @@ -121,7 +121,7 @@ struct lp_rast_triangle { int c1, c2, c3; /* inputs for the shader */ - struct lp_rast_shader_inputs ALIGN16_ATTRIB inputs; + PIPE_ALIGN_VAR(16) struct lp_rast_shader_inputs inputs; }; |