diff options
| -rw-r--r-- | src/mesa/main/debug.c | 43 | ||||
| -rw-r--r-- | src/mesa/main/debug.h | 28 | ||||
| -rw-r--r-- | src/mesa/main/state.c | 17 |
3 files changed, 20 insertions, 68 deletions
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c index 5848acaafe..77ac9e85bb 100644 --- a/src/mesa/main/debug.c +++ b/src/mesa/main/debug.c @@ -1,9 +1,8 @@ - /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 6.1 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 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"), @@ -108,44 +107,6 @@ _mesa_print_tri_caps( const char *name, GLuint flags ) } -void -_mesa_check_driver_hooks( GLcontext *ctx ) -{ - ASSERT(ctx->Driver.GetString); - ASSERT(ctx->Driver.UpdateState); - ASSERT(ctx->Driver.Clear); - ASSERT(ctx->Driver.GetBufferSize); - if (ctx->Visual.accumRedBits > 0) { - ASSERT(ctx->Driver.Accum); - } - ASSERT(ctx->Driver.DrawPixels); - ASSERT(ctx->Driver.ReadPixels); - ASSERT(ctx->Driver.CopyPixels); - ASSERT(ctx->Driver.Bitmap); - ASSERT(ctx->Driver.ResizeBuffers); - ASSERT(ctx->Driver.TexImage1D); - ASSERT(ctx->Driver.TexImage2D); - ASSERT(ctx->Driver.TexImage3D); - ASSERT(ctx->Driver.TexSubImage1D); - ASSERT(ctx->Driver.TexSubImage2D); - ASSERT(ctx->Driver.TexSubImage3D); - ASSERT(ctx->Driver.CopyTexImage1D); - ASSERT(ctx->Driver.CopyTexImage2D); - ASSERT(ctx->Driver.CopyTexSubImage1D); - ASSERT(ctx->Driver.CopyTexSubImage2D); - ASSERT(ctx->Driver.CopyTexSubImage3D); - if (ctx->Extensions.ARB_texture_compression) { -#if 0 /* HW drivers need these, but not SW rasterizers */ - ASSERT(ctx->Driver.CompressedTexImage1D); - ASSERT(ctx->Driver.CompressedTexImage2D); - ASSERT(ctx->Driver.CompressedTexImage3D); - ASSERT(ctx->Driver.CompressedTexSubImage1D); - ASSERT(ctx->Driver.CompressedTexSubImage2D); - ASSERT(ctx->Driver.CompressedTexSubImage3D); -#endif - } -} - /** * Print information about this Mesa version and build options. */ diff --git a/src/mesa/main/debug.h b/src/mesa/main/debug.h index 4d17771ce5..94d99c384b 100644 --- a/src/mesa/main/debug.h +++ b/src/mesa/main/debug.h @@ -1,18 +1,8 @@ -/** - * \file debug.h - * Debugging functions. - * - * \if subset - * (No-op) - * - * \endif - */ - /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 6.1 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 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"), @@ -32,6 +22,16 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/** + * \file debug.h + * Debugging functions. + * + * \if subset + * (No-op) + * + * \endif + */ + #ifndef _DEBUG_H #define _DEBUG_H @@ -43,7 +43,6 @@ extern void _mesa_print_enable_flags( const char *msg, GLuint flags ); extern void _mesa_print_state( const char *msg, GLuint state ); extern void _mesa_print_info( void ); extern void _mesa_init_debug( GLcontext *ctx ); -extern void _mesa_check_driver_hooks( GLcontext *ctx ); #else @@ -56,9 +55,6 @@ extern void _mesa_check_driver_hooks( GLcontext *ctx ); /** No-op */ #define _mesa_init_debug( c ) ((void)0) -/** No-op */ -#define _mesa_check_driver_hooks( c ) ((void)0) - #endif #endif diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 4c6f75a881..0ed7300c19 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -8,9 +8,9 @@ /* * Mesa 3-D graphics library - * Version: 5.1 + * Version: 6.1 * - * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 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"), @@ -914,10 +914,10 @@ void _mesa_update_state( GLcontext *ctx ) _mesa_update_tnl_spaces( ctx, new_state ); /* - * Here the driver sets up all the ctx->Driver function pointers - * to it's specific, private functions, and performs any - * internal state management necessary, including invalidating - * state of active modules. + * Give the driver a chance to act upon the new_state flags. + * The driver might plug in different span functions, for example. + * Also, this is where the driver can invalidate the state of any + * active modules (such as swrast_setup, swrast, tnl, etc). * * Set ctx->NewState to zero to avoid recursion if * Driver.UpdateState() has to call FLUSH_VERTICES(). (fixed?) @@ -925,11 +925,6 @@ void _mesa_update_state( GLcontext *ctx ) ctx->NewState = 0; ctx->Driver.UpdateState(ctx, new_state); ctx->Array.NewState = 0; - - /* At this point we can do some assertions to be sure the required - * device driver function pointers are all initialized. - */ - _mesa_check_driver_hooks( ctx ); } /*@}*/ |