Merge branch 'mesa_7_7_branch'

[mesa.git] / src / mesa / drivers / dri / ffb / ffb_tris.c

diff --git a/src/mesa/drivers/dri/ffb/ffb_tris.c b/src/mesa/drivers/dri/ffb/ffb_tris.c
index c2857f61bdece7f17ca8214e019c8d3b642ac63e..e7dd960ba16540799a5aa812d4e6089613d4a0cc 100644 (file)
--- a/src/mesa/drivers/dri/ffb/ffb_tris.c
+++ b/src/mesa/drivers/dri/ffb/ffb_tris.c
@@ -25,12 +25,12 @@
  *    David S. Miller <davem@redhat.com>
  */
 
-#include "glheader.h"
-#include "mtypes.h"
-#include "macros.h"
+#include "main/glheader.h"
+#include "main/mtypes.h"
+#include "main/macros.h"
 #include "swrast/swrast.h"
-#include "swrast_setup/swrast_setup.h"
 #include "swrast/s_context.h"
+#include "swrast_setup/swrast_setup.h"
 #include "tnl/t_context.h"
 #include "tnl/t_pipeline.h"
 
@@ -352,7 +352,7 @@ static struct {
 #define LOCAL_VARS(n)                          \
    ffbContextPtr fmesa = FFB_CONTEXT(ctx);     \
    __DRIdrawablePrivate *dPriv = fmesa->driDrawable; \
-   ffb_color color[n];                         \
+   ffb_color color[n] = { { 0 } };             \
    (void) color; (void) dPriv;
 
 /***********************************************************************