projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'llvm-cliptest-viewport'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r128
/
r128_texstate.c
diff --git
a/src/mesa/drivers/dri/r128/r128_texstate.c
b/src/mesa/drivers/dri/r128/r128_texstate.c
index 2505b5cd6550c4069dd955c051861d67a8493499..11441639411121747f83b1f80c88dac4aa31cf2d 100644
(file)
--- a/
src/mesa/drivers/dri/r128/r128_texstate.c
+++ b/
src/mesa/drivers/dri/r128/r128_texstate.c
@@
-192,7
+192,7
@@
static void r128SetTexImages( r128ContextPtr rmesa,
#define INPUT_PREVIOUS (R128_INPUT_FACTOR_PREV_COLOR | \
R128_INP_FACTOR_A_PREV_ALPHA)
#define INPUT_PREVIOUS (R128_INPUT_FACTOR_PREV_COLOR | \
R128_INP_FACTOR_A_PREV_ALPHA)
-static GLboolean r128UpdateTextureEnv(
GL
context *ctx, int unit )
+static GLboolean r128UpdateTextureEnv(
struct gl_
context *ctx, int unit )
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
GLint source = rmesa->tmu_source[unit];
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
GLint source = rmesa->tmu_source[unit];
@@
-476,7
+476,7
@@
static GLboolean r128UpdateTextureEnv( GLcontext *ctx, int unit )
return GL_TRUE;
}
return GL_TRUE;
}
-static void disable_tex(
GL
context *ctx, int unit )
+static void disable_tex(
struct gl_
context *ctx, int unit )
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
@@
-499,7
+499,7
@@
static void disable_tex( GLcontext *ctx, int unit )
rmesa->blend_flags &= ~R128_BLEND_MULTITEX;
}
rmesa->blend_flags &= ~R128_BLEND_MULTITEX;
}
-static GLboolean enable_tex_2d(
GL
context *ctx, int unit )
+static GLboolean enable_tex_2d(
struct gl_
context *ctx, int unit )
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
const int source = rmesa->tmu_source[unit];
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
const int source = rmesa->tmu_source[unit];
@@
-524,7
+524,7
@@
static GLboolean enable_tex_2d( GLcontext *ctx, int unit )
return GL_TRUE;
}
return GL_TRUE;
}
-static GLboolean update_tex_common(
GL
context *ctx, int unit )
+static GLboolean update_tex_common(
struct gl_
context *ctx, int unit )
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
const int source = rmesa->tmu_source[unit];
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
const int source = rmesa->tmu_source[unit];
@@
-597,7
+597,7
@@
static GLboolean update_tex_common( GLcontext *ctx, int unit )
return r128UpdateTextureEnv( ctx, unit );
}
return r128UpdateTextureEnv( ctx, unit );
}
-static GLboolean updateTextureUnit(
GL
context *ctx, int unit )
+static GLboolean updateTextureUnit(
struct gl_
context *ctx, int unit )
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
const int source = rmesa->tmu_source[unit];
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
const int source = rmesa->tmu_source[unit];
@@
-618,7
+618,7
@@
static GLboolean updateTextureUnit( GLcontext *ctx, int unit )
}
}
-void r128UpdateTextureState(
GL
context *ctx )
+void r128UpdateTextureState(
struct gl_
context *ctx )
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
GLboolean ok;
{
r128ContextPtr rmesa = R128_CONTEXT(ctx);
GLboolean ok;