aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-12-05 01:11:20 +0000
committerDave Airlie <airlied@linux.ie>2005-12-05 01:11:20 +0000
commit0b4fdc81d15c1ff8acfe6fcdfcdd58a13fb3696e (patch)
tree70da09f307ad3e8e934865a7a3dea03e203b892d
parentbe16e93537d746365a43479de3a997af7969bb84 (diff)
add texrect support for r300
-rw-r--r--shared-core/r300_cmdbuf.c1
-rw-r--r--shared-core/r300_reg.h1
-rw-r--r--shared-core/radeon_drv.h3
3 files changed, 4 insertions, 1 deletions
diff --git a/shared-core/r300_cmdbuf.c b/shared-core/r300_cmdbuf.c
index 623f1f46..475ce1da 100644
--- a/shared-core/r300_cmdbuf.c
+++ b/shared-core/r300_cmdbuf.c
@@ -211,6 +211,7 @@ void r300_init_reg_flags(void)
ADD_RANGE(R300_TX_UNK1_0, 16);
ADD_RANGE(R300_TX_SIZE_0, 16);
ADD_RANGE(R300_TX_FORMAT_0, 16);
+ ADD_RANGE(R300_TX_PITCH_0, 16);
/* Texture offset is dangerous and needs more checking */
ADD_RANGE_MARK(R300_TX_OFFSET_0, 16, MARK_CHECK_OFFSET);
ADD_RANGE(R300_TX_UNK4_0, 16);
diff --git a/shared-core/r300_reg.h b/shared-core/r300_reg.h
index c3e7ca3d..83471317 100644
--- a/shared-core/r300_reg.h
+++ b/shared-core/r300_reg.h
@@ -801,6 +801,7 @@ I am fairly certain that they are correct unless stated otherwise in comments.
# define R300_TX_FORMAT_YUV_MODE 0x00800000
+#define R300_TX_PITCH_0 0x4500
#define R300_TX_OFFSET_0 0x4540
/* BEGIN: Guess from R200 */
# define R300_TXO_ENDIAN_NO_SWAP (0 << 0)
diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index bc9f3f2b..1fdae233 100644
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -87,10 +87,11 @@
R200_EMIT_PP_TXCTLALL_0-5 (replaces R200_EMIT_PP_TXFILTER_0-5, 2 more regs)
and R200_EMIT_ATF_TFACTOR (replaces R200_EMIT_TFACTOR_0 (8 consts instead of 6)
* 1.19- Add support for gart table in FB memory and PCIE r300
+ * 1.20- Add support for r300 texrect
*/
#define DRIVER_MAJOR 1
-#define DRIVER_MINOR 19
+#define DRIVER_MINOR 20
#define DRIVER_PATCHLEVEL 0
enum radeon_family {