VERSION | 2 +-
src/glx/dri2_query_renderer.c | 5 +++++
src/mesa/drivers/dri/i965/brw_draw.c | 2 +-
src/mesa/drivers/dri/i965/brw_program.h | 6 +++---
src/mesa/drivers/dri/i965/brw_tex.c | 2 +-
5 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 4a86465f4754a0d79ed98f2d1ce425864854418b
Author: Ian Romanick <ian.d.roman...@intel.com>
Date: Wed Mar 5 08:59:46 2014 +0200
mesa: Bump version to 10.1 (final)
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
diff --git a/VERSION b/VERSION
index 4b9caf0..4149c39 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.1.0-rc3
+10.1.0
commit 03d0c9fd308db2124efbe240eda24a2a67eb67d2
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Mar 1 10:11:11 2014 +0100
glx/dri2: fix build failure on HURD
Patch from Debian package.
Cc: "10.0 10.1" <mesa-sta...@lists.freedesktop.org>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
(cherry picked from commit 6f0e2731e862d1c2d8d21927040bead5049a2d68)
diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c
index b50a202..95560cb 100644
--- 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 */
commit 4c0702b05ca002e42dbf05c6c4451113df0c3799
Author: Chris Forbes <chr...@ijw.co.nz>
Date: Sat Feb 22 18:09:31 2014 +1300
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 <chr...@ijw.co.nz>
Cc: "9.2 10.0 10.1" <mesa-sta...@lists.freedesktop.org>
Cc: Kenneth Graunke <kenn...@whitecape.org>
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
(cherry picked from commit befbda56a246f77797bdf13fc005353441db2879)
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c
b/src/mesa/drivers/dri/i965/brw_draw.c
index 39da953..1e018bb 100644
--- 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);
diff --git a/src/mesa/drivers/dri/i965/brw_tex.c
b/src/mesa/drivers/dri/i965/brw_tex.c
index 9234e3a..b1f4de0 100644
--- 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) {
commit 5fbd6494517be0bc2f2ead4d6966776fcb0d426d
Author: Chris Forbes <chr...@ijw.co.nz>
Date: Thu Feb 27 07:28:05 2014 +1300
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 <chr...@ijw.co.nz>
Cc: "10.1" <mesa-sta...@lists.freedesktop.org>
Cc: Kenneth Graunke <kenn...@whitecape.org>
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
(cherry picked from commit 590920f93e227f1fb4258dd01b662e8bda8b3af4)
diff --git a/src/mesa/drivers/dri/i965/brw_program.h
b/src/mesa/drivers/dri/i965/brw_program.h
index 51182ea..f4dedf8 100644
--- 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
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wlezh-0003cb...@moszumanska.debian.org
