From: Brian Paul <brianp@vmware.com>
Date: Thu, 21 Jul 2011 16:38:21 +0000 (-0600)
Subject: Merge branch 'gallium-polygon-stipple'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=636d01bd61cac83e13c3c64874e7e34e828ca93a;p=mesa.git

Merge branch 'gallium-polygon-stipple'
---

636d01bd61cac83e13c3c64874e7e34e828ca93a
diff --cc src/gallium/drivers/softpipe/sp_context.c
index 2c43602ea1c,eabf2dae3fc..c97b0333035
--- a/src/gallium/drivers/softpipe/sp_context.c
+++ b/src/gallium/drivers/softpipe/sp_context.c
@@@ -35,10 -35,9 +35,11 @@@
  #include "pipe/p_defines.h"
  #include "util/u_math.h"
  #include "util/u_memory.h"
+ #include "util/u_pstipple.h"
  #include "util/u_inlines.h"
  #include "tgsi/tgsi_exec.h"
 +#include "vl/vl_decoder.h"
 +#include "vl/vl_video_buffer.h"
  #include "sp_clear.h"
  #include "sp_context.h"
  #include "sp_flush.h"