summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_texture.h
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2003-01-26 14:37:15 +0000
committerBrian Paul <[email protected]>2003-01-26 14:37:15 +0000
commit45b47d079f6a749c15498a6cef78d891f8acb665 (patch)
tree63f53e25c3ebf3f0320a27ab72f0e13491021c77 /src/mesa/swrast/s_texture.h
parent7cac85d00a6110aa92236b2e841faeeb34f684c1 (diff)
Make GL_SGI_texture_color_table work per-texture unit.
Clean-up and optimize _swrast_texture_table_lookup().
Diffstat (limited to 'src/mesa/swrast/s_texture.h')
-rw-r--r--src/mesa/swrast/s_texture.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_texture.h b/src/mesa/swrast/s_texture.h
index a920c0fb7c0..388c2db08d7 100644
--- a/src/mesa/swrast/s_texture.h
+++ b/src/mesa/swrast/s_texture.h
@@ -1,10 +1,10 @@
-/* $Id: s_texture.h,v 1.13 2002/05/02 00:59:20 brianp Exp $ */
+/* $Id: s_texture.h,v 1.14 2003/01/26 14:37:17 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 5.1
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -34,6 +34,10 @@
extern void
+_swrast_texture_table_lookup( const struct gl_color_table *table,
+ GLuint n, GLchan rgba[][4] );
+
+extern void
_swrast_choose_texture_sample_func( GLcontext *ctx,
GLuint texUnit,
const struct gl_texture_object *tObj );