summaryrefslogtreecommitdiff
path: root/xc/lib/GL/mesa/src/drv/i830/i830_tex.c
diff options
context:
space:
mode:
Diffstat (limited to 'xc/lib/GL/mesa/src/drv/i830/i830_tex.c')
-rw-r--r--xc/lib/GL/mesa/src/drv/i830/i830_tex.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/xc/lib/GL/mesa/src/drv/i830/i830_tex.c b/xc/lib/GL/mesa/src/drv/i830/i830_tex.c
index e90c8c12d..dc0baac86 100644
--- a/xc/lib/GL/mesa/src/drv/i830/i830_tex.c
+++ b/xc/lib/GL/mesa/src/drv/i830/i830_tex.c
@@ -35,13 +35,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
* Keith Whitwell <keithw@tungstengraphics.com>
*/
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <GL/gl.h>
#include "glheader.h"
#include "mtypes.h"
-#include "mem.h"
+#include "imports.h"
#include "simple_list.h"
#include "enums.h"
#include "texstore.h"
@@ -223,7 +219,7 @@ static void i830TexParameter( GLcontext *ctx, GLenum target,
break;
case GL_TEXTURE_BORDER_COLOR:
- i830SetTexBorderColor( t, tObj->BorderColor );
+ i830SetTexBorderColor( t, tObj->_BorderChan );
break;
case GL_TEXTURE_BASE_LEVEL:
@@ -385,7 +381,7 @@ static void i830BindTexture( GLcontext *ctx, GLenum target,
i830SetTexWrapping( t, tObj->WrapS, tObj->WrapT );
i830SetTexFilter( imesa, t, tObj->MinFilter, tObj->MagFilter, bias );
- i830SetTexBorderColor( t, tObj->BorderColor );
+ i830SetTexBorderColor( t, tObj->_BorderChan );
}
}
}