Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / mesa / drivers / dri / mga / mgatex.h

diff --git a/src/mesa/drivers/dri/mga/mgatex.h b/src/mesa/drivers/dri/mga/mgatex.h
index c9f87d997e2a6e073ee3830e7632a18061768c1c..3827fb06686436d8adc8793d27d4c47ad880a0ca 100644 (file)
--- a/src/mesa/drivers/dri/mga/mgatex.h
+++ b/src/mesa/drivers/dri/mga/mgatex.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgatex.h,v 1.7 2002/10/30 12:51:36 alanh Exp $ */
 /*
  * Copyright 2000-2001 VA Linux Systems, Inc.
  * All Rights Reserved.
@@ -38,25 +37,14 @@ typedef struct mga_texture_object_s *mgaTextureObjectPtr;
  * state is properly setup.  Texture residence is checked later
  * when we grab the lock.
  */
-void mgaUpdateTextureState( GLcontext *ctx );
-
-void mgaConvertTexture( GLuint *dest, int texelBytes,
-                       struct gl_texture_image *image,
-                       int x, int y, int width, int height );
-
-
-void mgaUploadSubImageLocked( mgaContextPtr mmesa,
-                             mgaTextureObjectPtr t,
-                             int level,
-                             int x, int y, int width, int height );
+void mgaUpdateTextureState( struct gl_context *ctx );
 
 int mgaUploadTexImages( mgaContextPtr mmesa, mgaTextureObjectPtr t );
 
 void mgaDestroyTexObj( mgaContextPtr mmesa, mgaTextureObjectPtr t );
 
-void mgaAgeTextures( mgaContextPtr mmesa, int heap );
-
-void mgaDDInitTextureFuncs( GLcontext *ctx );
+void mgaInitTextureFuncs( struct dd_function_table *functions );
 
+GLboolean mgaUpdateTextureEnvCombine( struct gl_context *ctx, int unit );
 
 #endif