nv30: update for front/back stencil inversion

Signed-off-by: Patrice Mandin <patmandin@gmail.com>

diff --git a/nouveau/nouveau_class.h b/nouveau/nouveau_class.h
index 8e7d0ff..9696b35 100644 (file)
--- a/nouveau/nouveau_class.h
+++ b/nouveau/nouveau_class.h
@@ -5217,49 +5217,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV34TCL_COLOR_MASK_R_MASK                                                    0x00ff0000
 #define   NV34TCL_COLOR_MASK_A_SHIFT                                                   24
 #define   NV34TCL_COLOR_MASK_A_MASK                                                    0xff000000
-#define  NV34TCL_STENCIL_BACK_ENABLE                                                   0x00000328
-#define  NV34TCL_STENCIL_BACK_MASK                                                     0x0000032c
-#define  NV34TCL_STENCIL_BACK_FUNC_FUNC                                                        0x00000330
-#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_NEVER                                         0x00000200
-#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_LESS                                          0x00000201
-#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_EQUAL                                         0x00000202
-#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_LEQUAL                                                0x00000203
-#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_GREATER                                       0x00000204
-#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_NOTEQUAL                                      0x00000205
-#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_GEQUAL                                                0x00000206
-#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_ALWAYS                                                0x00000207
-#define  NV34TCL_STENCIL_BACK_FUNC_REF                                                 0x00000334
-#define  NV34TCL_STENCIL_BACK_FUNC_MASK                                                        0x00000338
-#define  NV34TCL_STENCIL_BACK_OP_FAIL                                                  0x0000033c
-#define   NV34TCL_STENCIL_BACK_OP_FAIL_ZERO                                            0x00000000
-#define   NV34TCL_STENCIL_BACK_OP_FAIL_INVERT                                          0x0000150a
-#define   NV34TCL_STENCIL_BACK_OP_FAIL_KEEP                                            0x00001e00
-#define   NV34TCL_STENCIL_BACK_OP_FAIL_REPLACE                                         0x00001e01
-#define   NV34TCL_STENCIL_BACK_OP_FAIL_INCR                                            0x00001e02
-#define   NV34TCL_STENCIL_BACK_OP_FAIL_DECR                                            0x00001e03
-#define   NV34TCL_STENCIL_BACK_OP_FAIL_INCR_WRAP                                       0x00008507
-#define   NV34TCL_STENCIL_BACK_OP_FAIL_DECR_WRAP                                       0x00008508
-#define  NV34TCL_STENCIL_BACK_OP_ZFAIL                                                 0x00000340
-#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_ZERO                                           0x00000000
-#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_INVERT                                         0x0000150a
-#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_KEEP                                           0x00001e00
-#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_REPLACE                                                0x00001e01
-#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_INCR                                           0x00001e02
-#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_DECR                                           0x00001e03
-#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_INCR_WRAP                                      0x00008507
-#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_DECR_WRAP                                      0x00008508
-#define  NV34TCL_STENCIL_BACK_OP_ZPASS                                                 0x00000344
-#define   NV34TCL_STENCIL_BACK_OP_ZPASS_ZERO                                           0x00000000
-#define   NV34TCL_STENCIL_BACK_OP_ZPASS_INVERT                                         0x0000150a
-#define   NV34TCL_STENCIL_BACK_OP_ZPASS_KEEP                                           0x00001e00
-#define   NV34TCL_STENCIL_BACK_OP_ZPASS_REPLACE                                                0x00001e01
-#define   NV34TCL_STENCIL_BACK_OP_ZPASS_INCR                                           0x00001e02
-#define   NV34TCL_STENCIL_BACK_OP_ZPASS_DECR                                           0x00001e03
-#define   NV34TCL_STENCIL_BACK_OP_ZPASS_INCR_WRAP                                      0x00008507
-#define   NV34TCL_STENCIL_BACK_OP_ZPASS_DECR_WRAP                                      0x00008508
-#define  NV34TCL_STENCIL_FRONT_ENABLE                                                  0x00000348
-#define  NV34TCL_STENCIL_FRONT_MASK                                                    0x0000034c
-#define  NV34TCL_STENCIL_FRONT_FUNC_FUNC                                               0x00000350
+#define  NV34TCL_STENCIL_FRONT_ENABLE                                                  0x00000328
+#define  NV34TCL_STENCIL_FRONT_MASK                                                    0x0000032c
+#define  NV34TCL_STENCIL_FRONT_FUNC_FUNC                                               0x00000330
 #define   NV34TCL_STENCIL_FRONT_FUNC_FUNC_NEVER                                                0x00000200
 #define   NV34TCL_STENCIL_FRONT_FUNC_FUNC_LESS                                         0x00000201
 #define   NV34TCL_STENCIL_FRONT_FUNC_FUNC_EQUAL                                                0x00000202
@@ -5268,9 +5228,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV34TCL_STENCIL_FRONT_FUNC_FUNC_NOTEQUAL                                     0x00000205
 #define   NV34TCL_STENCIL_FRONT_FUNC_FUNC_GEQUAL                                       0x00000206
 #define   NV34TCL_STENCIL_FRONT_FUNC_FUNC_ALWAYS                                       0x00000207
-#define  NV34TCL_STENCIL_FRONT_FUNC_REF                                                        0x00000354
-#define  NV34TCL_STENCIL_FRONT_FUNC_MASK                                               0x00000358
-#define  NV34TCL_STENCIL_FRONT_OP_FAIL                                                 0x0000035c
+#define  NV34TCL_STENCIL_FRONT_FUNC_REF                                                        0x00000334
+#define  NV34TCL_STENCIL_FRONT_FUNC_MASK                                               0x00000338
+#define  NV34TCL_STENCIL_FRONT_OP_FAIL                                                 0x0000033c
 #define   NV34TCL_STENCIL_FRONT_OP_FAIL_ZERO                                           0x00000000
 #define   NV34TCL_STENCIL_FRONT_OP_FAIL_INVERT                                         0x0000150a
 #define   NV34TCL_STENCIL_FRONT_OP_FAIL_KEEP                                           0x00001e00
@@ -5279,7 +5239,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV34TCL_STENCIL_FRONT_OP_FAIL_DECR                                           0x00001e03
 #define   NV34TCL_STENCIL_FRONT_OP_FAIL_INCR_WRAP                                      0x00008507
 #define   NV34TCL_STENCIL_FRONT_OP_FAIL_DECR_WRAP                                      0x00008508
-#define  NV34TCL_STENCIL_FRONT_OP_ZFAIL                                                        0x00000360
+#define  NV34TCL_STENCIL_FRONT_OP_ZFAIL                                                        0x00000340
 #define   NV34TCL_STENCIL_FRONT_OP_ZFAIL_ZERO                                          0x00000000
 #define   NV34TCL_STENCIL_FRONT_OP_ZFAIL_INVERT                                                0x0000150a
 #define   NV34TCL_STENCIL_FRONT_OP_ZFAIL_KEEP                                          0x00001e00
@@ -5288,7 +5248,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV34TCL_STENCIL_FRONT_OP_ZFAIL_DECR                                          0x00001e03
 #define   NV34TCL_STENCIL_FRONT_OP_ZFAIL_INCR_WRAP                                     0x00008507
 #define   NV34TCL_STENCIL_FRONT_OP_ZFAIL_DECR_WRAP                                     0x00008508
-#define  NV34TCL_STENCIL_FRONT_OP_ZPASS                                                        0x00000364
+#define  NV34TCL_STENCIL_FRONT_OP_ZPASS                                                        0x00000344
 #define   NV34TCL_STENCIL_FRONT_OP_ZPASS_ZERO                                          0x00000000
 #define   NV34TCL_STENCIL_FRONT_OP_ZPASS_INVERT                                                0x0000150a
 #define   NV34TCL_STENCIL_FRONT_OP_ZPASS_KEEP                                          0x00001e00
@@ -5297,6 +5257,46 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV34TCL_STENCIL_FRONT_OP_ZPASS_DECR                                          0x00001e03
 #define   NV34TCL_STENCIL_FRONT_OP_ZPASS_INCR_WRAP                                     0x00008507
 #define   NV34TCL_STENCIL_FRONT_OP_ZPASS_DECR_WRAP                                     0x00008508
+#define  NV34TCL_STENCIL_BACK_ENABLE                                                   0x00000348
+#define  NV34TCL_STENCIL_BACK_MASK                                                     0x0000034c
+#define  NV34TCL_STENCIL_BACK_FUNC_FUNC                                                        0x00000350
+#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_NEVER                                         0x00000200
+#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_LESS                                          0x00000201
+#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_EQUAL                                         0x00000202
+#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_LEQUAL                                                0x00000203
+#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_GREATER                                       0x00000204
+#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_NOTEQUAL                                      0x00000205
+#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_GEQUAL                                                0x00000206
+#define   NV34TCL_STENCIL_BACK_FUNC_FUNC_ALWAYS                                                0x00000207
+#define  NV34TCL_STENCIL_BACK_FUNC_REF                                                 0x00000354
+#define  NV34TCL_STENCIL_BACK_FUNC_MASK                                                        0x00000358
+#define  NV34TCL_STENCIL_BACK_OP_FAIL                                                  0x0000035c
+#define   NV34TCL_STENCIL_BACK_OP_FAIL_ZERO                                            0x00000000
+#define   NV34TCL_STENCIL_BACK_OP_FAIL_INVERT                                          0x0000150a
+#define   NV34TCL_STENCIL_BACK_OP_FAIL_KEEP                                            0x00001e00
+#define   NV34TCL_STENCIL_BACK_OP_FAIL_REPLACE                                         0x00001e01
+#define   NV34TCL_STENCIL_BACK_OP_FAIL_INCR                                            0x00001e02
+#define   NV34TCL_STENCIL_BACK_OP_FAIL_DECR                                            0x00001e03
+#define   NV34TCL_STENCIL_BACK_OP_FAIL_INCR_WRAP                                       0x00008507
+#define   NV34TCL_STENCIL_BACK_OP_FAIL_DECR_WRAP                                       0x00008508
+#define  NV34TCL_STENCIL_BACK_OP_ZFAIL                                                 0x00000360
+#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_ZERO                                           0x00000000
+#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_INVERT                                         0x0000150a
+#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_KEEP                                           0x00001e00
+#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_REPLACE                                                0x00001e01
+#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_INCR                                           0x00001e02
+#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_DECR                                           0x00001e03
+#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_INCR_WRAP                                      0x00008507
+#define   NV34TCL_STENCIL_BACK_OP_ZFAIL_DECR_WRAP                                      0x00008508
+#define  NV34TCL_STENCIL_BACK_OP_ZPASS                                                 0x00000364
+#define   NV34TCL_STENCIL_BACK_OP_ZPASS_ZERO                                           0x00000000
+#define   NV34TCL_STENCIL_BACK_OP_ZPASS_INVERT                                         0x0000150a
+#define   NV34TCL_STENCIL_BACK_OP_ZPASS_KEEP                                           0x00001e00
+#define   NV34TCL_STENCIL_BACK_OP_ZPASS_REPLACE                                                0x00001e01
+#define   NV34TCL_STENCIL_BACK_OP_ZPASS_INCR                                           0x00001e02
+#define   NV34TCL_STENCIL_BACK_OP_ZPASS_DECR                                           0x00001e03
+#define   NV34TCL_STENCIL_BACK_OP_ZPASS_INCR_WRAP                                      0x00008507
+#define   NV34TCL_STENCIL_BACK_OP_ZPASS_DECR_WRAP                                      0x00008508
 #define  NV34TCL_SHADE_MODEL                                                           0x00000368
 #define   NV34TCL_SHADE_MODEL_FLAT                                                     0x00001d00
 #define   NV34TCL_SHADE_MODEL_SMOOTH                                                   0x00001d01