intel: Remove the unrelaxed relocation assertion

[mesa.git] / src / mesa / drivers / dri / mga / mgatexmem.c

diff --git a/src/mesa/drivers/dri/mga/mgatexmem.c b/src/mesa/drivers/dri/mga/mgatexmem.c
index 4e7fd6b24b35ae6a436cf7b1c522a858b9865154..58afbbb279ed55abc9b45c19fcc46edb787d13bb 100644 (file)
--- a/src/mesa/drivers/dri/mga/mgatexmem.c
+++ b/src/mesa/drivers/dri/mga/mgatexmem.c
@@ -24,19 +24,18 @@
  * Authors:
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
-/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgatexmem.c,v 1.7 2002/10/30 12:51:36 alanh Exp $ */
 
-#include "glheader.h"
+#include "main/glheader.h"
 
-#include "mm.h"
+#include "main/mm.h"
 #include "mgacontext.h"
 #include "mgatex.h"
 #include "mgaregs.h"
 #include "mgaioctl.h"
 #include "mga_xmesa.h"
 
-#include "imports.h"
-#include "simple_list.h"
+#include "main/imports.h"
+#include "main/simple_list.h"
 
 /**
  * Destroy any device-dependent state associated with the texture.  This may
@@ -105,7 +104,7 @@ static void mgaUploadSubImage( mgaContextPtr mmesa,
       return;
    }
 
-   texImage = t->base.tObj->Image[level];
+   texImage = t->base.tObj->Image[0][level];
    if ( texImage == NULL ) {
       fprintf( stderr, "[%s:%d] Image[%d] = NULL\n", __FILE__, __LINE__,
               level );
@@ -115,7 +114,7 @@ static void mgaUploadSubImage( mgaContextPtr mmesa,
 
    if (texImage->Data == NULL) {
       fprintf(stderr, "null texture image data tObj %p level %d\n",
-             t->base.tObj, level);
+             (void *) t->base.tObj, level);
       return;
    }
 
@@ -131,10 +130,6 @@ static void mgaUploadSubImage( mgaContextPtr mmesa,
       for ( i = 0 ; i < hwlevel ; i++ ) {
         offset += (t->offsets[1] >> (i * 2));
       }
-
-      /* Each mipmap must be DWORD aligned.
-       */
-      offset &= ~0x03;
    }
 
 
@@ -142,7 +137,7 @@ static void mgaUploadSubImage( mgaContextPtr mmesa,
     * directly used by the hardware for texturing.
     */
 
-   texelBytes = texImage->TexFormat->TexelBytes;
+   texelBytes = _mesa_get_format_bytes(texImage->TexFormat);
    length = texImage->Width * texImage->Height * texelBytes;
    if ( t->base.heap->heapId == MGA_CARD_HEAP ) {
       unsigned  tex_offset = 0;
@@ -227,6 +222,7 @@ int mgaUploadTexImages( mgaContextPtr mmesa, mgaTextureObjectPtr t )
         return -1;
       }
 
+      assert(t->base.memBlock);
       ofs = mmesa->mgaScreen->textureOffset[ heap ]
           + t->base.memBlock->ofs;