st/program: use nir_lower_clip_disable instead of nir_lower_clip_vs conditionally

[mesa.git] / src / mesa / swrast / s_texcombine.c

diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index 743ee4015bb9db3636f90edc973c5f76d83c49e6..1ee906effd981393895b5024a6e8cd0ed7d53d96 100644 (file)
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -26,7 +26,7 @@
 
 #include "main/glheader.h"
 #include "main/context.h"
-#include "main/imports.h"
+
 #include "main/macros.h"
 #include "main/pixeltransfer.h"
 #include "main/samplerobj.h"
@@ -72,7 +72,7 @@ get_texel_array(SWcontext *swrast, GLuint unit)
  * \param unit         the texture combiner unit
  * \param primary_rgba incoming fragment color array
  * \param texelBuffer  pointer to texel colors for all texture units
- * 
+ *
  * \param span         two fields are used in this function:
  *                       span->end: number of fragments to process
  *                       span->array->rgba: incoming/result fragment colors