projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesa
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
mach64
/
mach64_tex.c
diff --git
a/src/mesa/drivers/dri/mach64/mach64_tex.c
b/src/mesa/drivers/dri/mach64/mach64_tex.c
index a757362b11d82cf75d55863441675f675abce781..6627d3c38a05b82e1261186428a5dbe061c54811 100644
(file)
--- a/
src/mesa/drivers/dri/mach64/mach64_tex.c
+++ b/
src/mesa/drivers/dri/mach64/mach64_tex.c
@@
-130,7
+130,7
@@
mach64AllocTexObj( struct gl_texture_object *texObj )
mach64SetTexWrap( t, texObj->WrapS, texObj->WrapT );
mach64SetTexFilter( t, texObj->MinFilter, texObj->MagFilter );
mach64SetTexWrap( t, texObj->WrapS, texObj->WrapT );
mach64SetTexFilter( t, texObj->MinFilter, texObj->MagFilter );
- mach64SetTexBorderColor( t, texObj->BorderColor );
+ mach64SetTexBorderColor( t, texObj->BorderColor
.f
);
return t;
}
return t;
}
@@
-470,7
+470,7
@@
static void mach64DDTexParameter( GLcontext *ctx, GLenum target,
case GL_TEXTURE_BORDER_COLOR:
if ( t->base.bound ) FLUSH_BATCH( mmesa );
case GL_TEXTURE_BORDER_COLOR:
if ( t->base.bound ) FLUSH_BATCH( mmesa );
- mach64SetTexBorderColor( t, tObj->BorderColor );
+ mach64SetTexBorderColor( t, tObj->BorderColor
.f
);
break;
case GL_TEXTURE_BASE_LEVEL:
break;
case GL_TEXTURE_BASE_LEVEL:
@@
-565,7
+565,6
@@
void mach64InitTextureFuncs( struct dd_function_table *functions )
functions->IsTextureResident = driIsTextureResident;
functions->UpdateTexturePalette = NULL;
functions->IsTextureResident = driIsTextureResident;
functions->UpdateTexturePalette = NULL;
- functions->ActiveTexture = NULL;
driInitTextureFormats();
}
driInitTextureFormats();
}