projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: GL_ARB_shader_objects is not optional
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i915
/
i830_texblend.c
diff --git
a/src/mesa/drivers/dri/i915/i830_texblend.c
b/src/mesa/drivers/dri/i915/i830_texblend.c
index 09f7f37e7650753a8175b4a7fffcfb19348eeb28..43328375e31a8a79efa57cdb26c1368f502dfa84 100644
(file)
--- 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/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"
#include "main/mm.h"
#include "intel_screen.h"
@@
-120,7
+118,7
@@
GetTexelOp(GLint unit)
* environments are treated identically.
*
* \todo
* 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.
*
* 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;
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] = {
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,
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;
{
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->state.TexBlendWordsUsed[blendUnit] = tmp_sz;
}
- I830_ACTIVESTATE(i830, I830_UPLOAD_TEXBLEND(blendUnit),
GL_TRUE
);
+ I830_ACTIVESTATE(i830, I830_UPLOAD_TEXBLEND(blendUnit),
true
);
}
static void
}
static void
@@
-435,16
+433,16
@@
emit_passthrough(struct i830_context *i830)
i830->state.TexBlendWordsUsed[unit] = tmp_sz;
}
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)
{
}
void
i830EmitTextureBlend(struct i830_context *i830)
{
-
GL
context *ctx = &i830->intel.ctx;
+
struct gl_
context *ctx = &i830->intel.ctx;
GLuint unit, last_stage = 0, blendunit = 0;
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++)
if (ctx->Texture._EnabledUnits) {
for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)