projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added Window-isms previously in gl.h
[mesa.git] / src / mesa / main / hint.c
diff --git a/src/mesa/main/hint.c b/src/mesa/main/hint.c
index eeed3f8afa0dd5907c2cb8965a330a4ee4b1bea9..3621176b37e8b2553f180fda7381636008e73616 100644 (file)
--- a/src/mesa/main/hint.c
+++ b/src/mesa/main/hint.c
@@ -1,4 +1,4 @@
-/* $Id: hint.c,v 1.1 2000/02/02 19:14:56 brianp Exp $ */
+/* $Id: hint.c,v 1.3 2000/04/10 15:52:26 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -53,78 +53,84 @@ _mesa_try_Hint( GLcontext *ctx, GLenum target, GLenum mode )
    if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glHint %s %d\n", gl_lookup_enum_by_nr(target), mode);
 
-   switch (target) {
-   case GL_FOG_HINT:
-      ctx->Hint.Fog = mode;
-      break;
-   case GL_LINE_SMOOTH_HINT:
-      ctx->Hint.LineSmooth = mode;
-      break;
-   case GL_PERSPECTIVE_CORRECTION_HINT:
-      ctx->Hint.PerspectiveCorrection = mode;
-      break;
-   case GL_POINT_SMOOTH_HINT:
-      ctx->Hint.PointSmooth = mode;
-      break;
-   case GL_POLYGON_SMOOTH_HINT:
-      ctx->Hint.PolygonSmooth = mode;
-      break;
-   case GL_PREFER_DOUBLEBUFFER_HINT_PGI:
-   case GL_STRICT_DEPTHFUNC_HINT_PGI:
-      break;
-   case GL_STRICT_LIGHTING_HINT_PGI:
-      ctx->Hint.StrictLighting = mode;
-      break;
-   case GL_STRICT_SCISSOR_HINT_PGI:
-   case GL_FULL_STIPPLE_HINT_PGI:
-   case GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI:
-   case GL_NATIVE_GRAPHICS_END_HINT_PGI:
-   case GL_CONSERVE_MEMORY_HINT_PGI:
-   case GL_RECLAIM_MEMORY_HINT_PGI:
-      break;
-   case GL_ALWAYS_FAST_HINT_PGI:
-      if (mode) {
-        ctx->Hint.AllowDrawWin = GL_TRUE;
-        ctx->Hint.AllowDrawSpn = GL_FALSE;
-        ctx->Hint.AllowDrawMem = GL_FALSE;
-      } else {
-        ctx->Hint.AllowDrawWin = GL_TRUE;
-        ctx->Hint.AllowDrawSpn = GL_TRUE;
-        ctx->Hint.AllowDrawMem = GL_TRUE;
-      } 
-      break;
-   case GL_ALWAYS_SOFT_HINT_PGI:
-      ctx->Hint.AllowDrawWin = GL_TRUE;
-      ctx->Hint.AllowDrawSpn = GL_TRUE;
-      ctx->Hint.AllowDrawMem = GL_TRUE;
-      break;
-   case GL_ALLOW_DRAW_OBJ_HINT_PGI:
-      break;
-   case GL_ALLOW_DRAW_WIN_HINT_PGI:
-      ctx->Hint.AllowDrawWin = mode;
-      break;
-   case GL_ALLOW_DRAW_SPN_HINT_PGI:
-      ctx->Hint.AllowDrawSpn = mode;
-      break;
-   case GL_ALLOW_DRAW_MEM_HINT_PGI:
-      ctx->Hint.AllowDrawMem = mode;
-      break;
-   case GL_CLIP_NEAR_HINT_PGI:
-   case GL_CLIP_FAR_HINT_PGI:
-   case GL_WIDE_LINE_HINT_PGI:
-   case GL_BACK_NORMALS_HINT_PGI:
-   case GL_NATIVE_GRAPHICS_HANDLE_PGI:
-      break;
-
-      /* GL_EXT_clip_volume_hint */
-   case GL_CLIP_VOLUME_CLIPPING_HINT_EXT:
-      ctx->Hint.ClipVolumeClipping = mode;
-      break;
-
-   default:
-      gl_error( ctx, GL_INVALID_ENUM, "glHint(target)" );
+   if (mode != GL_NICEST && mode != GL_FASTEST && mode != GL_DONT_CARE) {
+      gl_error(ctx, GL_INVALID_ENUM, "glHint(mode)");
       return GL_FALSE;
    }
+
+   switch (target) {
+      case GL_FOG_HINT:
+         ctx->Hint.Fog = mode;
+         break;
+      case GL_LINE_SMOOTH_HINT:
+         ctx->Hint.LineSmooth = mode;
+         break;
+      case GL_PERSPECTIVE_CORRECTION_HINT:
+         ctx->Hint.PerspectiveCorrection = mode;
+         break;
+      case GL_POINT_SMOOTH_HINT:
+         ctx->Hint.PointSmooth = mode;
+         break;
+      case GL_POLYGON_SMOOTH_HINT:
+         ctx->Hint.PolygonSmooth = mode;
+         break;
+      case GL_PREFER_DOUBLEBUFFER_HINT_PGI:
+      case GL_STRICT_DEPTHFUNC_HINT_PGI:
+         break;
+      case GL_STRICT_LIGHTING_HINT_PGI:
+         ctx->Hint.StrictLighting = mode;
+         break;
+      case GL_STRICT_SCISSOR_HINT_PGI:
+      case GL_FULL_STIPPLE_HINT_PGI:
+      case GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI:
+      case GL_NATIVE_GRAPHICS_END_HINT_PGI:
+      case GL_CONSERVE_MEMORY_HINT_PGI:
+      case GL_RECLAIM_MEMORY_HINT_PGI:
+         break;
+      case GL_ALWAYS_FAST_HINT_PGI:
+         if (mode) {
+            ctx->Hint.AllowDrawWin = GL_TRUE;
+            ctx->Hint.AllowDrawFrg = GL_FALSE;
+            ctx->Hint.AllowDrawMem = GL_FALSE;
+         } else {
+            ctx->Hint.AllowDrawWin = GL_TRUE;
+            ctx->Hint.AllowDrawFrg = GL_TRUE;
+            ctx->Hint.AllowDrawMem = GL_TRUE;
+         } 
+         break;
+      case GL_ALWAYS_SOFT_HINT_PGI:
+         ctx->Hint.AllowDrawWin = GL_TRUE;
+         ctx->Hint.AllowDrawFrg = GL_TRUE;
+         ctx->Hint.AllowDrawMem = GL_TRUE;
+         break;
+      case GL_ALLOW_DRAW_OBJ_HINT_PGI:
+         break;
+      case GL_ALLOW_DRAW_WIN_HINT_PGI:
+         ctx->Hint.AllowDrawWin = mode;
+         break;
+      case GL_ALLOW_DRAW_FRG_HINT_PGI:
+         ctx->Hint.AllowDrawFrg = mode;
+         break;
+      case GL_ALLOW_DRAW_MEM_HINT_PGI:
+         ctx->Hint.AllowDrawMem = mode;
+         break;
+      case GL_CLIP_NEAR_HINT_PGI:
+      case GL_CLIP_FAR_HINT_PGI:
+      case GL_WIDE_LINE_HINT_PGI:
+      case GL_BACK_NORMALS_HINT_PGI:
+      case GL_NATIVE_GRAPHICS_HANDLE_PGI:
+         break;
+
+         /* GL_EXT_clip_volume_hint */
+      case GL_CLIP_VOLUME_CLIPPING_HINT_EXT:
+         ctx->Hint.ClipVolumeClipping = mode;
+         break;
+
+      default:
+         gl_error( ctx, GL_INVALID_ENUM, "glHint(target)" );
+         return GL_FALSE;
+   }
+
    ctx->NewState |= NEW_ALL;   /* just to be safe */
 
    if (ctx->Driver.Hint) {
@@ -144,6 +150,11 @@ _mesa_HintPGI( GLenum target, GLint mode )
    if (MESA_VERBOSE & VERBOSE_API)
       fprintf(stderr, "glHintPGI %s %d\n", gl_lookup_enum_by_nr(target), mode);
 
+   if (mode != GL_NICEST && mode != GL_FASTEST && mode != GL_DONT_CARE) {
+      gl_error(ctx, GL_INVALID_ENUM, "glHintPGI(mode)");
+      return;
+   }
+
    switch (target) {
       case GL_PREFER_DOUBLEBUFFER_HINT_PGI:
       case GL_STRICT_DEPTHFUNC_HINT_PGI:
@@ -158,7 +169,7 @@ _mesa_HintPGI( GLenum target, GLint mode )
       case GL_ALWAYS_SOFT_HINT_PGI:
       case GL_ALLOW_DRAW_OBJ_HINT_PGI:
       case GL_ALLOW_DRAW_WIN_HINT_PGI:
-      case GL_ALLOW_DRAW_SPN_HINT_PGI:
+      case GL_ALLOW_DRAW_FRG_HINT_PGI:
       case GL_ALLOW_DRAW_MEM_HINT_PGI:
       case GL_CLIP_NEAR_HINT_PGI:
       case GL_CLIP_FAR_HINT_PGI: