Remove leftover code for i915_texprog.c noticed in crossbar review.

diff --git a/src/mesa/drivers/dri/i915/i915_context.h b/src/mesa/drivers/dri/i915/i915_context.h
index 0be2b3cc8b073c9469d075af71bffc41c3a5799f..1070de1a54002e9c85befffedcd142ee6e0a60e3 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_context.h
+++ b/src/mesa/drivers/dri/i915/i915_context.h
@@ -173,21 +173,6 @@ struct i915_fragment_program
       const GLfloat *values;    /* Pointer to tracked values */
    } param[I915_MAX_CONSTANT];
    GLuint nr_params;
-
-
-   /* Helpers for i915_texprog.c:
-    */
-   GLuint src_texture;          /* Reg containing sampled texture color,
-                                 * else UREG_BAD.
-                                 */
-
-   GLuint src_previous;         /* Reg containing color from previous 
-                                 * stage.  May need to be decl'd.
-                                 */
-
-   GLuint last_tex_stage;       /* Number of last enabled texture unit */
-
-   struct vertex_buffer *VB;
 };
 
 

diff --git a/src/mesa/drivers/dri/i915/i915_program.c b/src/mesa/drivers/dri/i915/i915_program.c
index ed45e4f8069806581497fb88d9c416d67d0fd0a9..c6c6434023223eb622ea3bb1b7a34a3ec2389299 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_program.c
+++ b/src/mesa/drivers/dri/i915/i915_program.c
@@ -391,7 +391,6 @@ void
 i915_init_program(struct i915_context *i915, struct i915_fragment_program *p)
 {
    GLcontext *ctx = &i915->intel.ctx;
-   TNLcontext *tnl = TNL_CONTEXT(ctx);
 
    p->translated = 0;
    p->params_uptodate = 0;
@@ -417,11 +416,6 @@ i915_init_program(struct i915_context *i915, struct i915_fragment_program *p)
    p->depth_written = 0;
    p->nr_params = 0;
 
-   p->src_texture = UREG_BAD;
-   p->src_previous = UREG(REG_TYPE_T, T_DIFFUSE);
-   p->last_tex_stage = 0;
-   p->VB = &tnl->vb;
-
    *(p->decl++) = _3DSTATE_PIXEL_SHADER_PROGRAM;
 }
 

diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 16fbe38e647e1a6788042cd0a7cb1e502d82ddb7..041a155fe73648db11be7e8d24a76ab51b1b7cd9 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -159,10 +159,6 @@ intelGetString(GLcontext * ctx, GLenum name)
 
 /**
  * Extension strings exported by the intel driver.
- *
- * \note
- * It appears that ARB_texture_env_crossbar has "disappeared" compared to the
- * old i830-specific driver.
  */
 const struct dri_extension card_extensions[] = {
    {"GL_ARB_multisample", GL_ARB_multisample_functions},