remove final imports.h and imports.c bits

[mesa.git] / src / mesa / drivers / dri / i915 / i915_vtbl.c

diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c
index 44c41bb43dcc45055b8b3a63fd25edf8cc388ce0..8c0f64c2386ca64a0bc61efa601c0c90de6f76b4 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_vtbl.c
+++ b/src/mesa/drivers/dri/i915/i915_vtbl.c
@@ -1,8 +1,8 @@
 /**************************************************************************
- * 
+ *
  * Copyright 2003 VMware, Inc.
  * All Rights Reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
@@ -10,11 +10,11 @@
  * distribute, sub license, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the
  * next paragraph) shall be included in all copies or substantial portions
  * of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
@@ -22,14 +22,13 @@
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
+ *
  **************************************************************************/
 
 
 
 #include "main/glheader.h"
 #include "main/mtypes.h"
-#include "util/imports.h"
 #include "main/macros.h"
 #include "main/renderbuffer.h"
 #include "main/framebuffer.h"
@@ -96,7 +95,7 @@ i915_reduced_primitive_state(struct intel_context *intel, GLenum rprim)
 
 
 /* Pull apart the vertex format registers and figure out how large a
- * vertex is supposed to be. 
+ * vertex is supposed to be.
  */
 static bool
 i915_check_vertex_size(struct intel_context *intel, GLuint expected)
@@ -341,7 +340,7 @@ i915_emit_state(struct intel_context *intel)
    }
 
    /* work out list of buffers to emit */
-   
+
    /* Do this here as we may have flushed the batchbuffer above,
     * causing more state to be dirty!
     */
@@ -432,7 +431,7 @@ i915_emit_state(struct intel_context *intel)
    }
 
    /* Combine all the dirty texture state into a single command to
-    * avoid lockups on I915 hardware. 
+    * avoid lockups on I915 hardware.
     */
    if (dirty & I915_UPLOAD_TEX_ALL) {
       int nr = 0;
@@ -820,7 +819,7 @@ i915_new_batch(struct intel_context *intel)
    i915->current_vertex_size = 0;
 }
 
-static void 
+static void
 i915_assert_not_dirty( struct intel_context *intel )
 {
    struct i915_context *i915 = i915_context(&intel->ctx);