simplify, clean-up texel addressing macros

[mesa.git] / src / mesa / main / context.h

diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 663cfc8450051519ed478fb90dd60b8d7b9688a1..8b7e7c9952b36ecd526a46bb56967618bb6f4def 100644 (file)
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -21,9 +21,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * 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"),
@@ -98,34 +98,6 @@ _mesa_destroy_visual( GLvisual *vis );
 /*@}*/
 
 
-/**********************************************************************/
-/** \name Create/destroy a GLframebuffer. */
-/*@{*/
- 
-extern GLframebuffer *
-_mesa_create_framebuffer( const GLvisual *visual,
-                          GLboolean softwareDepth,
-                          GLboolean softwareStencil,
-                          GLboolean softwareAccum,
-                          GLboolean softwareAlpha );
-
-extern void
-_mesa_initialize_framebuffer( GLframebuffer *fb,
-                              const GLvisual *visual,
-                              GLboolean softwareDepth,
-                              GLboolean softwareStencil,
-                              GLboolean softwareAccum,
-                              GLboolean softwareAlpha );
-
-extern void
-_mesa_free_framebuffer_data( GLframebuffer *buffer );
-
-extern void
-_mesa_destroy_framebuffer( GLframebuffer *buffer );
-
-/*@}*/
-
-
 /**********************************************************************/
 /** \name Create/destroy a GLcontext. */
 /*@{*/
@@ -133,15 +105,15 @@ _mesa_destroy_framebuffer( GLframebuffer *buffer );
 extern GLcontext *
 _mesa_create_context( const GLvisual *visual,
                       GLcontext *share_list,
-                      void *driver_ctx,
-                      GLboolean direct );
+                      const struct dd_function_table *driverFunctions,
+                      void *driverContext );
 
 extern GLboolean
 _mesa_initialize_context( GLcontext *ctx,
                           const GLvisual *visual,
                           GLcontext *share_list,
-                          void *driver_ctx,
-                          GLboolean direct );
+                          const struct dd_function_table *driverFunctions,
+                          void *driverContext );
 
 extern void
 _mesa_free_context_data( GLcontext *ctx );
@@ -155,13 +127,11 @@ _mesa_copy_context(const GLcontext *src, GLcontext *dst, GLuint mask);
 
 
 extern void
-_mesa_make_current( GLcontext *ctx, GLframebuffer *buffer );
-
-
-extern void
-_mesa_make_current2( GLcontext *ctx, GLframebuffer *drawBuffer,
-                     GLframebuffer *readBuffer );
+_mesa_make_current( GLcontext *ctx, GLframebuffer *drawBuffer,
+                    GLframebuffer *readBuffer );
 
+extern GLboolean
+_mesa_share_state(GLcontext *ctx, GLcontext *ctxToShare);
 
 extern GLcontext *
 _mesa_get_current_context(void);
@@ -169,31 +139,6 @@ _mesa_get_current_context(void);
 /*@}*/
 
 
-/**
- * Macro for declaration and fetching the current context.
- *
- * \param C local variable which will hold the current context.
- *
- * It should be used in the variable declaration area of a function:
- * \code
- * ...
- * {
- *   GET_CURRENT_CONTEXT(ctx);
- *   ...
- * \endcode
- */
-#ifdef THREADS
-
-#define GET_CURRENT_CONTEXT(C) GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context())
-
-#else
-
-#define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_Context
-
-#endif
-
-
-
 /**********************************************************************/
 /** \name OpenGL SI-style export functions. */
 /*@{*/
@@ -278,7 +223,7 @@ _mesa_Flush( void );
 #define FLUSH_VERTICES(ctx, newstate)                          \
 do {                                                           \
    if (MESA_VERBOSE & VERBOSE_STATE)                           \
-      _mesa_debug(ctx, "FLUSH_VERTICES in %s\n", __FUNCTION__);        \
+      _mesa_debug(ctx, "FLUSH_VERTICES in %s\n", MESA_FUNCTION);\
    if (ctx->Driver.NeedFlush & FLUSH_STORED_VERTICES)          \
       ctx->Driver.FlushVertices(ctx, FLUSH_STORED_VERTICES);   \
    ctx->NewState |= newstate;                                  \
@@ -297,7 +242,7 @@ do {                                                                \
 #define FLUSH_CURRENT(ctx, newstate)                           \
 do {                                                           \
    if (MESA_VERBOSE & VERBOSE_STATE)                           \
-      _mesa_debug(ctx, "FLUSH_CURRENT in %s\n", __FUNCTION__); \
+      _mesa_debug(ctx, "FLUSH_CURRENT in %s\n", MESA_FUNCTION);        \
    if (ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT)           \
       ctx->Driver.FlushVertices(ctx, FLUSH_UPDATE_CURRENT);    \
    ctx->NewState |= newstate;                                  \
@@ -374,7 +319,12 @@ do {                                                                       \
 #define NEED_SECONDARY_COLOR(CTX)                                      \
    (((CTX)->Light.Enabled &&                                           \
      (CTX)->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)    \
-    || (CTX)->Fog.ColorSumEnabled)
+    || (CTX)->Fog.ColorSumEnabled                                      \
+    || ((CTX)->VertexProgram._Enabled &&                               \
+        ((CTX)->VertexProgram.Current->InputsRead & VERT_BIT_COLOR1))  \
+    || ((CTX)->FragmentProgram._Enabled &&                             \
+        ((CTX)->FragmentProgram.Current->InputsRead & FRAG_BIT_COL1))  \
+   )
 
 
 /**