From: Michel Dänzer <michel@daenzer.net>
Date: Wed, 14 Jan 2004 02:26:28 +0000 (+0000)
Subject: Fix initialisation of cubic tecture offsets (Andreas Stenglein)
X-Git-Tag: android-x86-1.6~7640
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=067603db91072fc3b02e1583195641972f81168f;p=android-x86%2Fexternal-mesa.git

Fix initialisation of cubic tecture offsets (Andreas Stenglein)
---

diff --git a/src/mesa/drivers/dri/r200/r200_state_init.c b/src/mesa/drivers/dri/r200/r200_state_init.c
index 88797191d2e..22ad4e376e7 100644
--- a/src/mesa/drivers/dri/r200/r200_state_init.c
+++ b/src/mesa/drivers/dri/r200/r200_state_init.c
@@ -504,11 +504,16 @@ void r200InitState( r200ContextPtr rmesa )
           0x100000);	/* Small default bias */
 
       rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_FACES] = 0;
-      rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_OFFSET_F1] = 0;
-      rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_OFFSET_F2] = 0;
-      rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_OFFSET_F3] = 0;
-      rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_OFFSET_F4] = 0;
-      rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_OFFSET_F5] = 0;
+      rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_OFFSET_F1] =
+         rmesa->r200Screen->texOffset[RADEON_CARD_HEAP];
+      rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_OFFSET_F2] =
+         rmesa->r200Screen->texOffset[RADEON_CARD_HEAP];
+      rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_OFFSET_F3] =
+         rmesa->r200Screen->texOffset[RADEON_CARD_HEAP];
+      rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_OFFSET_F4] =
+         rmesa->r200Screen->texOffset[RADEON_CARD_HEAP];
+      rmesa->hw.cube[i].cmd[CUBE_PP_CUBIC_OFFSET_F5] =
+         rmesa->r200Screen->texOffset[RADEON_CARD_HEAP];
    }
 
    rmesa->hw.pix[0].cmd[PIX_PP_TXCBLEND] =