X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi915%2Fi830_texblend.c;h=43328375e31a8a79efa57cdb26c1368f502dfa84;hb=e6ec425d6eeac95f466174267b2c18c0bffca3f0;hp=09f7f37e7650753a8175b4a7fffcfb19348eeb28;hpb=8abc860bd46a6cd584f9a64cb4613be76f82db06;p=mesa.git

diff --git a/src/mesa/drivers/dri/i915/i830_texblend.c b/src/mesa/drivers/dri/i915/i830_texblend.c
index 09f7f37e765..43328375e31 100644
--- a/src/mesa/drivers/dri/i915/i830_texblend.c
+++ b/src/mesa/drivers/dri/i915/i830_texblend.c
@@ -30,8 +30,6 @@
 #include "main/mtypes.h"
 #include "main/simple_list.h"
 #include "main/enums.h"
-#include "main/texformat.h"
-#include "main/texstore.h"
 #include "main/mm.h"
 
 #include "intel_screen.h"
@@ -120,7 +118,7 @@ GetTexelOp(GLint unit)
  * environments are treated identically.
  *
  * \todo
- * This function should return \c GLboolean.  When \c GL_FALSE is returned,
+ * This function should return \c bool.  When \c false is returned,
  * it means that an environment is selected that the hardware cannot do.  This
  * is the way the Radeon and R200 drivers work.
  * 
@@ -146,7 +144,7 @@ i830SetTexEnvCombine(struct i830_context * i830,
    GLuint args_A[3];
    GLuint rgb_shift;
    GLuint alpha_shift;
-   GLboolean need_factor = 0;
+   bool need_factor = 0;
    int i;
    unsigned used;
    static const GLuint tex_blend_rgb[3] = {
@@ -389,7 +387,7 @@ i830SetTexEnvCombine(struct i830_context * i830,
 
 static void
 emit_texblend(struct i830_context *i830, GLuint unit, GLuint blendUnit,
-              GLboolean last_stage)
+              bool last_stage)
 {
    struct gl_texture_unit *texUnit = &i830->intel.ctx.Texture.Unit[unit];
    GLuint tmp[I830_TEXBLEND_SIZE], tmp_sz;
@@ -415,7 +413,7 @@ emit_texblend(struct i830_context *i830, GLuint unit, GLuint blendUnit,
       i830->state.TexBlendWordsUsed[blendUnit] = tmp_sz;
    }
 
-   I830_ACTIVESTATE(i830, I830_UPLOAD_TEXBLEND(blendUnit), GL_TRUE);
+   I830_ACTIVESTATE(i830, I830_UPLOAD_TEXBLEND(blendUnit), true);
 }
 
 static void
@@ -435,16 +433,16 @@ emit_passthrough(struct i830_context *i830)
       i830->state.TexBlendWordsUsed[unit] = tmp_sz;
    }
 
-   I830_ACTIVESTATE(i830, I830_UPLOAD_TEXBLEND(unit), GL_TRUE);
+   I830_ACTIVESTATE(i830, I830_UPLOAD_TEXBLEND(unit), true);
 }
 
 void
 i830EmitTextureBlend(struct i830_context *i830)
 {
-   GLcontext *ctx = &i830->intel.ctx;
+   struct gl_context *ctx = &i830->intel.ctx;
    GLuint unit, last_stage = 0, blendunit = 0;
 
-   I830_ACTIVESTATE(i830, I830_UPLOAD_TEXBLEND_ALL, GL_FALSE);
+   I830_ACTIVESTATE(i830, I830_UPLOAD_TEXBLEND_ALL, false);
 
    if (ctx->Texture._EnabledUnits) {
       for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)