mesa: Rename _mesa_lookup_enum_by_nr() to _mesa_enum_to_string().

[mesa.git] / src / mesa / main / depth.c

diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c
index 1e07607c46380e9161d35cbd0b891da22f66b721..c3534407599e8b718363a7e1b70d50dcfa4315da 100644 (file)
--- a/src/mesa/main/depth.c
+++ b/src/mesa/main/depth.c
@@ -1,8 +1,7 @@
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  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"),
@@ -17,9 +16,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -28,7 +28,6 @@
 #include "context.h"
 #include "depth.h"
 #include "enums.h"
-#include "hash.h"
 #include "macros.h"
 #include "mtypes.h"
 
@@ -39,32 +38,35 @@
 
 
 
-void
+void GLAPIENTRY
 _mesa_ClearDepth( GLclampd depth )
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLfloat tmp = (GLfloat) CLAMP( depth, 0.0, 1.0 );
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (ctx->Depth.Clear == tmp)
-      return;
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glClearDepth(%f)\n", depth);
 
-   FLUSH_VERTICES(ctx, _NEW_DEPTH);
-   ctx->Depth.Clear = tmp;
-   if (ctx->Driver.ClearDepth)
-      (*ctx->Driver.ClearDepth)( ctx, ctx->Depth.Clear );
+   ctx->Depth.Clear = CLAMP( depth, 0.0, 1.0 );
 }
 
 
+void GLAPIENTRY
+_mesa_ClearDepthf( GLclampf depth )
+{
+   _mesa_ClearDepth(depth);
+}
 
-void
+
+void GLAPIENTRY
 _mesa_DepthFunc( GLenum func )
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glDepthFunc %s\n", _mesa_lookup_enum_by_nr(func));
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glDepthFunc %s\n", _mesa_enum_to_string(func));
+
+   if (ctx->Depth.Func == func)
+      return;
 
    switch (func) {
    case GL_LESS:    /* (default) pass if incoming z < stored z */
@@ -81,9 +83,6 @@ _mesa_DepthFunc( GLenum func )
       return;
    }
 
-   if (ctx->Depth.Func == func)
-      return;
-
    FLUSH_VERTICES(ctx, _NEW_DEPTH);
    ctx->Depth.Func = func;
 
@@ -93,13 +92,12 @@ _mesa_DepthFunc( GLenum func )
 
 
 
-void
+void GLAPIENTRY
 _mesa_DepthMask( GLboolean flag )
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
+   if (MESA_VERBOSE & VERBOSE_API)
       _mesa_debug(ctx, "glDepthMask %d\n", flag);
 
    /*
@@ -118,12 +116,16 @@ _mesa_DepthMask( GLboolean flag )
 
 
 
-/* GL_EXT_depth_bounds_test */
-void
+/**
+ * Specified by the GL_EXT_depth_bounds_test extension.
+ */
+void GLAPIENTRY
 _mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax )
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glDepthBounds(%f, %f)\n", zmin, zmax);
 
    if (zmin > zmax) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glDepthBoundsEXT(zmin > zmax)");
@@ -146,40 +148,15 @@ _mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax )
 /*****                      Initialization                        *****/
 /**********************************************************************/
 
-void _mesa_init_depth( GLcontext * ctx )
+
+/**
+ * Initialize the depth buffer attribute group in the given context.
+ */
+void
+_mesa_init_depth(struct gl_context *ctx)
 {
-   /* Depth buffer group */
    ctx->Depth.Test = GL_FALSE;
    ctx->Depth.Clear = 1.0;
    ctx->Depth.Func = GL_LESS;
    ctx->Depth.Mask = GL_TRUE;
-   ctx->Depth.OcclusionTest = GL_FALSE;
-
-   /* Z buffer stuff */
-   if (ctx->Visual.depthBits == 0) {
-      /* Special case.  Even if we don't have a depth buffer we need
-       * good values for DepthMax for Z vertex transformation purposes
-       * and for per-fragment fog computation.
-       */
-      ctx->DepthMax = 1 << 16;
-      ctx->DepthMaxF = (GLfloat) ctx->DepthMax;
-   }
-   else if (ctx->Visual.depthBits < 32) {
-      ctx->DepthMax = (1 << ctx->Visual.depthBits) - 1;
-      ctx->DepthMaxF = (GLfloat) ctx->DepthMax;
-   }
-   else {
-      /* Special case since shift values greater than or equal to the
-       * number of bits in the left hand expression's type are undefined.
-       */
-      ctx->DepthMax = 0xffffffff;
-      ctx->DepthMaxF = (GLfloat) ctx->DepthMax;
-   }
-   ctx->MRD = 1.0;  /* Minimum resolvable depth value, for polygon offset */
-
-#if FEATURE_ARB_occlusion_query
-   ctx->Occlusion.QueryObjects = _mesa_NewHashTable();
-#endif
-   ctx->OcclusionResult = GL_FALSE;
-   ctx->OcclusionResultSaved = GL_FALSE;
 }