X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fhint.c;h=e2d4129a3821535a825ca0d3f224c8687ef12229;hb=b6e8256899a9a93c665c34e10efcc918f2fcc095;hp=e37cfb1a87d7c9ce8798ab7764635f033350bdff;hpb=3893e638e6521b9c070e01c0b31d22754ff97a88;p=mesa.git

diff --git a/src/mesa/main/hint.c b/src/mesa/main/hint.c
index e37cfb1a87d..e2d4129a382 100644
--- a/src/mesa/main/hint.c
+++ b/src/mesa/main/hint.c
@@ -1,10 +1,9 @@
-/* $Id: hint.c,v 1.10 2001/05/21 16:41:03 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  4.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2002  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"),
@@ -25,66 +24,57 @@
  */
 
 
-#ifdef PC_HEADER
-#include "all.h"
-#else
 #include "glheader.h"
 #include "enums.h"
 #include "context.h"
 #include "hint.h"
-#include "state.h"
-#endif
+#include "imports.h"
 
 
 
-void
+void GLAPIENTRY
 _mesa_Hint( GLenum target, GLenum mode )
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
-   (void) _mesa_try_Hint( ctx, target, mode );
-}
-
 
-GLboolean
-_mesa_try_Hint( GLcontext *ctx, GLenum target, GLenum mode )
-{
    if (MESA_VERBOSE & VERBOSE_API)
-      fprintf(stderr, "glHint %s %d\n", _mesa_lookup_enum_by_nr(target), mode);
+      _mesa_debug(ctx, "glHint %s %d\n",
+                  _mesa_lookup_enum_by_nr(target), mode);
 
    if (mode != GL_NICEST && mode != GL_FASTEST && mode != GL_DONT_CARE) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glHint(mode)");
-      return GL_FALSE;
+      return;
    }
 
    switch (target) {
       case GL_FOG_HINT:
          if (ctx->Hint.Fog == mode)
-	    return GL_TRUE;
+	    return;
 	 FLUSH_VERTICES(ctx, _NEW_HINT);
          ctx->Hint.Fog = mode;
          break;
       case GL_LINE_SMOOTH_HINT:
          if (ctx->Hint.LineSmooth == mode)
-	    return GL_TRUE;
+	    return;
 	 FLUSH_VERTICES(ctx, _NEW_HINT);
          ctx->Hint.LineSmooth = mode;
          break;
       case GL_PERSPECTIVE_CORRECTION_HINT:
          if (ctx->Hint.PerspectiveCorrection == mode)
-	    return GL_TRUE;
+	    return;
 	 FLUSH_VERTICES(ctx, _NEW_HINT);
          ctx->Hint.PerspectiveCorrection = mode;
          break;
       case GL_POINT_SMOOTH_HINT:
          if (ctx->Hint.PointSmooth == mode)
-	    return GL_TRUE;
+	    return;
 	 FLUSH_VERTICES(ctx, _NEW_HINT);
          ctx->Hint.PointSmooth = mode;
          break;
       case GL_POLYGON_SMOOTH_HINT:
          if (ctx->Hint.PolygonSmooth == mode)
-	    return GL_TRUE;
+	    return;
 	 FLUSH_VERTICES(ctx, _NEW_HINT);
          ctx->Hint.PolygonSmooth = mode;
          break;
@@ -92,19 +82,15 @@ _mesa_try_Hint( GLcontext *ctx, GLenum target, GLenum mode )
       /* GL_EXT_clip_volume_hint */
       case GL_CLIP_VOLUME_CLIPPING_HINT_EXT:
          if (ctx->Hint.ClipVolumeClipping == mode)
-	    return GL_TRUE;
+	    return;
 	 FLUSH_VERTICES(ctx, _NEW_HINT);
          ctx->Hint.ClipVolumeClipping = mode;
          break;
 
       /* GL_ARB_texture_compression */
       case GL_TEXTURE_COMPRESSION_HINT_ARB:
-         if (!ctx->Extensions.ARB_texture_compression) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");
-	    return GL_FALSE;
-         }
 	 if (ctx->Hint.TextureCompression == mode)
-	    return GL_TRUE;
+	    return;
 	 FLUSH_VERTICES(ctx, _NEW_HINT);
 	 ctx->Hint.TextureCompression = mode;
          break;
@@ -113,22 +99,51 @@ _mesa_try_Hint( GLcontext *ctx, GLenum target, GLenum mode )
       case GL_GENERATE_MIPMAP_HINT_SGIS:
          if (!ctx->Extensions.SGIS_generate_mipmap) {
             _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");
-	    return GL_FALSE;
+	    return;
          }
          if (ctx->Hint.GenerateMipmap == mode)
-            return GL_TRUE;
+            return;
 	 FLUSH_VERTICES(ctx, _NEW_HINT);
 	 ctx->Hint.GenerateMipmap = mode;
          break;
 
+      /* GL_ARB_fragment_shader */
+      case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB:
+         if (!ctx->Extensions.ARB_fragment_shader) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");
+            return;
+         }
+         if (ctx->Hint.FragmentShaderDerivative == mode)
+            return;
+         FLUSH_VERTICES(ctx, _NEW_HINT);
+         ctx->Hint.FragmentShaderDerivative = mode;
+         break;
+
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");
-         return GL_FALSE;
+         return;
    }
 
    if (ctx->Driver.Hint) {
       (*ctx->Driver.Hint)( ctx, target, mode );
    }
+}
 
-   return GL_TRUE;
+
+/**********************************************************************/
+/*****                      Initialization                        *****/
+/**********************************************************************/
+
+void _mesa_init_hint( GLcontext * ctx )
+{
+   /* Hint group */
+   ctx->Hint.PerspectiveCorrection = GL_DONT_CARE;
+   ctx->Hint.PointSmooth = GL_DONT_CARE;
+   ctx->Hint.LineSmooth = GL_DONT_CARE;
+   ctx->Hint.PolygonSmooth = GL_DONT_CARE;
+   ctx->Hint.Fog = GL_DONT_CARE;
+   ctx->Hint.ClipVolumeClipping = GL_DONT_CARE;
+   ctx->Hint.TextureCompression = GL_DONT_CARE;
+   ctx->Hint.GenerateMipmap = GL_DONT_CARE;
+   ctx->Hint.FragmentShaderDerivative = GL_DONT_CARE;
 }