mesa: Bump version to 10.1 (final)

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
glx/dri2: fix build failure on HURD
2014-03-05 08:59:46 +02:00 · 2014-03-05 08:38:38 +02:00 · 2014-03-03 09:36:41 +02:00 · 2014-03-03 09:36:01 +02:00
5 changed files with 11 additions and 6 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-10.1.0-rc3
+10.1.0
--- a/src/glx/dri2_query_renderer.c
+++ b/src/glx/dri2_query_renderer.c
@@ -20,6 +20,9 @@
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 * DEALINGS IN THE SOFTWARE.
 */
+
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
+
 #include "glxclient.h"
 #include "glx_error.h"
 #include "xf86drm.h"
@@ -95,3 +98,5 @@ dri2_query_renderer_string(struct glx_screen *base, int attribute,

   return psc->rendererQuery->queryString(psc->driScreen, dri_attribute, value);
 }
+
+#endif /* GLX_DIRECT_RENDERING */
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -326,7 +326,7 @@ brw_predraw_resolve_buffers(struct brw_context *brw)
   /* Resolve depth buffer of each enabled depth texture, and color buffer of
    * each fast-clear-enabled color texture.
    */
-   for (int i = 0; i < BRW_MAX_TEX_UNIT; i++) {
+   for (int i = 0; i < ctx->Const.MaxCombinedTextureImageUnits; i++) {
      if (!ctx->Texture.Unit[i]._ReallyEnabled)
 	 continue;
      tex_obj = intel_texture_object(ctx->Texture.Unit[i]._Current);
--- a/src/mesa/drivers/dri/i965/brw_program.h
+++ b/src/mesa/drivers/dri/i965/brw_program.h
@@ -33,7 +33,7 @@ struct brw_sampler_prog_key_data {
    */
   uint16_t swizzles[MAX_SAMPLERS];

-   uint16_t gl_clamp_mask[3];
+   uint32_t gl_clamp_mask[3];

   /**
    * YUV conversions, needed for the GL_MESA_ycbcr extension.
@@ -44,12 +44,12 @@ struct brw_sampler_prog_key_data {
   /**
    * For RG32F, gather4's channel select is broken.
    */
-   uint16_t gather_channel_quirk_mask;
+   uint32_t gather_channel_quirk_mask;

   /**
    * Whether this sampler uses the compressed multisample surface layout.
    */
-   uint16_t compressed_multisample_layout_mask;
+   uint32_t compressed_multisample_layout_mask;
 };

 #ifdef __cplusplus
--- a/src/mesa/drivers/dri/i965/brw_tex.c
+++ b/src/mesa/drivers/dri/i965/brw_tex.c
@@ -47,7 +47,7 @@ void brw_validate_textures( struct brw_context *brw )
   struct gl_context *ctx = &brw->ctx;
   int i;

-   for (i = 0; i < BRW_MAX_TEX_UNIT; i++) {
+   for (i = 0; i < ctx->Const.MaxCombinedTextureImageUnits; i++) {
      struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];

      if (texUnit->_ReallyEnabled) {
Author	SHA1	Message	Date
Ian Romanick	4a86465f47	mesa: Bump version to 10.1 (final) Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>	2014-03-05 08:59:46 +02:00
Julien Cristau	03d0c9fd30	glx/dri2: fix build failure on HURD Patch from Debian package. Cc: "10.0 10.1" <mesa-stable@lists.freedesktop.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit `6f0e2731e8`)	2014-03-05 08:38:38 +02:00
Chris Forbes	4c0702b05c	i965: Validate (and resolve) all the bound textures. BRW_MAX_TEX_UNIT is the static limit on the number of textures we support per-stage, not in total. Core's `Unit` array is sized by MAX_COMBINED_TEXTURE_IMAGE_UNITS, which is significantly larger, and across the various shader stages, up to ctx->Const.MaxCombinedTextureImageUnits elements of it may be actually used. Fixes invisible bad behavior in piglit's max-samplers test (although this escalated to an assertion failure on HSW with texture_view, since non-immutable textures only have _Format set by validation.) Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Cc: "9.2 10.0 10.1" <mesa-stable@lists.freedesktop.org> Cc: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit `befbda56a2`)	2014-03-03 09:36:41 +02:00
Chris Forbes	5fbd649451	i965: Widen sampler key bitfields for 32 samplers Previously the `high` 16 samplers on Haswell+ would not get sampler workarounds applied. Don't bother widening YUV fields, since they're ignored and going away soon anyway. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Cc: "10.1" <mesa-stable@lists.freedesktop.org> Cc: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit `590920f93e`)	2014-03-03 09:36:01 +02:00