intel: remove duplicated #include of texstore.h

[mesa.git] / src / mesa / drivers / dri / i915 / i915_context.h

diff --git a/src/mesa/drivers/dri/i915/i915_context.h b/src/mesa/drivers/dri/i915/i915_context.h
index 601620275f46d0d19ad0ccd8ba7bcb098a3aa5d3..81671371151f88a494e8e1755297e7cf580e3fbc 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_context.h
+++ b/src/mesa/drivers/dri/i915/i915_context.h
@@ -46,7 +46,6 @@
 #define I915_UPLOAD_STIPPLE          0x4
 #define I915_UPLOAD_PROGRAM          0x8
 #define I915_UPLOAD_CONSTANTS        0x10
-#define I915_UPLOAD_FOG              0x20
 #define I915_UPLOAD_INVARIENT        0x40
 #define I915_UPLOAD_DEFAULTS         0x80
 #define I915_UPLOAD_RASTER_RULES     0x100
@@ -91,13 +90,6 @@
 #define I915_BLENDREG_BLENDCOLOR1      2
 #define I915_BLEND_SETUP_SIZE          3
 
-#define I915_FOGREG_COLOR              0
-#define I915_FOGREG_MODE0              1
-#define I915_FOGREG_MODE1              2
-#define I915_FOGREG_MODE2              3
-#define I915_FOGREG_MODE3              4
-#define I915_FOG_SETUP_SIZE            5
-
 #define I915_STPREG_ST0        0
 #define I915_STPREG_ST1        1
 #define I915_STP_SETUP_SIZE    2
@@ -147,10 +139,10 @@ struct i915_fragment_program
 {
    struct gl_fragment_program FragProg;
 
-   GLboolean translated;
-   GLboolean params_uptodate;
-   GLboolean on_hardware;
-   GLboolean error;             /* If program is malformed for any reason. */
+   bool translated;
+   bool params_uptodate;
+   bool on_hardware;
+   bool error;             /* If program is malformed for any reason. */
 
    /** Record of which phases R registers were last written in. */
    GLuint register_phases[16];
@@ -202,7 +194,7 @@ struct i915_fragment_program
    /* Helpers for i915_fragprog.c:
     */
    GLuint wpos_tex;
-   GLboolean depth_written;
+   bool depth_written;
 
    struct
    {
@@ -227,7 +219,6 @@ struct i915_hw_state
    GLuint Blend[I915_BLEND_SETUP_SIZE];
    GLuint Buffer[I915_DEST_SETUP_SIZE];
    GLuint Stipple[I915_STP_SETUP_SIZE];
-   GLuint Fog[I915_FOG_SETUP_SIZE];
    GLuint Defaults[I915_DEF_SETUP_SIZE];
    GLuint RasterRules[I915_RASTER_RULES_SETUP_SIZE];
    GLuint Tex[I915_TEX_UNITS][I915_TEX_SETUP_SIZE];
@@ -254,16 +245,11 @@ struct i915_hw_state
    GLuint emitted;              /* I915_UPLOAD_* */
 };
 
-#define I915_FOG_PIXEL  2
-#define I915_FOG_VERTEX 1
-#define I915_FOG_NONE   0
-
 struct i915_context
 {
    struct intel_context intel;
 
    GLuint last_ReallyEnabled;
-   GLuint vertex_fog;
    GLuint lodbias_ss2[MAX_TEXTURE_UNITS];
 
 
@@ -332,10 +318,10 @@ do {                                                                      \
 /*======================================================================
  * i915_context.c
  */
-extern GLboolean i915CreateContext(int api,
-                                  const struct gl_config * mesaVis,
-                                   __DRIcontext * driContextPriv,
-                                   void *sharedContextPrivate);
+extern bool i915CreateContext(int api,
+                             const struct gl_config * mesaVis,
+                             __DRIcontext * driContextPriv,
+                             void *sharedContextPrivate);
 
 
 /*======================================================================
@@ -350,7 +336,6 @@ extern void i915_print_ureg(const char *msg, GLuint ureg);
  */
 extern void i915InitStateFunctions(struct dd_function_table *functions);
 extern void i915InitState(struct i915_context *i915);
-extern void i915_update_fog(struct gl_context * ctx);
 extern void i915_update_stencil(struct gl_context * ctx);
 extern void i915_update_provoking_vertex(struct gl_context *ctx);