X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fintel_state.c;h=5001a49faffb9aa4a3a701ad31ffc4cbfc56a9e0;hb=8bed1adfc144d9ae8d55ccb9b277942da8a78064;hp=c593e288170f38df866f5be44a2fec721545b399;hpb=a69274454b6bde265a910ca5bd3199217431f5b5;p=mesa.git

diff --git a/src/mesa/drivers/dri/i965/intel_state.c b/src/mesa/drivers/dri/i965/intel_state.c
index c593e288170..5001a49faff 100644
--- a/src/mesa/drivers/dri/i965/intel_state.c
+++ b/src/mesa/drivers/dri/i965/intel_state.c
@@ -1,36 +1,31 @@
-/**************************************************************************
- * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+/*
+ * Copyright 2003 VMware, Inc.
  * 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"), to deal in the Software without restriction, including
  * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
+ * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the
  * next paragraph) shall be included in all copies or substantial portions
  * of the Software.
- * 
+ *
  * 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- * 
- **************************************************************************/
+ */
 
-
-#include "main/glheader.h"
 #include "main/context.h"
 #include "main/macros.h"
 #include "main/enums.h"
-#include "main/colormac.h"
 #include "main/dd.h"
 
 #include "intel_screen.h"
@@ -40,27 +35,37 @@
 int
 intel_translate_shadow_compare_func(GLenum func)
 {
+   /* GL specifies the result of shadow comparisons as:
+    *     1     if   ref <op> texel,
+    *     0     otherwise.
+    *
+    * The hardware does:
+    *     0     if texel <op> ref,
+    *     1     otherwise.
+    *
+    * So, these look a bit strange because there's both a negation
+    * and swapping of the arguments involved.
+    */
    switch (func) {
-   case GL_NEVER: 
-       return BRW_COMPAREFUNCTION_ALWAYS;
-   case GL_LESS: 
-       return BRW_COMPAREFUNCTION_LEQUAL;
-   case GL_LEQUAL: 
-       return BRW_COMPAREFUNCTION_LESS;
-   case GL_GREATER: 
-       return BRW_COMPAREFUNCTION_GEQUAL;
-   case GL_GEQUAL: 
+   case GL_NEVER:
+      return BRW_COMPAREFUNCTION_ALWAYS;
+   case GL_LESS:
+      return BRW_COMPAREFUNCTION_LEQUAL;
+   case GL_LEQUAL:
+      return BRW_COMPAREFUNCTION_LESS;
+   case GL_GREATER:
+      return BRW_COMPAREFUNCTION_GEQUAL;
+   case GL_GEQUAL:
       return BRW_COMPAREFUNCTION_GREATER;
-   case GL_NOTEQUAL: 
+   case GL_NOTEQUAL:
       return BRW_COMPAREFUNCTION_EQUAL;
-   case GL_EQUAL: 
+   case GL_EQUAL:
       return BRW_COMPAREFUNCTION_NOTEQUAL;
-   case GL_ALWAYS: 
-       return BRW_COMPAREFUNCTION_NEVER;
+   case GL_ALWAYS:
+      return BRW_COMPAREFUNCTION_NEVER;
    }
 
-   assert(!"Invalid shadow comparison function.");
-   return BRW_COMPAREFUNCTION_NEVER;
+   unreachable("Invalid shadow comparison function.");
 }
 
 int
@@ -85,8 +90,7 @@ intel_translate_compare_func(GLenum func)
       return BRW_COMPAREFUNCTION_ALWAYS;
    }
 
-   assert(!"Invalid comparison function.");
-   return BRW_COMPAREFUNCTION_ALWAYS;
+   unreachable("Invalid comparison function.");
 }
 
 int