projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: make texture BorderColor a union of float/int/uint
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
mga
/
mgatex.c
diff --git
a/src/mesa/drivers/dri/mga/mgatex.c
b/src/mesa/drivers/dri/mga/mgatex.c
index 9163371b3325cbc3ae297c5f84abe41d6098a059..62a9317cd48ab317aa946f2463874e062cc03074 100644
(file)
--- a/
src/mesa/drivers/dri/mga/mgatex.c
+++ b/
src/mesa/drivers/dri/mga/mgatex.c
@@
-332,7
+332,7
@@
mgaAllocTexObj( struct gl_texture_object *tObj )
mgaSetTexWrapping( t, tObj->WrapS, tObj->WrapT );
mgaSetTexFilter( t, tObj->MinFilter, tObj->MagFilter );
mgaSetTexWrapping( t, tObj->WrapS, tObj->WrapT );
mgaSetTexFilter( t, tObj->MinFilter, tObj->MagFilter );
- mgaSetTexBorderColor( t, tObj->BorderColor );
+ mgaSetTexBorderColor( t, tObj->BorderColor
.f
);
}
return( t );
}
return( t );
@@
-461,7
+461,7
@@
mgaTexParameter( GLcontext *ctx, GLenum target,
case GL_TEXTURE_BORDER_COLOR:
FLUSH_BATCH(mmesa);
case GL_TEXTURE_BORDER_COLOR:
FLUSH_BATCH(mmesa);
- mgaSetTexBorderColor(t, tObj->BorderColor);
+ mgaSetTexBorderColor(t, tObj->BorderColor
.f
);
break;
case GL_TEXTURE_BASE_LEVEL:
break;
case GL_TEXTURE_BASE_LEVEL: