remove the redundant textureSize field, use tex.size instead, it's always the same...

diff --git a/src/mesa/drivers/dri/i915/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c
index 6088db6..3979f53 100644 (file)
--- a/src/mesa/drivers/dri/i915/i830_context.c
+++ b/src/mesa/drivers/dri/i915/i830_context.c
@@ -79,7 +79,7 @@ GLboolean i830CreateContext( const __GLcontextModes *mesaVis,
    intel->nr_heaps = 1;
    intel->texture_heaps[0] = 
       driCreateTextureHeap( 0, intel,
-                           intel->intelScreen->textureSize,
+                           intel->intelScreen->tex.size,
                            12,
                            I830_NR_TEX_REGIONS,
                            intel->sarea->texList,

diff --git a/src/mesa/drivers/dri/i915/i830_texstate.c b/src/mesa/drivers/dri/i915/i830_texstate.c
index ba45227..55a5a17 100644 (file)
--- a/src/mesa/drivers/dri/i915/i830_texstate.c
+++ b/src/mesa/drivers/dri/i915/i830_texstate.c
@@ -436,7 +436,7 @@ static GLboolean i830UpdateTexUnit( GLcontext *ctx, GLuint unit )
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
 
    if (texUnit->_ReallyEnabled &&
-       INTEL_CONTEXT(ctx)->intelScreen->textureSize < 2048 * 1024)
+       INTEL_CONTEXT(ctx)->intelScreen->tex.size < 2048 * 1024)
       return GL_FALSE;
 
    switch(texUnit->_ReallyEnabled) {

diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 42f9124..6e6af35 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -122,7 +122,7 @@ GLboolean i915CreateContext( const __GLcontextModes *mesaVis,
    intel->nr_heaps = 1;
    intel->texture_heaps[0] = 
       driCreateTextureHeap( 0, intel,
-                           intel->intelScreen->textureSize,
+                           intel->intelScreen->tex.size,
                            12,
                            I830_NR_TEX_REGIONS,
                            intel->sarea->texList,

diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c
index 7a274bb..22f38a9 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_texstate.c
+++ b/src/mesa/drivers/dri/i915/i915_texstate.c
@@ -879,7 +879,7 @@ static GLboolean i915UpdateTexUnit( GLcontext *ctx, GLuint unit )
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
 
    if (texUnit->_ReallyEnabled &&
-       INTEL_CONTEXT(ctx)->intelScreen->textureSize < 2048 * 1024)
+       INTEL_CONTEXT(ctx)->intelScreen->tex.size < 2048 * 1024)
       return GL_FALSE;
 
    switch (texUnit->_ReallyEnabled) {

diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 98b9b2e..2f4f083 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -66,7 +66,7 @@ static void intelPrintDRIInfo(intelScreenPrivate *intelScreen,
    fprintf(stderr, "Back offset : 0x%x\n", intelScreen->backOffset);
    fprintf(stderr, "Depth size : 0x%x\n", intelScreen->depth.size);
    fprintf(stderr, "Depth offset : 0x%x\n", intelScreen->depthOffset);
-   fprintf(stderr, "Texture size : 0x%x\n", intelScreen->textureSize);
+   fprintf(stderr, "Texture size : 0x%x\n", intelScreen->tex.size);
    fprintf(stderr, "Texture offset : 0x%x\n", intelScreen->textureOffset);
    fprintf(stderr, "Memory : 0x%x\n", gDRIPriv->mem);
 }
@@ -116,7 +116,6 @@ static GLboolean intelInitDriver(__DRIscreenPrivate *sPriv)
    intelScreen->depthOffset = gDRIPriv->depthOffset;
    intelScreen->depthPitch = gDRIPriv->depthPitch;
    intelScreen->textureOffset = gDRIPriv->textureOffset;
-   intelScreen->textureSize = gDRIPriv->textureSize;
    intelScreen->logTextureGranularity = gDRIPriv->logTextureGranularity;
    intelScreen->back.handle = gDRIPriv->backbuffer;
    intelScreen->back.size = gDRIPriv->backbufferSize;

diff --git a/src/mesa/drivers/dri/i915/intel_screen.h b/src/mesa/drivers/dri/i915/intel_screen.h
index f2fb1c6..f41d748 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_screen.h
+++ b/src/mesa/drivers/dri/i915/intel_screen.h
@@ -66,7 +66,6 @@ typedef struct
    
    
    int textureOffset;
-   int textureSize;
    int logTextureGranularity;
    
    __DRIscreenPrivate *driScrnPriv;

diff --git a/src/mesa/drivers/dri/i915/intel_tex.c b/src/mesa/drivers/dri/i915/intel_tex.c
index 5fc904e..ad0a267 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_tex.c
+++ b/src/mesa/drivers/dri/i915/intel_tex.c
@@ -453,7 +453,7 @@ intelChooseTextureFormat( GLcontext *ctx, GLint internalFormat,
 {
    intelContextPtr intel = INTEL_CONTEXT( ctx );
    const GLboolean do32bpt = ( intel->intelScreen->cpp == 4 &&
-                              intel->intelScreen->textureSize > 4*1024*1024);
+                              intel->intelScreen->tex.size > 4*1024*1024);
 
    switch ( internalFormat ) {
    case 4: