Merge remote-tracking branch 'origin/master' into pipe-video
[mesa.git] / src / gallium / drivers / softpipe / sp_state_surface.c
index f6154109ea831dae4d555249261bd46de91f96f9..2db6faeca465ae838193f20a33f7b4c19f852781 100644 (file)
 
 #include "sp_context.h"
 #include "sp_state.h"
-#include "sp_surface.h"
 #include "sp_tile_cache.h"
 
 #include "draw/draw_context.h"
 
 #include "util/u_format.h"
+#include "util/u_inlines.h"
 
 
 /**