remove final imports.h and imports.c bits

[mesa.git] / src / mesa / drivers / dri / r200 / r200_texstate.c

diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c
index f98fadf560ab1e6e58cba4513e3d7c5978bead1d..f736391ca5586ad280d43bf1811408dc8552f798 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_texstate.c
+++ b/src/mesa/drivers/dri/r200/r200_texstate.c
@@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include "main/glheader.h"
-#include "util/imports.h"
+
 #include "main/context.h"
 #include "main/macros.h"
 #include "main/state.h"
@@ -457,7 +457,7 @@ static GLboolean r200UpdateTextureEnv( struct gl_context *ctx, int unit, int slo
         break;
       case GL_ADD:
         color_combine = (R200_TXC_ARG_B_ZERO |
-                         R200_TXC_COMP_ARG_B | 
+                         R200_TXC_COMP_ARG_B |
                          R200_TXC_OP_MADD);
         R200_COLOR_ARG( 0, A );
         R200_COLOR_ARG( 1, C );
@@ -472,7 +472,7 @@ static GLboolean r200UpdateTextureEnv( struct gl_context *ctx, int unit, int slo
         break;
       case GL_SUBTRACT:
         color_combine = (R200_TXC_ARG_B_ZERO |
-                         R200_TXC_COMP_ARG_B | 
+                         R200_TXC_COMP_ARG_B |
                          R200_TXC_NEG_ARG_C |
                          R200_TXC_OP_MADD);
         R200_COLOR_ARG( 0, A );
@@ -798,7 +798,7 @@ static GLboolean r200UpdateAllTexEnv( struct gl_context *ctx )
            continue;
          }
         currentnext = j;
- 
+
         const GLuint numColorArgs = texUnit->_CurrentCombine->_NumArgsRGB;
         const GLuint numAlphaArgs = texUnit->_CurrentCombine->_NumArgsA;
         const GLboolean isdot3rgba = (texUnit->_CurrentCombine->ModeRGB == GL_DOT3_RGBA) ||
@@ -940,10 +940,10 @@ static GLboolean r200UpdateAllTexEnv( struct gl_context *ctx )
                                 R200_VOLUME_FILTER_MASK)
 
 
-static void disable_tex_obj_state( r200ContextPtr rmesa, 
+static void disable_tex_obj_state( r200ContextPtr rmesa,
                                   int unit )
 {
-   
+
    R200_STATECHANGE( rmesa, vtx );
    rmesa->hw.vtx.cmd[VTX_TCL_OUTPUT_VTXFMT_1] &= ~(7 << (unit * 3));
 
@@ -1002,7 +1002,7 @@ static void import_tex_obj_state( r200ContextPtr rmesa,
 
 }
 
-static void set_texgen_matrix( r200ContextPtr rmesa, 
+static void set_texgen_matrix( r200ContextPtr rmesa,
                               GLuint unit,
                               const GLfloat *s_plane,
                               const GLfloat *t_plane,
@@ -1079,10 +1079,10 @@ static GLuint r200_need_dis_texgen(const GLbitfield texGenEnabled,
 
 
 /*
- * Returns GL_FALSE if fallback required.  
+ * Returns GL_FALSE if fallback required.
  */
 static GLboolean r200_validate_texgen( struct gl_context *ctx, GLuint unit )
-{  
+{
    r200ContextPtr rmesa = R200_CONTEXT(ctx);
    const struct gl_fixedfunc_texture_unit *texUnit =
       &ctx->Texture.FixedFuncUnit[unit];
@@ -1110,7 +1110,7 @@ static GLboolean r200_validate_texgen( struct gl_context *ctx, GLuint unit )
    tgcm = rmesa->hw.tcg.cmd[TCG_TEX_PROC_CTL_2] & ~(R200_TEXGEN_COMP_MASK <<
                                                    (unit * 4));
 
-   if (0) 
+   if (0)
       fprintf(stderr, "%s unit %d\n", __func__, unit);
 
    if (texUnit->TexGenEnabled & S_BIT) {
@@ -1179,7 +1179,7 @@ static GLboolean r200_validate_texgen( struct gl_context *ctx, GLuint unit )
       }
 
       tgi |= R200_TEXGEN_INPUT_OBJ << inputshift;
-      set_texgen_matrix( rmesa, unit, 
+      set_texgen_matrix( rmesa, unit,
         (texUnit->TexGenEnabled & S_BIT) ? texUnit->GenS.ObjectPlane : I,
         (texUnit->TexGenEnabled & T_BIT) ? texUnit->GenT.ObjectPlane : I + 4,
         (texUnit->TexGenEnabled & R_BIT) ? texUnit->GenR.ObjectPlane : I + 8,
@@ -1219,7 +1219,7 @@ static GLboolean r200_validate_texgen( struct gl_context *ctx, GLuint unit )
       tgi |= R200_TEXGEN_INPUT_EYE_REFLECT << inputshift;
       /* pretty weird, must only negate when lighting is enabled? */
       if (ctx->Light.Enabled)
-        set_texgen_matrix( rmesa, unit, 
+        set_texgen_matrix( rmesa, unit,
            (texUnit->TexGenEnabled & S_BIT) ? reflect : I,
            (texUnit->TexGenEnabled & T_BIT) ? reflect + 4 : I + 4,
            (texUnit->TexGenEnabled & R_BIT) ? reflect + 8 : I + 8,
@@ -1253,7 +1253,7 @@ static GLboolean r200_validate_texgen( struct gl_context *ctx, GLuint unit )
    rmesa->TexGenEnabled |= R200_TEXGEN_TEXMAT_0_ENABLE << unit;
    rmesa->TexGenCompSel |= R200_OUTPUT_TEX_0 << unit;
 
-   if (tgi != rmesa->hw.tcg.cmd[TCG_TEX_PROC_CTL_1] || 
+   if (tgi != rmesa->hw.tcg.cmd[TCG_TEX_PROC_CTL_1] ||
        tgcm != rmesa->hw.tcg.cmd[TCG_TEX_PROC_CTL_2])
    {
       R200_STATECHANGE(rmesa, tcg);
@@ -1313,11 +1313,11 @@ static void setup_hardware_state(r200ContextPtr rmesa, radeonTexObj *t)
 #else
         const struct tx_table *table = tx_table_be;
 #endif
-        
+
         t->pp_txformat &= ~(R200_TXFORMAT_FORMAT_MASK |
                             R200_TXFORMAT_ALPHA_IN_MAP);
         t->pp_txfilter &= ~R200_YUV_TO_RGB;
-        
+
         t->pp_txformat |= table[ firstImage->TexFormat ].format;
         t->pp_txfilter |= table[ firstImage->TexFormat ].filter;
 
@@ -1349,9 +1349,9 @@ static void setup_hardware_state(r200ContextPtr rmesa, radeonTexObj *t)
                       R200_TXFORMAT_F5_HEIGHT_MASK);
    t->pp_txformat |= (((log2Width + extra_size) << R200_TXFORMAT_WIDTH_SHIFT) |
                      ((log2Height + extra_size)<< R200_TXFORMAT_HEIGHT_SHIFT));
-   
+
    t->tile_bits = 0;
-   
+
    t->pp_txformat_x &= ~(R200_DEPTH_LOG2_MASK | R200_TEXCOORD_MASK
                   | R200_MIN_MIP_LEVEL_MASK);
 
@@ -1424,7 +1424,7 @@ static GLboolean r200_validate_texture(struct gl_context *ctx, struct gl_texture
       set_re_cntl_d3d( ctx, unit, GL_TRUE );
    R200_STATECHANGE( rmesa, ctx );
    rmesa->hw.ctx.cmd[CTX_PP_CNTL] |= R200_TEX_0_ENABLE << unit;
-   
+
    R200_STATECHANGE( rmesa, vtx );
    rmesa->hw.vtx.cmd[VTX_TCL_OUTPUT_VTXFMT_1] &= ~(7 << (unit * 3));
    rmesa->hw.vtx.cmd[VTX_TCL_OUTPUT_VTXFMT_1] |= 4 << (unit * 3);