Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / drivers / dri / sis / sis_tex.h

diff --git a/src/mesa/drivers/dri/sis/sis_tex.h b/src/mesa/drivers/dri/sis/sis_tex.h
index 188cce5a50fa48d606dcad2f003cb3472b0fdae3..f467b7dca9eeb4392cf77f6550bfefabfa72a2d0 100644 (file)
--- a/src/mesa/drivers/dri/sis/sis_tex.h
+++ b/src/mesa/drivers/dri/sis/sis_tex.h
@@ -17,13 +17,11 @@ Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
+ERIC ANHOLT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86$ */
 
 /*
  * Authors:
@@ -33,10 +31,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __SIS_TEX_H__
 #define __SIS_TEX_H__
 
-#ifdef GLX_DIRECT_RENDERING
+extern void sisInitTextureFuncs( struct dd_function_table *table );
+extern void sisUpdateTextureState( struct gl_context *ctx );
 
-extern void sisDDInitTextureFuncs( GLcontext *ctx );
-extern void sisUpdateTextureState( GLcontext *ctx );
-
-#endif /* GLX_DIRECT_RENDERING */
 #endif /* __SIS_TEX_H__ */