Merge branch 'gallium-polygon-stipple'

diff --cc src/gallium/drivers/softpipe/sp_context.c
index 2c43602ea1ca5d5ec1bca8212ae3c9b9c2f52128,eabf2dae3fc74dd9f0034bbfef63839fdfe7f782..c97b0333035c9e1899c6143bb3a62dc4dd2ded8d
--- 1/src/gallium/drivers/softpipe/sp_context.c
--- 2/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"

diff --cc src/gallium/drivers/softpipe/sp_quad_depth_test.c
Simple merge