summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/sis/sis_reg.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers/dri/sis/sis_reg.h')
-rw-r--r--src/mesa/drivers/dri/sis/sis_reg.h137
1 files changed, 34 insertions, 103 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_reg.h b/src/mesa/drivers/dri/sis/sis_reg.h
index 41d7e74da8..378692fc1d 100644
--- a/src/mesa/drivers/dri/sis/sis_reg.h
+++ b/src/mesa/drivers/dri/sis/sis_reg.h
@@ -1,6 +1,7 @@
/**************************************************************************
Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan.
+Copyright 2003 Eric Anholt
All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -15,13 +16,13 @@ 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 PRECISION INSIGHT 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.
+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
+ERIC ANHOLT OR SILICON INTEGRATED SYSTEMS CORP 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.
**************************************************************************/
/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_reg.h,v 1.3 2000/09/26 15:56:48 tsi Exp $ */
@@ -39,7 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* Define All the Register Address of 6327
*/
-#define REG_QueueLen 0x8240
+#define REG_CommandQueue 0x8240
#define REG_3D_TSFSa 0x8800
#define REG_3D_TSZa 0x8804
@@ -217,7 +218,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define REG_3D_TexturePalette 0x8C00
/*
- * REG_QueueLen -- (8240h-8243h)
+ * REG_CommandQueue -- (8240h-8243h)
*/
#define MASK_QueueLen 0x0000ffff
#define SiS_EngIdle2d 0x80000000
@@ -528,17 +529,17 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define FOGMODE_EXP2 0x07000000
/*
- * REG_3D_FogStartEnd -- Define Fog Start End Setting (8A34h-8A37h)
+ * REG_3D_FogStartEnd -- Define Fog Start End Setting (0x8A34 - 0x8A37)
*/
#define MASK_FogFarDistance 0x0007FFFF
/*
- * REG_3D_FogStartEnd -- Define Fog End Setting (8A38h-8A3Bh)
+ * REG_3D_FogStartEnd -- Define Fog End Setting (0x8A38 - 0x8A3B)
*/
#define MASK_FogInvFarDistance 0x0007FFFF
/*
- * REG_3D_FogStartEnd -- Define Fog End Setting (0x8A3C - 0x8A3F)
+ * REG_3D_FogFactorDensity (0x8A3C - 0x8A3F)
*/
#define MASK_FogDensity 0x0003FFFF
#define MASK_FogFactor 0xFF000000
@@ -804,97 +805,27 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* REG_3D_TextureAlphaBlendSet0 (0x8B40 - 0x8B43)
* REG_3D_TextureAlphaBlendSet1 (0x8B44 - 0x8B46)
*/
-
-#define A_REPLACE_RGB_STAGE0 0xa1485000
-#define A_REPLACE_A_STAGE0 0xc3230000
-#define L_REPLACE__RGB_STAGE0 0xc1485000
-#define L_REPLACE__A_STAGE0 0x63230000
-#define LA_REPLACE__RGB_STAGE0 0xc1485000
-#define LA_REPLACE__A_STAGE0 0xc3230000
-#define I_REPLACE__RGB_STAGE0 0xc1485000
-#define I_REPLACE__A_STAGE0 0xc3230000
-#define RGB_REPLACE__RGB_STAGE0 0xc1485000
-#define RGB_REPLACE__A_STAGE0 0x63230000
-#define RGBA_REPLACE__RGB_STAGE0 0xc1485000
-#define RGBA_REPLACE__A_STAGE0 0xc3230000
-
-#define A_MODULATE_RGB_STAGE0 0xa1485000
-#define A_MODULATE_A_STAGE0 0x63c30000
-#define L_MODULATE__RGB_STAGE0 0xa1705000
-#define L_MODULATE__A_STAGE0 0x63230000
-#define LA_MODULATE__RGB_STAGE0 0xa1705000
-#define LA_MODULATE__A_STAGE0 0x63c30000
-#define I_MODULATE__RGB_STAGE0 0xa1705000
-#define I_MODULATE__A_STAGE0 0x63c30000
-#define RGB_MODULATE__RGB_STAGE0 0xa1705000
-#define RGB_MODULATE__A_STAGE0 0x63230000
-#define RGBA_MODULATE__RGB_STAGE0 0xa1705000
-#define RGBA_MODULATE__A_STAGE0 0x63c30000
-
-#define RGB_DECAL__RGB_STAGE0 0xc1485000
-#define RGB_DECAL__A_STAGE0 0x63230000
-#define RGBA_DECAL__RGB_STAGE0 0xc534c001
-#define RGBA_DECAL__A_STAGE0 0x63230000
-
-#define A_BLEND_RGB_STAGE0 0xa1485000
-#define A_BLEND_A_STAGE0 0x63c30000
-#define L_BLEND__RGB_STAGE0 0x4530c001
-#define L_BLEND__A_STAGE0 0x63230000
-#define LA_BLEND__RGB_STAGE0 0x4530c001
-#define LA_BLEND__A_STAGE0 0x63c30000
-#define I_BLEND__RGB_STAGE0 0x4530c001
-#define I_BLEND__A_STAGE0 0x46c60001
-#define RGB_BLEND__RGB_STAGE0 0x4530c001
-#define RGB_BLEND__A_STAGE0 0x63230000
-#define RGBA_BLEND__RGB_STAGE0 0x4530c001
-#define RGBA_BLEND__A_STAGE0 0x63c30000
-
-#define RGB_STAGE1 0xa1485000
-#define A_STAGE1 0xa3230000
-
-#define A_REPLACE_RGB_STAGE1 0xa1485000
-#define A_REPLACE_A_STAGE1 0xe3230000
-#define L_REPLACE__RGB_STAGE1 0xe1485000
-#define L_REPLACE__A_STAGE1 0xa3230000
-#define LA_REPLACE__RGB_STAGE1 0xe1485000
-#define LA_REPLACE__A_STAGE1 0xe3230000
-#define I_REPLACE__RGB_STAGE1 0xe1485000
-#define I_REPLACE__A_STAGE1 0xe3230000
-#define RGB_REPLACE__RGB_STAGE1 0xe1485000
-#define RGB_REPLACE__A_STAGE1 0xa3230000
-#define RGBA_REPLACE__RGB_STAGE1 0xe1485000
-#define RGBA_REPLACE__A_STAGE1 0xe3230000
-
-#define A_MODULATE_RGB_STAGE1 0xa1485000
-#define A_MODULATE_A_STAGE1 0xa3e30000
-#define L_MODULATE__RGB_STAGE1 0xa1785000
-#define L_MODULATE__A_STAGE1 0xa3230000
-#define LA_MODULATE__RGB_STAGE1 0xa1785000
-#define LA_MODULATE__A_STAGE1 0xa3e30000
-#define I_MODULATE__RGB_STAGE1 0xa1785000
-#define I_MODULATE__A_STAGE1 0xa3e30000
-#define RGB_MODULATE__RGB_STAGE1 0xa1785000
-#define RGB_MODULATE__A_STAGE1 0xa3230000
-#define RGBA_MODULATE__RGB_STAGE1 0xa1785000
-#define RGBA_MODULATE__A_STAGE1 0xa3e30000
-
-#define RGB_DECAL__RGB_STAGE1 0xe1485000
-#define RGB_DECAL__A_STAGE1 0xa3230000
-#define RGBA_DECAL__RGB_STAGE1 0xe5394001
-#define RGBA_DECAL__A_STAGE1 0xa3230000
-
-#define A_BLEND_RGB_STAGE1 0xa1485000
-#define A_BLEND_A_STAGE1 0xa3e30000
-#define L_BLEND__RGB_STAGE1 0x45394001
-#define L_BLEND__A_STAGE1 0xa3230000
-#define LA_BLEND__RGB_STAGE1 0x45394001
-#define LA_BLEND__A_STAGE1 0xa3e30000
-#define I_BLEND__RGB_STAGE1 0x45394001
-#define I_BLEND__A_STAGE1 0x4aea0001
-#define RGB_BLEND__RGB_STAGE1 0x45394001
-#define RGB_BLEND__A_STAGE1 0xa3230000
-#define RGBA_BLEND__RGB_STAGE1 0x45394001
-#define RGBA_BLEND__A_STAGE1 0xa3e30000
+#define STAGE0_C_CF 0xa1485000
+#define STAGE0_C_CS 0xc1485000
+#define STAGE0_C_CFCS 0xa1705000
+#define STAGE0_C_CFOMAS_CSAS 0xc534c001
+#define STAGE0_C_CFOMCS_CCCS 0x4530c001
+
+#define STAGE0_A_AF 0x63230000
+#define STAGE0_A_AS 0xc3230000
+#define STAGE0_A_AFAS 0x63c30000
+#define STAGE0_A_AFOMAS_ACAS 0x46c60001
+
+#define STAGE1_C_CF 0xa1485000
+#define STAGE1_C_CS 0xe1485000
+#define STAGE1_C_CFCS 0xa1785000
+#define STAGE1_C_CFOMAS_CSAS 0xe5394001
+#define STAGE1_C_CFOMCS_CCCS 0x45394001
+
+#define STAGE1_A_AF 0xa3230000
+#define STAGE1_A_AS 0xe3230000
+#define STAGE1_A_AFAS 0xa3e30000
+#define STAGE1_A_AFOMAS_ACAS 0x4aea0001
/* What registers are these associated with? */
#define MASK_BMMemoryInSystem 0x00000080