Merge branch 'origin' into i915-unification

diff --cc src/mesa/drivers/dri/i915tex/i830_vtbl.c
index 441dc660acb12c298371dee7cb19b5e051cfbda6,e432648ada09969d5328890630a63145edca6173..dc91af7181558eda6946e9fbbfaa0c6e92941993
--- 1/src/mesa/drivers/dri/i915tex/i830_vtbl.c
--- 2/src/mesa/drivers/dri/i915tex/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915tex/i830_vtbl.c
@@@ -485,13 -487,16 +485,15 @@@ i830_emit_state(struct intel_context *i
           if (state->tex_buffer[i]) {
              OUT_RELOC(state->tex_buffer[i],
                        DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_READ,
 -                      DRM_BO_MASK_MEM | DRM_BO_FLAG_READ,
                        state->tex_offset[i] | TM0S0_USE_FENCE);
           }
-          else {
-             assert(i == 0);
-             assert(state == &i830->meta);
-             OUT_BATCH(0);
-          }
+        else if (state == &i830->meta) {
+           assert(i == 0);
+           OUT_BATCH(0);
+        }
+        else {
+           OUT_BATCH(state->tex_offset[i]);
+        }
  
           OUT_BATCH(state->Tex[i][I830_TEXREG_TM0S1]);
           OUT_BATCH(state->Tex[i][I830_TEXREG_TM0S2]);

diff --cc src/mesa/drivers/dri/i915tex/intel_context.c
Simple merge

diff --cc src/mesa/drivers/dri/i915tex/intel_context.h
Simple merge

diff --cc src/mesa/drivers/dri/i915tex/intel_pixel_draw.c
Simple merge

diff --cc src/mesa/drivers/dri/i915tex/intel_screen.c
Simple merge

diff --cc src/mesa/drivers/dri/i915tex/intel_tex_image.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/intel_context.c
Simple merge