st/mesa: fix glCopyPixels bugs/crashes when src region need clipping

[mesa.git] / src / gallium / drivers / softpipe / sp_winsys.c

diff --git a/src/gallium/drivers/softpipe/sp_winsys.c b/src/gallium/drivers/softpipe/sp_winsys.c
index 8169071dc9fe2e65e906be23ee797ad0b24923f0..0a6245ed2cd82f1af5ec28acea5ba99da7c0cb7c 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_winsys.c
+++ b/src/gallium/drivers/softpipe/sp_winsys.c
@@ -36,14 +36,14 @@
  */
 
 
-#include "pipe/internal/p_winsys_screen.h"/* port to just p_screen */
-#include "pipe/p_format.h"
-#include "pipe/p_context.h"
-#include "pipe/p_inlines.h"
+#include "util/u_simple_screen.h"/* port to just p_screen */
 #include "util/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
-#include "softpipe/sp_winsys.h"
+#include "util/u_inlines.h"
+#include "pipe/p_format.h"
+#include "pipe/p_context.h"
+#include "sp_winsys.h"
 
 
 struct st_softpipe_buffer