nouveau: unbreak nv40

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

diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 4b041edc6d525e5f6f68e9264a522d47622cead4..e7e0fda72ead811d259d178b2741ae337961dd78 100644 (file)
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -1,29 +1,8 @@
-/**
- * \file context.h
- * Mesa context/visual/framebuffer management functions.
- *
- * There are three Mesa data types which are meant to be used by device
- * drivers:
- * - GLcontext: this contains the Mesa rendering state
- * - GLvisual:  this describes the color buffer (RGB vs. ci), whether or not
- *   there's a depth buffer, stencil buffer, etc.
- * - GLframebuffer:  contains pointers to the depth buffer, stencil buffer,
- *   accum buffer and alpha buffers.
- *
- * These types should be encapsulated by corresponding device driver
- * data types.  See xmesa.h and xmesaP.h for an example.
- *
- * In OOP terms, GLcontext, GLvisual, and GLframebuffer are base classes
- * which the device driver must derive from.
- *
- * The following functions create and destroy these data types.
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.5.1
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  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"),
@@ -44,6 +23,28 @@
  */
 
 
+/**
+ * \file context.h
+ * Mesa context and visual-related functions.
+ *
+ * There are three large Mesa data types/classes which are meant to be
+ * used by device drivers:
+ * - GLcontext: this contains the Mesa rendering state
+ * - GLvisual:  this describes the color buffer (RGB vs. ci), whether or not
+ *   there's a depth buffer, stencil buffer, etc.
+ * - GLframebuffer:  contains pointers to the depth buffer, stencil buffer,
+ *   accum buffer and alpha buffers.
+ *
+ * These types should be encapsulated by corresponding device driver
+ * data types.  See xmesa.h and xmesaP.h for an example.
+ *
+ * In OOP terms, GLcontext, GLvisual, and GLframebuffer are base classes
+ * which the device driver must derive from.
+ *
+ * The following functions create and destroy these data types.
+ */
+
+
 #ifndef CONTEXT_H
 #define CONTEXT_H
 
@@ -53,8 +54,7 @@
 #include "mtypes.h"
 
 
-/**********************************************************************/
-/** \name Create/destroy a GLvisual. */
+/** \name Visual-related functions */
 /*@{*/
  
 extern GLvisual *
@@ -98,36 +98,7 @@ _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. */
+/** \name Context-related functions */
 /*@{*/
 
 extern GLcontext *
@@ -155,12 +126,8 @@ _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);
@@ -171,8 +138,7 @@ _mesa_get_current_context(void);
 /*@}*/
 
 
-/**********************************************************************/
-/** \name OpenGL SI-style export functions. */
+/** \name OpenGL SI-style export functions */
 /*@{*/
 
 extern GLboolean
@@ -219,14 +185,12 @@ _mesa_get_dispatch(GLcontext *ctx);
 
 
 
-/**********************************************************************/
 /** \name Miscellaneous */
 /*@{*/
 
 extern void
 _mesa_record_error( GLcontext *ctx, GLenum error );
 
-
 extern void GLAPIENTRY
 _mesa_Finish( void );
 
@@ -237,11 +201,12 @@ _mesa_Flush( void );
 
 
 
-/**********************************************************************/
-/** \name Macros for contexts/flushing. */
+/**
+ * \name Macros for flushing buffered rendering commands before state changes,
+ * checking if inside glBegin/glEnd, etc.
+ */
 /*@{*/
 
-
 /**
  * Flush vertices.
  *
@@ -290,7 +255,7 @@ do {                                                                \
 #define ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, retval)              \
 do {                                                                   \
    if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {   \
-      _mesa_error( ctx, GL_INVALID_OPERATION, "begin/end" );           \
+      _mesa_error(ctx, GL_INVALID_OPERATION, "Inside glBegin/glEnd");  \
       return retval;                                                   \
    }                                                                   \
 } while (0)
@@ -304,7 +269,7 @@ do {                                                                        \
 #define ASSERT_OUTSIDE_BEGIN_END(ctx)                                  \
 do {                                                                   \
    if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {   \
-      _mesa_error( ctx, GL_INVALID_OPERATION, "begin/end" );           \
+      _mesa_error(ctx, GL_INVALID_OPERATION, "Inside glBegin/glEnd");  \
       return;                                                          \
    }                                                                   \
 } while (0)
@@ -334,17 +299,10 @@ do {                                                                      \
    FLUSH_VERTICES(ctx, 0);                                             \
 } while (0)
 
-
 /*@}*/
 
 
 
-/**
- * Macros to help evaluate current state conditions
- */
-
-/*@{*/
-
 /**
  * Is the secondary color needed?
  */
@@ -353,20 +311,18 @@ do {                                                                      \
      (CTX)->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)    \
     || (CTX)->Fog.ColorSumEnabled                                      \
     || ((CTX)->VertexProgram._Enabled &&                               \
-        ((CTX)->VertexProgram.Current->InputsRead & VERT_BIT_COLOR1))  \
+        ((CTX)->VertexProgram.Current->Base.InputsRead & VERT_BIT_COLOR1)) \
     || ((CTX)->FragmentProgram._Enabled &&                             \
-        ((CTX)->FragmentProgram.Current->InputsRead & FRAG_BIT_COL1))  \
+        ((CTX)->FragmentProgram.Current->Base.InputsRead & FRAG_BIT_COL1)) \
    )
 
 
 /**
- * Is two-sided lighting in effect?
+ * Is RGBA LogicOp enabled?
  */
-#define NEED_TWO_SIDED_LIGHTING(CTX) \
-   (ctx->Light.Enabled && ctx->Light.Model.TwoSide)
-
-
-/*@}*/
+#define RGBA_LOGICOP_ENABLED(CTX) \
+  ((CTX)->Color.ColorLogicOpEnabled || \
+   ((CTX)->Color.BlendEnabled && (CTX)->Color.BlendEquationRGB == GL_LOGIC_OP))
 
 
-#endif
+#endif /* CONTEXT_H */