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 fb7ffcff1675ebb883d7a5d8777d48d0bb470057..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,7 +37,7 @@ 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 mgaUpdateTextureState( struct gl_context *ctx );
 
 int mgaUploadTexImages( mgaContextPtr mmesa, mgaTextureObjectPtr t );
 
@@ -46,6 +45,6 @@ void mgaDestroyTexObj( mgaContextPtr mmesa, mgaTextureObjectPtr t );
 
 void mgaInitTextureFuncs( struct dd_function_table *functions );
 
-GLboolean mgaUpdateTextureEnvCombine( GLcontext *ctx, int unit );
+GLboolean mgaUpdateTextureEnvCombine( struct gl_context *ctx, int unit );
 
 #endif