Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/drivers/dri/i915/i915_tex_layout.c
	src/mesa/drivers/dri/i965/brw_wm_glsl.c
	src/mesa/drivers/dri/intel/intel_buffer_objects.c
	src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
	src/mesa/drivers/dri/intel/intel_pixel_draw.c
	src/mesa/main/enums.c
	src/mesa/main/texstate.c
	src/mesa/vbo/vbo_exec_array.c

diff --cc src/gallium/state_trackers/glx/xlib/fakeglx.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_buffer_objects.c
index 010000309b804de65191a488ab21173c90fcc44f,c31fe91ad62d9e7d8d1910e677e80b68a7dfc6ae..ff8acc5c58d8937b5450db80f6fa8f15ffef203f
--- 1/src/mesa/drivers/dri/intel/intel_buffer_objects.c
--- 2/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@@ -300,19 -291,15 +300,34 @@@ intel_bufferobj_buffer(struct intel_con
     }
  
     if (intel_obj->buffer == NULL) {
++<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_buffer_objects.c
 +      void *sys_buffer = intel_obj->sys_buffer;
 +
 +      /* only one of buffer and sys_buffer could be non-NULL */
++=======
++>>>>>>> mesa_7_5_branch:src/mesa/drivers/dri/intel/intel_buffer_objects.c
        intel_bufferobj_alloc_buffer(intel, intel_obj);
++<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_buffer_objects.c
 +      intel_obj->sys_buffer = NULL;
 +
++=======
++>>>>>>> mesa_7_5_branch:src/mesa/drivers/dri/intel/intel_buffer_objects.c
        intel_bufferobj_subdata(&intel->ctx,
                              GL_ARRAY_BUFFER_ARB,
                              0,
                              intel_obj->Base.Size,
++<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_buffer_objects.c
 +                            sys_buffer,
++=======
+                             intel_obj->sys_buffer,
++>>>>>>> mesa_7_5_branch:src/mesa/drivers/dri/intel/intel_buffer_objects.c
                              &intel_obj->Base);
++<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_buffer_objects.c
 +      _mesa_free(sys_buffer);
++=======
+       _mesa_free(intel_obj->sys_buffer);
+       intel_obj->sys_buffer = NULL;
++>>>>>>> mesa_7_5_branch:src/mesa/drivers/dri/intel/intel_buffer_objects.c
     }
  
     return intel_obj->buffer;

diff --cc src/mesa/drivers/dri/intel/intel_pixel_draw.c
index d79d625f770390184f98af59a467f40fa29d03f3,d80069dd58608b3cf0d422b4c309c795ac2da3fd..b8825dbaef55a0e3156cd079e1edd1aede801764
--- 1/src/mesa/drivers/dri/intel/intel_pixel_draw.c
--- 2/src/mesa/drivers/dri/intel/intel_pixel_draw.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
@@@ -357,13 -369,22 +357,17 @@@ intel_stencil_drawpixels(GLcontext * ct
     vertices[3][0] = x;
     vertices[3][1] = y + height * ctx->Pixel.ZoomY;
  
 -   texcoords[0][0] = 0.0;
 -   texcoords[0][1] = 0.0;
 -   texcoords[1][0] = 1.0;
 -   texcoords[1][1] = 0.0;
 -   texcoords[2][0] = 1.0;
 -   texcoords[2][1] = 1.0;
 -   texcoords[3][0] = 0.0;
 -   texcoords[3][1] = 1.0;
 -
     _mesa_VertexPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), &vertices);
 -   _mesa_ClientActiveTextureARB(GL_TEXTURE0);
 -   _mesa_TexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), &texcoords);
     _mesa_Enable(GL_VERTEX_ARRAY);
++<<<<<<< HEAD:src/mesa/drivers/dri/intel/intel_pixel_draw.c
 +   intel_meta_set_default_texrect(intel);
 +
++=======
+    _mesa_Enable(GL_TEXTURE_COORD_ARRAY);
++>>>>>>> mesa_7_5_branch:src/mesa/drivers/dri/intel/intel_pixel_draw.c
     _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
  
 +   intel_meta_restore_texcoords(intel);
     intel_meta_restore_transform(intel);
  
     _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + old_active_texture);

diff --cc src/mesa/drivers/dri/r300/r300_context.c
index 7aa8075aa70ae4a0f90c5448da5ff9502306b249,7d6705058fe4e9aee3e194640faf4ab9768b92af..14a11ea1fb8f64339063bba76576b2e2e2cf8132
--- 1/src/mesa/drivers/dri/r300/r300_context.c
--- 2/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@@ -400,18 -238,97 +400,20 @@@ GLboolean r300CreateContext(const __GLc
                return GL_FALSE;
        }
  
 -      /* Init r300 context data */
 -      r300->dma.buf0_address =
 -          r300->radeon.radeonScreen->buffers->list[0].address;
 -
 -      (void)memset(r300->texture_heaps, 0, sizeof(r300->texture_heaps));
 -      make_empty_list(&r300->swapped);
 -
 -      r300->nr_heaps = 1 /* screen->numTexHeaps */ ;
 -      assert(r300->nr_heaps < RADEON_NR_TEX_HEAPS);
 -      for (i = 0; i < r300->nr_heaps; i++) {
 -              /* *INDENT-OFF* */
 -              r300->texture_heaps[i] = driCreateTextureHeap(i, r300,
 -                                                             screen->
 -                                                             texSize[i], 12,
 -                                                             RADEON_NR_TEX_REGIONS,
 -                                                             (drmTextureRegionPtr)
 -                                                             r300->radeon.sarea->
 -                                                             tex_list[i],
 -                                                             &r300->radeon.sarea->
 -                                                             tex_age[i],
 -                                                             &r300->swapped,
 -                                                             sizeof
 -                                                             (r300TexObj),
 -                                                             (destroy_texture_object_t
 -                                                              *)
 -                                                             r300DestroyTexObj);
 -              /* *INDENT-ON* */
 -      }
 -      r300->texture_depth = driQueryOptioni(&r300->radeon.optionCache,
 -                                            "texture_depth");
 -      if (r300->texture_depth == DRI_CONF_TEXTURE_DEPTH_FB)
 -              r300->texture_depth = (screen->cpp == 4) ?
 -                  DRI_CONF_TEXTURE_DEPTH_32 : DRI_CONF_TEXTURE_DEPTH_16;
 -
 -      /* Set the maximum texture size small enough that we can guarentee that
 -       * all texture units can bind a maximal texture and have them both in
 -       * texturable memory at once.
 -       */
 -
        ctx = r300->radeon.glCtx;
  
 -      ctx->Const.MaxTextureImageUnits =
 -          driQueryOptioni(&r300->radeon.optionCache, "texture_image_units");
 -      ctx->Const.MaxTextureCoordUnits =
 -          driQueryOptioni(&r300->radeon.optionCache, "texture_coord_units");
 -      ctx->Const.MaxTextureUnits =
 -          MIN2(ctx->Const.MaxTextureImageUnits,
 -               ctx->Const.MaxTextureCoordUnits);
 -      ctx->Const.MaxTextureMaxAnisotropy = 16.0;
 -      ctx->Const.MaxTextureLodBias = 16.0;
 -
 -      if (screen->chip_family >= CHIP_FAMILY_RV515)
 -          ctx->Const.MaxTextureLevels = 13;
 -      else
 -          ctx->Const.MaxTextureLevels = 12;
 -
 -        driCalculateMaxTextureLevels( r300->texture_heaps,
 -                                      r300->nr_heaps,
 -                                      & ctx->Const,
 -                                      4,
 -                                      ctx->Const.MaxTextureLevels - 1,
 -                                      MIN2(ctx->Const.MaxTextureLevels,
 -                                           MAX_3D_TEXTURE_LEVELS) - 1,
 -                                      ctx->Const.MaxTextureLevels - 1,
 -                                      ctx->Const.MaxTextureLevels - 1,
 -                                      ctx->Const.MaxTextureLevels - 1,
 -                                      GL_FALSE,
 -                                      2 );
 -
 -      ctx->Const.MinPointSize = 1.0;
 -      ctx->Const.MinPointSizeAA = 1.0;
 -      ctx->Const.MaxPointSize = R300_POINTSIZE_MAX;
 -      ctx->Const.MaxPointSizeAA = R300_POINTSIZE_MAX;
 +      r300->fallback = 0;
 +      if (r300->options.hw_tcl_enabled)
 +              ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;
  
 -      ctx->Const.MinLineWidth = 1.0;
 -      ctx->Const.MinLineWidthAA = 1.0;
 -      ctx->Const.MaxLineWidth = R300_LINESIZE_MAX;
 -      ctx->Const.MaxLineWidthAA = R300_LINESIZE_MAX;
 +      ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
  
 -#ifdef USER_BUFFERS
 -      /* Needs further modifications */
 -#if 0
 -      ctx->Const.MaxArrayLockSize =
 -          ( /*512 */ RADEON_BUFFER_SIZE * 16 * 1024) / (4 * 4);
 -#endif
 -#endif
 +      r300InitConstValues(ctx, screen);
  
 -      ctx->Const.MaxDrawBuffers = 1;
 +      _mesa_set_mvp_with_dp4( ctx, GL_TRUE );
  
+       _mesa_set_mvp_with_dp4( ctx, GL_TRUE );
+ 
        /* Initialize the software rasterizer and helper modules.
         */
        _swrast_CreateContext(ctx);

diff --cc src/mesa/main/context.c
Simple merge

diff --cc src/mesa/main/enums.c
Simple merge

diff --cc src/mesa/main/mipmap.c
Simple merge

diff --cc src/mesa/main/mtypes.h
Simple merge

diff --cc src/mesa/state_tracker/st_framebuffer.c
Simple merge