Merge remote branch 'origin/master' into gallium_draw_llvm

[mesa.git] / src / mesa / drivers / dri / r128 / server / r128_reg.h

diff --git a/src/mesa/drivers/dri/r128/server/r128_reg.h b/src/mesa/drivers/dri/r128/server/r128_reg.h
index 00f5041c11dc6d33d31cc9e2f72a7f0f23786c13..50033540b9dfd21fdcba69a9a1f7a2704ae326f6 100644 (file)
--- a/src/mesa/drivers/dri/r128/server/r128_reg.h
+++ b/src/mesa/drivers/dri/r128/server/r128_reg.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_reg.h,v 1.15 2002/12/16 16:19:11 dawes Exp $ */
 /*
  * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
  *                      Precision Insight, Inc., Cedar Park, Texas, and
@@ -1068,24 +1067,34 @@
 #       define R128_STENCIL_TEST_GREATER      (5 << 12)
 #       define R128_STENCIL_TEST_NEQUAL       (6 << 12)
 #       define R128_STENCIL_TEST_ALWAYS       (7 << 12)
+#       define R128_STENCIL_TEST_MASK         (7 << 12)
 #       define R128_STENCIL_S_FAIL_KEEP       (0 << 16)
 #       define R128_STENCIL_S_FAIL_ZERO       (1 << 16)
 #       define R128_STENCIL_S_FAIL_REPLACE    (2 << 16)
 #       define R128_STENCIL_S_FAIL_INC        (3 << 16)
 #       define R128_STENCIL_S_FAIL_DEC        (4 << 16)
 #       define R128_STENCIL_S_FAIL_INV        (5 << 16)
+#       define R128_STENCIL_S_FAIL_INC_WRAP   (6 << 16)        /* GUESS */
+#       define R128_STENCIL_S_FAIL_DEC_WRAP   (7 << 16)        /* GUESS */
+#       define R128_STENCIL_S_FAIL_MASK       (7 << 16)
 #       define R128_STENCIL_ZPASS_KEEP        (0 << 20)
 #       define R128_STENCIL_ZPASS_ZERO        (1 << 20)
 #       define R128_STENCIL_ZPASS_REPLACE     (2 << 20)
 #       define R128_STENCIL_ZPASS_INC         (3 << 20)
 #       define R128_STENCIL_ZPASS_DEC         (4 << 20)
 #       define R128_STENCIL_ZPASS_INV         (5 << 20)
+#       define R128_STENCIL_ZPASS_INC_WRAP    (6 << 20)        /* GUESS */
+#       define R128_STENCIL_ZPASS_DEC_WRAP    (7 << 20)        /* GUESS */
+#       define R128_STENCIL_ZPASS_MASK        (7 << 20)
 #       define R128_STENCIL_ZFAIL_KEEP        (0 << 24)
 #       define R128_STENCIL_ZFAIL_ZERO        (1 << 24)
 #       define R128_STENCIL_ZFAIL_REPLACE     (2 << 24)
 #       define R128_STENCIL_ZFAIL_INC         (3 << 24)
 #       define R128_STENCIL_ZFAIL_DEC         (4 << 24)
 #       define R128_STENCIL_ZFAIL_INV         (5 << 24)
+#       define R128_STENCIL_ZFAIL_INC_WRAP    (6 << 24)        /* GUESS */
+#       define R128_STENCIL_ZFAIL_DEC_WRAP    (7 << 24)        /* GUESS */
+#       define R128_STENCIL_ZFAIL_MASK        (7 << 24)
 #define R128_TEX_CNTL_C                   0x1c9c
 #       define R128_Z_ENABLE                   (1 <<  0)
 #       define R128_Z_WRITE_ENABLE             (1 <<  1)