Merge remote branch 'origin/mesa_7_6_branch'

[mesa.git] / src / mesa / drivers / dri / r600 / r600_tex.h

diff --git a/src/mesa/drivers/dri/r600/r600_tex.h b/src/mesa/drivers/dri/r600/r600_tex.h
index a1d50ec69867f1f4ffb9e9a65cc2fcf98775b89c..fb0e1a023e1c0b86cfc749fa5095f0b5605ae038 100644 (file)
--- a/src/mesa/drivers/dri/r600/r600_tex.h
+++ b/src/mesa/drivers/dri/r600/r600_tex.h
@@ -35,6 +35,15 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __r600_TEX_H__
 #define __r600_TEX_H__
 
+/* TODO : review this after texture load code. */
+#define R700_BLIT_WIDTH_BYTES 1024
+/* The BASE_ADDRESS and MIP_ADDRESS fields are 256-byte-aligned */
+#define R700_TEXTURE_ALIGNMENT_MASK     0x255
+/* Texel pitch is 8 alignment. */
+#define R700_TEXEL_PITCH_ALIGNMENT_MASK 0x7
+
+#define R700_MAX_TEXTURE_UNITS 8 /* TODO : should be 16, lets make it work, review later */
+
 extern void r600SetDepthTexMode(struct gl_texture_object *tObj);
 
 extern void r600SetTexBuffer(__DRIcontext *pDRICtx, GLint target,