From: Brian Paul <brianp@vmware.com>
Date: Fri, 15 May 2015 18:12:04 +0000 (-0600)
Subject: mesa: move no-change glDepthFunc check earlier
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=56b2b3d385170ab33934ec71fd9d0a6e0e1af9a8;p=mesa.git

mesa: move no-change glDepthFunc check earlier

If the incoming func matches the current state it must be a legal
value so we can do this before the switch statement.

Signed-off-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c
index 29851ecb8a4..bb4591cf152 100644
--- a/src/mesa/main/depth.c
+++ b/src/mesa/main/depth.c
@@ -65,6 +65,9 @@ _mesa_DepthFunc( GLenum func )
    if (MESA_VERBOSE & VERBOSE_API)
       _mesa_debug(ctx, "glDepthFunc %s\n", _mesa_lookup_enum_by_nr(func));
 
+   if (ctx->Depth.Func == func)
+      return;
+
    switch (func) {
    case GL_LESS:    /* (default) pass if incoming z < stored z */
    case GL_GEQUAL:
@@ -80,9 +83,6 @@ _mesa_DepthFunc( GLenum func )
       return;
    }
 
-   if (ctx->Depth.Func == func)
-      return;
-
    FLUSH_VERTICES(ctx, _NEW_DEPTH);
    ctx->Depth.Func = func;