mesa: Branch 'master' - 2 commits

[Michel Daenzer]

 src/mesa/drivers/dri/i915tex/i915_context.h       |    1 
 src/mesa/drivers/dri/i915tex/i915_state.c         |    1 
 src/mesa/drivers/dri/i915tex/i915_tex.c           |   35 ----------------------
 src/mesa/drivers/dri/i915tex/intel_tex_validate.c |    6 +++
 4 files changed, 5 insertions(+), 38 deletions(-)

New commits:
diff-tree dfabf9660751f0d7cfc7cad6539af4d7ccd9147e (from 92fb742065f4de941e444916c5a146db87c71701)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Thu Dec 21 18:06:58 2006 +0100

    i915tex: Remove unused tex_program field.

diff --git a/src/mesa/drivers/dri/i915tex/i915_context.h b/src/mesa/drivers/dri/i915tex/i915_context.h
index 5ae76fc..d2713e8 100644
--- a/src/mesa/drivers/dri/i915tex/i915_context.h
+++ b/src/mesa/drivers/dri/i915tex/i915_context.h
@@ -243,7 +243,6 @@ struct i915_context
    GLuint lodbias_ss2[MAX_TEXTURE_UNITS];
 
 
-   struct i915_fragment_program tex_program;
    struct i915_fragment_program *current_program;
 
    struct i915_hw_state meta, initial, state, *current;
diff --git a/src/mesa/drivers/dri/i915tex/i915_state.c b/src/mesa/drivers/dri/i915tex/i915_state.c
index 2f5a307..7c742a7 100644
--- a/src/mesa/drivers/dri/i915tex/i915_state.c
+++ b/src/mesa/drivers/dri/i915tex/i915_state.c
@@ -520,7 +520,6 @@ update_specular(GLcontext * ctx)
    /* A hack to trigger the rebuild of the fragment program.
     */
    intel_context(ctx)->NewGLState |= _NEW_TEXTURE;
-   I915_CONTEXT(ctx)->tex_program.translated = 0;
 }
 
 static void
diff --git a/src/mesa/drivers/dri/i915tex/i915_tex.c b/src/mesa/drivers/dri/i915tex/i915_tex.c
index a53abe9..59e148c 100644
--- a/src/mesa/drivers/dri/i915tex/i915_tex.c
+++ b/src/mesa/drivers/dri/i915tex/i915_tex.c
@@ -52,27 +52,6 @@ i915TexEnv(GLcontext * ctx, GLenum targe
    struct i915_context *i915 = I915_CONTEXT(ctx);
 
    switch (pname) {
-   case GL_TEXTURE_ENV_COLOR:  /* Should be a tracked param */
-   case GL_TEXTURE_ENV_MODE:
-   case GL_COMBINE_RGB:
-   case GL_COMBINE_ALPHA:
-   case GL_SOURCE0_RGB:
-   case GL_SOURCE1_RGB:
-   case GL_SOURCE2_RGB:
-   case GL_SOURCE0_ALPHA:
-   case GL_SOURCE1_ALPHA:
-   case GL_SOURCE2_ALPHA:
-   case GL_OPERAND0_RGB:
-   case GL_OPERAND1_RGB:
-   case GL_OPERAND2_RGB:
-   case GL_OPERAND0_ALPHA:
-   case GL_OPERAND1_ALPHA:
-   case GL_OPERAND2_ALPHA:
-   case GL_RGB_SCALE:
-   case GL_ALPHA_SCALE:
-      i915->tex_program.translated = 0;
-      break;
-
    case GL_TEXTURE_LOD_BIAS:{
          GLuint unit = ctx->Texture.CurrentUnit;
          GLint b = (int) ((*param) * 16.0);
@@ -92,22 +71,8 @@ i915TexEnv(GLcontext * ctx, GLenum targe
 }
 
 
-static void
-i915BindTexture(GLcontext * ctx, GLenum target,
-                struct gl_texture_object *texobj)
-{
-   /* Need this if image format changes between bound textures.
-    * Could try and shortcircuit by checking for differences in
-    * state between incoming and outgoing textures:
-    */
-   I915_CONTEXT(ctx)->tex_program.translated = 0;
-}
-
-
-
 void
 i915InitTextureFuncs(struct dd_function_table *functions)
 {
-   functions->BindTexture = i915BindTexture;
    functions->TexEnv = i915TexEnv;
 }
diff-tree 92fb742065f4de941e444916c5a146db87c71701 (from d9dd9013a8530bcafcdb2c5fed2b01a22bfca69b)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date:   Thu Dec 21 17:30:00 2006 +0100

    intel_finalize_mipmap_tree: Only flush batchbuffer when necessary.

diff --git a/src/mesa/drivers/dri/i915tex/intel_tex_validate.c b/src/mesa/drivers/dri/i915tex/intel_tex_validate.c
index e73c9c2..79d587a 100644
--- a/src/mesa/drivers/dri/i915tex/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/i915tex/intel_tex_validate.c
@@ -110,6 +110,8 @@ intel_finalize_mipmap_tree(struct intel_
    GLuint nr_faces = 0;
    struct intel_texture_image *firstImage;
 
+   GLboolean need_flush = GL_FALSE;
+
    /* We know/require this is true by now: 
     */
    assert(intelObj->base.Complete);
@@ -201,11 +203,13 @@ intel_finalize_mipmap_tree(struct intel_
           */
          if (intelObj->mt != intelImage->mt) {
             copy_image_data_to_tree(intel, intelObj, intelImage);
+	    need_flush = GL_TRUE;
          }
       }
    }
 
-   intel_batchbuffer_flush(intel->batch);
+   if (need_flush)
+      intel_batchbuffer_flush(intel->batch);
 
    return GL_TRUE;
 }