Merge commit 'origin/gallium-0.2' into gallium-master-merge

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

diff --git a/src/mesa/main/hint.c b/src/mesa/main/hint.c
index 5af819194adab2fa76ff841d49b175cce051fad6..e2d4129a3821535a825ca0d3f224c8687ef12229 100644 (file)
--- a/src/mesa/main/hint.c
+++ b/src/mesa/main/hint.c
@@ -32,7 +32,7 @@
 
 
 
-void
+void GLAPIENTRY
 _mesa_Hint( GLenum target, GLenum mode )
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -89,10 +89,6 @@ _mesa_Hint( GLenum target, GLenum mode )
 
       /* 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;
-         }
         if (ctx->Hint.TextureCompression == mode)
            return;
         FLUSH_VERTICES(ctx, _NEW_HINT);
@@ -111,6 +107,18 @@ _mesa_Hint( GLenum target, GLenum mode )
         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;
@@ -137,4 +145,5 @@ void _mesa_init_hint( GLcontext * ctx )
    ctx->Hint.ClipVolumeClipping = GL_DONT_CARE;
    ctx->Hint.TextureCompression = GL_DONT_CARE;
    ctx->Hint.GenerateMipmap = GL_DONT_CARE;
+   ctx->Hint.FragmentShaderDerivative = GL_DONT_CARE;
 }