mesa: Changes to 'upstream-unstable'
Makefile | 2
bin/get-pick-list.sh | 29 ++
bin/shortlog_mesa.sh | 23 +
configs/default | 2
docs/relnotes-8.0.4.html | 89 +++----
docs/relnotes-8.0.5.html | 256 +++++++++++++++++++++
include/pci_ids/r600_pci_ids.h | 33 ++
src/egl/drivers/dri2/platform_android.c | 19 -
src/gallium/auxiliary/gallivm/lp_bld_sample.c | 7
src/gallium/auxiliary/util/u_blit.c | 2
src/gallium/drivers/nvfx/nvfx_screen.c | 6
src/gallium/drivers/r300/r300_context.h | 14 +
src/gallium/drivers/r300/r300_emit.c | 8
src/gallium/drivers/r300/r300_state.c | 88 +++++--
src/gallium/drivers/r300/r300_texture.c | 81 ++++++
src/gallium/drivers/r600/evergreen_hw_context.c | 4
src/gallium/drivers/r600/r600.h | 1
src/gallium/drivers/r600/r600_asm.c | 54 ++--
src/gallium/drivers/r600/r600_pipe.c | 3
src/gallium/drivers/r600/r600_shader.c | 11
src/gallium/drivers/softpipe/sp_state_shader.c | 6
src/gallium/drivers/svga/svga_tgsi_insn.c | 10
src/gallium/state_trackers/egl/x11/native_ximage.c | 2
src/gallium/winsys/radeon/drm/radeon_drm_cs.c | 14 -
src/gallium/winsys/radeon/drm/radeon_drm_cs.h | 1
src/glsl/glsl_parser.yy | 2
src/glsl/link_uniforms.cpp | 2
src/glx/apple/apple_visual.c | 2
src/mesa/drivers/common/meta.c | 4
src/mesa/drivers/dri/common/dri_util.c | 25 +-
src/mesa/drivers/dri/common/xmlconfig.c | 2
src/mesa/drivers/dri/i915/i830_state.c | 3
src/mesa/drivers/dri/i915/i830_texstate.c | 2
src/mesa/drivers/dri/i915/i915_state.c | 7
src/mesa/drivers/dri/i965/brw_context.c | 2
src/mesa/drivers/dri/i965/brw_draw_upload.c | 10
src/mesa/drivers/dri/i965/brw_eu.h | 2
src/mesa/drivers/dri/i965/brw_eu_emit.c | 14 -
src/mesa/drivers/dri/i965/brw_eu_util.c | 1
src/mesa/drivers/dri/i965/brw_fs.cpp | 21 +
src/mesa/drivers/dri/i965/brw_fs.h | 4
src/mesa/drivers/dri/i965/brw_fs_emit.cpp | 24 -
src/mesa/drivers/dri/i965/brw_misc_state.c | 38 ++-
src/mesa/drivers/dri/i965/brw_sf.c | 4
src/mesa/drivers/dri/i965/brw_sf_emit.c | 2
src/mesa/drivers/dri/i965/brw_sf_state.c | 8
src/mesa/drivers/dri/i965/brw_vec4_emit.cpp | 3
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 59 +++-
src/mesa/drivers/dri/i965/brw_vs_constval.c | 4
src/mesa/drivers/dri/i965/brw_vs_emit.c | 5
src/mesa/drivers/dri/i965/brw_wm.c | 13 -
src/mesa/drivers/dri/i965/brw_wm.h | 3
src/mesa/drivers/dri/i965/brw_wm_emit.c | 30 +-
src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 13 -
src/mesa/drivers/dri/i965/gen6_hiz.c | 18 +
src/mesa/drivers/dri/i965/gen6_scissor_state.c | 3
src/mesa/drivers/dri/i965/gen6_sf_state.c | 3
src/mesa/drivers/dri/i965/gen6_viewport_state.c | 3
src/mesa/drivers/dri/i965/gen7_clip_state.c | 3
src/mesa/drivers/dri/i965/gen7_hiz.c | 18 +
src/mesa/drivers/dri/i965/gen7_misc_state.c | 18 +
src/mesa/drivers/dri/i965/gen7_sf_state.c | 5
src/mesa/drivers/dri/i965/gen7_viewport_state.c | 3
src/mesa/drivers/dri/intel/intel_batchbuffer.c | 6
src/mesa/drivers/dri/intel/intel_buffers.c | 5
src/mesa/drivers/dri/intel/intel_context.c | 4
src/mesa/drivers/dri/intel/intel_pixel_read.c | 5
src/mesa/drivers/dri/intel/intel_screen.c | 2
src/mesa/drivers/dri/radeon/radeon_span.c | 2
src/mesa/drivers/x11/xm_buffer.c | 29 ++
src/mesa/main/APIspec.xml | 8
src/mesa/main/attrib.c | 13 +
src/mesa/main/buffers.c | 13 -
src/mesa/main/condrender.c | 2
src/mesa/main/extensions.c | 11
src/mesa/main/fbobject.c | 49 +---
src/mesa/main/fbobject.h | 22 +
src/mesa/main/formats.c | 6
src/mesa/main/framebuffer.c | 8
src/mesa/main/mtypes.h | 1
src/mesa/main/pack.c | 15 +
src/mesa/main/renderbuffer.c | 2
src/mesa/main/shaderapi.c | 8
src/mesa/main/teximage.c | 56 ++--
src/mesa/main/texobj.c | 2
src/mesa/main/texparam.c | 12
src/mesa/main/texstorage.c | 48 +++
src/mesa/main/version.h | 4
src/mesa/math/m_matrix.c | 2
src/mesa/program/program.c | 2
src/mesa/state_tracker/st_atom_framebuffer.c | 5
src/mesa/state_tracker/st_cb_fbo.c | 6
src/mesa/state_tracker/st_cb_texture.c | 19 +
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2
src/mesa/state_tracker/st_mesa_to_tgsi.c | 2
src/mesa/swrast/s_context.h | 1
96 files changed, 1150 insertions(+), 370 deletions(-)
New commits:
commit d7c9fcf6bfc3398310a4a2503806627ab79d68a5
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Oct 30 17:31:35 2012 +0100
nvfx: handle some unknown PIPE_CAPs
fixes these warnings:
nvfx_screen_get_param:95 - Warning: unknown PIPE_CAP 30
nvfx_screen_get_param:95 - Warning: unknown PIPE_CAP 55
nvfx_screen_get_param:95 - Warning: unknown PIPE_CAP 56
nvfx_screen_get_param:95 - Warning: unknown PIPE_CAP 58
nvfx_screen_get_param:95 - Warning: unknown PIPE_CAP 59
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47442
Bugzilla: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674965
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
Reviewed-by: Lucas Stach <dev@lynxeye.de>
diff --git a/src/gallium/drivers/nvfx/nvfx_screen.c b/src/gallium/drivers/nvfx/nvfx_screen.c
index b4a1b3a..26c2d8d 100644
--- a/src/gallium/drivers/nvfx/nvfx_screen.c
+++ b/src/gallium/drivers/nvfx/nvfx_screen.c
@@ -88,6 +88,12 @@ nvfx_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
case PIPE_CAP_MAX_TEXEL_OFFSET:
case PIPE_CAP_CONDITIONAL_RENDER:
case PIPE_CAP_TEXTURE_BARRIER:
+ case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS:
+ case PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS:
+ case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
+ case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
+ case PIPE_CAP_TGSI_CAN_COMPACT_VARYINGS:
+ case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS:
return 0;
case PIPE_CAP_MIXED_COLORBUFFER_FORMATS:
return 0;
commit 9cf1afbf8ae87ddbb29b24a0f9f2724e9e2935c1
Author: Brian Paul <brianp@vmware.com>
Date: Tue Sep 4 20:17:15 2012 -0600
mesa: fix per-level max texture size error checking
This is a long-standing omission in Mesa's texture image size checking.
We need to take the mipmap level into consideration when checking if the
width, height and depth are too large.
Fixes the new piglit max-texture-size-level test.
Thanks to Stéphane Marchesin for finding this problem.
Note: This is a candidate for the stable branches.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
(cherry picked from commit 771e7b6d884bb4294a89f276a904d90b28efb90a)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 3aecc0f..ed22fa9 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1251,11 +1251,12 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
switch (target) {
case GL_PROXY_TEXTURE_1D:
- maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
- if (width < 2 * border || width > 2 * border + maxSize)
- return GL_FALSE;
if (level >= ctx->Const.MaxTextureLevels)
return GL_FALSE;
+ maxSize = 1 << (ctx->Const.MaxTextureLevels - 1); /* level zero size */
+ maxSize >>= level; /* level size */
+ if (width < 2 * border || width > 2 * border + maxSize)
+ return GL_FALSE;
if (!ctx->Extensions.ARB_texture_non_power_of_two) {
if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
return GL_FALSE;
@@ -1263,13 +1264,14 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
return GL_TRUE;
case GL_PROXY_TEXTURE_2D:
+ if (level >= ctx->Const.MaxTextureLevels)
+ return GL_FALSE;
maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
+ maxSize >>= level;
if (width < 2 * border || width > 2 * border + maxSize)
return GL_FALSE;
if (height < 2 * border || height > 2 * border + maxSize)
return GL_FALSE;
- if (level >= ctx->Const.MaxTextureLevels)
- return GL_FALSE;
if (!ctx->Extensions.ARB_texture_non_power_of_two) {
if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
return GL_FALSE;
@@ -1279,15 +1281,16 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
return GL_TRUE;
case GL_PROXY_TEXTURE_3D:
+ if (level >= ctx->Const.Max3DTextureLevels)
+ return GL_FALSE;
maxSize = 1 << (ctx->Const.Max3DTextureLevels - 1);
+ maxSize >>= level;
if (width < 2 * border || width > 2 * border + maxSize)
return GL_FALSE;
if (height < 2 * border || height > 2 * border + maxSize)
return GL_FALSE;
if (depth < 2 * border || depth > 2 * border + maxSize)
return GL_FALSE;
- if (level >= ctx->Const.Max3DTextureLevels)
- return GL_FALSE;
if (!ctx->Extensions.ARB_texture_non_power_of_two) {
if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
return GL_FALSE;
@@ -1299,23 +1302,24 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
return GL_TRUE;
case GL_PROXY_TEXTURE_RECTANGLE_NV:
+ if (level != 0)
+ return GL_FALSE;
maxSize = ctx->Const.MaxTextureRectSize;
if (width < 0 || width > maxSize)
return GL_FALSE;
if (height < 0 || height > maxSize)
return GL_FALSE;
- if (level != 0)
- return GL_FALSE;
return GL_TRUE;
case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
+ if (level >= ctx->Const.MaxCubeTextureLevels)
+ return GL_FALSE;
maxSize = 1 << (ctx->Const.MaxCubeTextureLevels - 1);
+ maxSize >>= level;
if (width < 2 * border || width > 2 * border + maxSize)
return GL_FALSE;
if (height < 2 * border || height > 2 * border + maxSize)
return GL_FALSE;
- if (level >= ctx->Const.MaxCubeTextureLevels)
- return GL_FALSE;
if (!ctx->Extensions.ARB_texture_non_power_of_two) {
if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
return GL_FALSE;
@@ -1325,13 +1329,14 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
return GL_TRUE;
case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
+ if (level >= ctx->Const.MaxTextureLevels)
+ return GL_FALSE;
maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
+ maxSize >>= level;
if (width < 2 * border || width > 2 * border + maxSize)
return GL_FALSE;
if (height < 1 || height > ctx->Const.MaxArrayTextureLayers)
return GL_FALSE;
- if (level >= ctx->Const.MaxTextureLevels)
- return GL_FALSE;
if (!ctx->Extensions.ARB_texture_non_power_of_two) {
if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
return GL_FALSE;
@@ -1339,15 +1344,16 @@ _mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
return GL_TRUE;
case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
+ if (level >= ctx->Const.MaxTextureLevels)
+ return GL_FALSE;
maxSize = 1 << (ctx->Const.MaxTextureLevels - 1);
+ maxSize >>= level;
if (width < 2 * border || width > 2 * border + maxSize)
return GL_FALSE;
if (height < 2 * border || height > 2 * border + maxSize)
return GL_FALSE;
if (depth < 1 || depth > ctx->Const.MaxArrayTextureLayers)
return GL_FALSE;
- if (level >= ctx->Const.MaxTextureLevels)
- return GL_FALSE;
if (!ctx->Extensions.ARB_texture_non_power_of_two) {
if (width > 0 && !_mesa_is_pow_two(width - 2 * border))
return GL_FALSE;
commit b4867c24b06dc12c84060196e59450bd63c8ec98
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Oct 24 23:59:44 2012 +0200
docs: add another fixed bug to mesa 8.0.5 release notes
Reported-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
(cherry picked from commit 86cd77d0a9ac940c2c06eebc5e9ef840d176712a)
diff --git a/docs/relnotes-8.0.5.html b/docs/relnotes-8.0.5.html
index 3c51c5b..384a885 100644
--- a/docs/relnotes-8.0.5.html
+++ b/docs/relnotes-8.0.5.html
@@ -73,6 +73,8 @@ cda5d101f43b8784fa60bdeaca4056f2 MesaLib-8.0.5.tar.gz
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=53618";>Bug 53618</a> - [Bisected i915]Piglit glx_GLX_ARB_create_context_NULL_attribute_list Aborted</li>
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=53972";>Bug 53972</a> - Black Mirror III: too dark</li>
+
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=54183";>Bug 54183</a> - [Bisected ILK regression]many piglit/oglc/ogles2 cases Segmentation fault</li>
<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=54193";>Bug 54193</a> - output_components uninitialized in fs_visitor::emit_fb_writes()</li>
commit 025725e11412e06a965840a7831b7bccf0244bb7
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Oct 24 22:57:53 2012 +0200
docs: Add 8.0.5 release md5sums
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
diff --git a/docs/relnotes-8.0.5.html b/docs/relnotes-8.0.5.html
index 89a9dd9..3c51c5b 100644
--- a/docs/relnotes-8.0.5.html
+++ b/docs/relnotes-8.0.5.html
@@ -25,7 +25,9 @@ for DRI hardware acceleration.
<h2>MD5 checksums</h2>
<pre>
-TBD
+cda5d101f43b8784fa60bdeaca4056f2 MesaLib-8.0.5.tar.gz
+01305591073a76b65267f69f27d635a3 MesaLib-8.0.5.tar.bz2
+97f11c00cac8fb98aa0131990086dc8e MesaLib-8.0.5.zip
</pre>
<h2>New features</h2>
commit 16aaa75d9f74b3b7042d8bb4193c3366137019b0
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Oct 24 21:28:34 2012 +0200
docs: Add 8.0.5 release notes
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
diff --git a/docs/relnotes-8.0.5.html b/docs/relnotes-8.0.5.html
new file mode 100644
index 0000000..89a9dd9
--- /dev/null
+++ b/docs/relnotes-8.0.5.html
@@ -0,0 +1,252 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <title>Mesa Release Notes</title>
+ <link rel="stylesheet" type="text/css" href="mesa.css">
+</head>
+<body>
+
+<h1>Mesa 8.0.5 Release Notes / October 24, 2012</h1>
+
+<p>
+Mesa 8.0.5 is a bug fix release which fixes bugs found since the 8.0.4 release.
+</p>
+<p>
+Mesa 8.0.5 implements the OpenGL 3.0 API, but the version reported by
+glGetString(GL_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.0.
+</p>
+<p>
+See the <a href="install.html">Compiling/Installing page</a> for prerequisites
+for DRI hardware acceleration.
+</p>
+
+
+<h2>MD5 checksums</h2>
+<pre>
+TBD
+</pre>
+
+<h2>New features</h2>
+<p>None.</p>
+
+<h2>Bug fixes</h2>
+
+<p>This list is likely incomplete.</p>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=44912";>Bug 44912</a> - [bisected] WebGL conformance/textures/texture-mips tests fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=46644";>Bug 46644</a> - Sandybridge Mobile: ARBfp TXP with coords from fragment.color doesn't apply W divide</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=46784";>Bug 46784</a> - MAD using multiply written register fails</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=47375";>Bug 47375</a> - Blender crash on startup after upgrade to mesa 8.0.1</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=48120";>Bug 48120</a> - GL_EXT_texture_sRGB_decode still broken</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=48628";>Bug 48628</a> - [bisected ILK]Oglc fogexp(basic.allCases) regressed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=49772";>Bug 49772</a> - [SNB]Oglc depth-stencil(basic.read.ds) regressed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=52129";>Bug 52129</a> - [Bisected ILK]Piglit spec_ARB_shader_texture_lod_execution_glsl-fs-shadow2DGradARB-01 regressed</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=52382";>Bug 52382</a> - [ivb gt1] Severe image corruption and GPU Hang, too many PS threads</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=52563";>Bug 52563</a> - build failure - struct radeon_renderbuffer has no member named Base</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=53311";>Bug 53311</a> - [Bisected IVB]Oglc transform_feedback(advanced.transformFeedback.points) Invalid argument</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=53314";>Bug 53314</a> - [llvmpipe] src/gallium/drivers/llvmpipe/lp_texture.c:920:llvmpipe_get_texture_tile_layout: Assertion `x < lpr->tiles_per_row[level]' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=53316";>Bug 53316</a> - [llvmpipe] src/gallium/drivers/llvmpipe/lp_texture.c:601:llvmpipe_get_transfer: Assertion `resource' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=53317";>Bug 53317</a> - [llvmpipe] SIGSEGV src/gallium/auxiliary/gallivm/lp_bld_sample.c:99</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=53318";>Bug 53318</a> - [softpipe] sp_state_shader.c:194:softpipe_delete_fs_state: Assertion `var != softpipe->fs_variant' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=53319";>Bug 53319</a> - [softpipe] sp_texture.c:322:softpipe_get_transfer: Assertion `level <= resource->last_level' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=53618";>Bug 53618</a> - [Bisected i915]Piglit glx_GLX_ARB_create_context_NULL_attribute_list Aborted</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=54183";>Bug 54183</a> - [Bisected ILK regression]many piglit/oglc/ogles2 cases Segmentation fault</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=54193";>Bug 54193</a> - output_components uninitialized in fs_visitor::emit_fb_writes()</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=54301";>Bug 54301</a> - [Bisected ILK regression]Piglit glx_GLX_ARB_create_context_forward-compatible_flag_with_3.0 Segmentation fault</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=56211";>Bug 56211</a> - src/mesa/state_tracker/st_cb_texture.c:1123:copy_image_data_to_texture: Assertion `u_minify(stImage->pt->height0, src_level) == stImage->base.Height' failed.</li>
+
+<!-- <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=";>Bug </a> - </li> -->
+
+</ul>
+
+
+<h2>Changes</h2>
+<p>The full set of changes can be viewed by using the following GIT command:</p>
+
+<pre>
+ git log mesa-8.0.4..mesa-8.0.5
+</pre>
+
+<p>Alex Deucher (3):</p>
+<ul>
+ <li>r600g: 8.0.x support for Trinity</li>
+ <li>r600g: add new Sumo, Palm, BTC pci ids</li>
+ <li>r600g: add additional evergreen pci ids</li>
+</ul>
+
+<p>Andreas Boll (4):</p>
+<ul>
+ <li>docs/relnotes-8.0.4: fix html markup</li>
+ <li>mesa: fix html in shortlog_mesa.sh script</li>
+ <li>mesa: add get-pick-list.sh script into bin/</li>
+ <li>mesa: Bump version number to 8.0.5</li>
+</ul>
+
+<p>Brian Paul (18):</p>
+<ul>
+ <li>mesa: use _mesa_is_user_fbo() and _mesa_is_winsys_fbo() functions</li>
+ <li>intel: use _mesa_is_winsys/user_fbo() helpers</li>
+ <li>st/egl: fix uninitialized pointer bug</li>
+ <li>mesa: added Ian's shortlog_mesa.sh script in bin/</li>
+ <li>mesa: loosen small matrix determinant check</li>
+ <li>xlib: add X error handler around XGetImage() call</li>
+ <li>radeon: set swrast_renderbuffer::ColorType field when mapping renderbuffers</li>
+ <li>svga: fix invalid memory reference in needs_to_create_zero()</li>
+ <li>meta: fix glDrawPixels fallback test, stencil drawing</li>
+ <li>radeon: fix Base/base typo</li>
+ <li>st/mesa: fix glCopyTexSubImage crash</li>
+ <li>gallivm: fix crash in lp_sampler_static_state()</li>
+ <li>st/mesa: fix renderbuffer validation bug</li>
+ <li>softpipe: fix softpipe_delete_fs_state() failed assertion</li>
+ <li>mesa: raise GL_INVALID_OPERATION in glGenerateMipmap for missing base image</li>
+ <li>st/mesa: s/CALLOC/calloc/ to fix allocation bug</li>
+ <li>mesa: do internal format error checking for glTexStorage()</li>
+ <li>mesa: fix incorrect error for glCompressedSubTexImage</li>
+</ul>
+
+<p>Chad Versace (3):</p>
+<ul>
+ <li>mesa: Don't advertise GLES extensions in GL contexts</li>
+ <li>i830: Fix stack corruption</li>
+ <li>swrast: Fix implicit declaration warnings</li>
+</ul>
+
+<p>Chris Forbes (1):</p>
+<ul>
+ <li>mesa: fix dropped && in glGetStringi()</li>
+</ul>
+
+<p>Christoph Bumiller (1):</p>
+<ul>
+ <li>st/mesa: call update_renderbuffer_surface for sRGB renderbuffers, too</li>
+</ul>
+
+<p>Eric Anholt (9):</p>
+<ul>
+ <li>i965/gen7: Reduce GT1 WM thread count according to updated BSpec.</li>
+ <li>i965/fs: Invalidate live intervals in passes that remove an instruction.</li>
+ <li>i965: Fix bug in the old FS backend's projtex() calculation.</li>
+ <li>i965: Add support for GL_SKIP_DECODE_EXT on other SRGB formats.</li>
+ <li>i965/vs: Convert EdgeFlagPointer values appropriately for the VS on gen4.</li>
+ <li>i965: Fix accumulator_contains() test to also reject swizzles of the dst.</li>
+ <li>mesa: Fix glPopAttrib() behavior on GL_FRAMEBUFFER_SRGB.</li>
+ <li>mesa: In conditional rendering fallback, check the query status.</li>
+ <li>i965: Drop the confusing saturate argument to math instruction setup.</li>
+</ul>
+
+<p>Ian Romanick (8):</p>
+<ul>
+ <li>docs: Add 8.0.4 release md5sums</li>
+ <li>Revert "i965: Avoid unnecessary recompiles for shaders that don't use dFdy()."</li>
+ <li>i965: Fix regression in depth texture rendering on pre-SNB</li>
+ <li>dri2: Fix bug in attribute handling for non-desktop OpenGL contexts</li>
+ <li>mesa: Generate an error when glCopyTexImage border is invalid</li>
+ <li>mesa/es: Validate glTexImage border in Mesa code rather than the ES wrapper</li>
+ <li>mesa: Allow glGetTexParameter of GL_TEXTURE_SRGB_DECODE_EXT</li>
+ <li>dri_util: Use calloc to allocate __DRIcontext</li>
+</ul>
+
+<p>Jonas Maebe (1):</p>
+<ul>
+ <li>darwin: do not create double-buffered offscreen pixel formats</li>
+</ul>
+
+<p>Jordan Justen (1):</p>
+<ul>
+ <li>intel: move error on create context to proper path</li>
+</ul>
+
+<p>José Fonseca (1):</p>
+<ul>
+ <li>mesa: disable MSVC global optimization in pack.c</li>
+</ul>
+
+<p>Kenneth Graunke (8):</p>
+<ul>
+ <li>mesa: Use GLdouble for depthMax in final unpack conversions.</li>
+ <li>i965/fs: Initialize output_components[] by filling it with zeros.</li>
+ <li>mesa: Prevent repeated glDeleteShader() from blowing away our refcounts.</li>
+ <li>i965: Support MESA_FORMAT_SIGNED_RGBA_16.</li>
+ <li>glsl: Fix #pragma invariant(all) language version check.</li>
+ <li>i965/vs: Don't clobber sampler message MRFs with subexpressions.</li>
+ <li>intel: Move finish_batch() call before MI_BATCH_BUFFER_END and padding.</li>
+ <li>i965/fs: Don't use brw->fragment_program in calculate_urb_setup().</li>
+</ul>
+
+<p>Maarten Lankhorst (1):</p>
+<ul>
+ <li>winsys/radeon: Remove unnecessary pipe_thread_destroy in radeon_drm_cs_destroy</li>
+</ul>
+
+<p>Marek Olšák (6):</p>
+<ul>
+ <li>mesa: remove assertions that do not allow compressed 2D_ARRAY textures</li>
+ <li>r300g: fix colormask with non-BGRA formats</li>
+ <li>r600g: fix RSQ of negative value on Cayman</li>
+ <li>r600g: fix EXP on Cayman</li>
+ <li>r600g: fix instance divisor on Cayman</li>
+ <li>gallium/u_blit: set dst format from pipe_resource, not pipe_surface</li>
+</ul>
+
+<p>Michel Dänzer (2):</p>
+<ul>
+ <li>st/mesa: Fix source miptree level for copying data to finalized miptree.</li>
+ <li>st/mesa: Fix assertions for copying texture image to finalized miptree.</li>
+</ul>
+
+<p>Niels Ole Salscheider (1):</p>
+<ul>
+ <li>st/mesa: index can be negative in the PROGRAM_CONSTANT case</li>
+</ul>
+
+<p>Paul Berry (5):</p>
+<ul>
+ <li>i965: Compute dFdy() correctly for FBOs.</li>
+ <li>mesa: Add UsesDFdy to struct gl_fragment_program.</li>
+ <li>i965: Avoid unnecessary recompiles for shaders that don't use dFdy().</li>
+ <li>i965/Gen6: Work around GPU hangs due to misaligned depth coordinate offsets.</li>
+ <li>i965/Gen7: Work around GPU hangs due to misaligned depth coordinate offsets.</li>
+</ul>
+
+<p>Stéphane Marchesin (1):</p>
+<ul>
+ <li>glsl/linker: Avoid buffer over-run in parcel_out_uniform_storage::visit_field</li>
+</ul>
+
+<p>Tapani Pälli (2):</p>
+<ul>
+ <li>xmlconfig: use __progname when building for Android</li>
+ <li>android: do not expose single buffered eglconfigs</li>
+</ul>
+
+<p>Vadim Girlin (1):</p>
+<ul>
+ <li>winsys/radeon: fix relocs caching</li>
+</ul>
+
+</body>
+</html>
commit d8571a1acf74f2ae3afe98dbdb4cae6e3501f932
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Oct 24 21:11:11 2012 +0200
mesa: Bump version number to 8.0.5
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
diff --git a/Makefile b/Makefile
index 61f4af6..28e7c36 100644
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,7 @@ ultrix-gcc:
# Rules for making release tarballs
-PACKAGE_VERSION=8.0.4
+PACKAGE_VERSION=8.0.5
PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
diff --git a/configs/default b/configs/default
index 289aa0e..3fe403b 100644
--- a/configs/default
+++ b/configs/default
@@ -10,7 +10,7 @@ CONFIG_NAME = default
# Version info
MESA_MAJOR=8
MESA_MINOR=0
-MESA_TINY=4
+MESA_TINY=5
MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
# external projects. This should be useless now that we use libdrm.
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 6afeff4..18e0b26 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -34,8 +34,8 @@ struct gl_context;
/* Mesa version */
#define MESA_MAJOR 8
#define MESA_MINOR 0
-#define MESA_PATCH 4
-#define MESA_VERSION_STRING "8.0.4"
+#define MESA_PATCH 5
+#define MESA_VERSION_STRING "8.0.5"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit 47a509c0461e1bfb37a5d0ec0ef4bc65150221e1
Author: Brian Paul <brianp@vmware.com>
Date: Sat Sep 22 09:30:23 2012 -0600
mesa: fix incorrect error for glCompressedSubTexImage
If a subtexture region isn't aligned to the compressed block size,
return GL_INVALID_OPERATION, not gl_INVALID_VALUE.
NOTE: This is a candidate for the stable branches.
Reviewed-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit 1f586684d62c4f5208d1f3929d067a79ea2140ac)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 888c7ad..3aecc0f 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3403,13 +3403,13 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
get_compressed_block_size(format, &bw, &bh);
if ((xoffset % bw != 0) || (yoffset % bh != 0))
- return GL_INVALID_VALUE;
+ return GL_INVALID_OPERATION;
if ((width % bw != 0) && width != 2 && width != 1)
- return GL_INVALID_VALUE;
+ return GL_INVALID_OPERATION;
if ((height % bh != 0) && height != 2 && height != 1)
- return GL_INVALID_VALUE;
+ return GL_INVALID_OPERATION;
expectedSize = compressed_tex_size(width, height, depth, format);
if (expectedSize != imageSize)
commit 59b1e4a29e756d291f815d4429c8af0e4cf068aa
Author: Brian Paul <brianp@vmware.com>
Date: Sat Sep 8 09:27:46 2012 -0600
mesa: do internal format error checking for glTexStorage()
Turns out we weren't doing any format checking before. Now check
the internal format and, in particular, make sure that unsized internal
formats aren't accepted.
Note: This is a candidate for the stable branches.
(cherry picked from commit 2e4fc54977977e674ee77294e6632a24e594d17f)
diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c
index 5e1f31a..68847f1 100644
--- a/src/mesa/main/texstorage.c
+++ b/src/mesa/main/texstorage.c
@@ -244,6 +244,54 @@ tex_storage_error_check(struct gl_context *ctx, GLuint dims, GLenum target,
const GLboolean isProxy = _mesa_is_proxy_texture(target);
struct gl_texture_object *texObj;
GLuint maxDim;
+ GLboolean legalFormat;
+
+ /* check internal format - note that only sized formats are allowed */
+ switch (internalformat) {
+ case GL_ALPHA:
+ case GL_LUMINANCE:
+ case GL_LUMINANCE_ALPHA:
+ case GL_INTENSITY:
+ case GL_RED:
+ case GL_RG:
+ case GL_RGB:
+ case GL_RGBA:
+ case GL_BGRA:
+ case GL_DEPTH_COMPONENT:
+ case GL_DEPTH_STENCIL:
+ case GL_COMPRESSED_ALPHA:
+ case GL_COMPRESSED_LUMINANCE_ALPHA:
+ case GL_COMPRESSED_LUMINANCE:
+ case GL_COMPRESSED_INTENSITY:
+ case GL_COMPRESSED_RGB:
+ case GL_COMPRESSED_RGBA:
+ case GL_COMPRESSED_SRGB:
+ case GL_COMPRESSED_SRGB_ALPHA:
+ case GL_COMPRESSED_SLUMINANCE:
+ case GL_COMPRESSED_SLUMINANCE_ALPHA:
+ case GL_RED_INTEGER:
+ case GL_GREEN_INTEGER:
+ case GL_BLUE_INTEGER:
+ case GL_ALPHA_INTEGER:
+ case GL_RGB_INTEGER:
+ case GL_RGBA_INTEGER:
+ case GL_BGR_INTEGER:
+ case GL_BGRA_INTEGER:
+ case GL_LUMINANCE_INTEGER_EXT:
+ case GL_LUMINANCE_ALPHA_INTEGER_EXT:
+ /* these unsized formats are illegal */
+ legalFormat = GL_FALSE;
+ break;
+ default:
+ legalFormat = _mesa_base_tex_format(ctx, internalformat) > 0;
+ }
+
+ if (!legalFormat) {
+ _mesa_error(ctx, GL_INVALID_ENUM,
+ "glTexStorage%uD(internalformat = %s)", dims,
+ _mesa_lookup_enum_by_nr(internalformat));
+ return GL_TRUE;
+ }
/* size check */
if (width < 1 || height < 1 || depth < 1) {
commit 9afcb18146c457a789266eafa8596c96445d7c5e
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Sep 26 11:08:11 2012 -0700
dri_util: Use calloc to allocate __DRIcontext
The __DRIcontext contains some pointers, and some drivers check for them to be
NULL in some failure paths. Instead of sprinkling NULL assignments across the
various drivers, just zero out the whole thing.
NOTE: This is a candidate for the 9.0 branch.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-and-tested-by: Kenneth Graunke <kenneth@whitecape.org>
Tested-by: Lu Hua <huax.lu@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=53618
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54301
(cherry picked from commit f93cb0bebb10e3e3e5df099be51021b211650356)
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index f39c23a..ce68686 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -232,7 +232,7 @@ dri2CreateContextAttribs(__DRIscreen *screen, int api,
return NULL;
}
- context = malloc(sizeof *context);
+ context = calloc(1, sizeof *context);
if (!context) {
*error = __DRI_CTX_ERROR_NO_MEMORY;
return NULL;
commit 1c4b61e0c226e57533e0f7362cffde0e05cc89f4
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 18 15:19:18 2012 +0200
mesa: Allow glGetTexParameter of GL_TEXTURE_SRGB_DECODE_EXT
This was already (correctly) supported for glGetSamplerParameter paths.
NOTE: This is a candidate for stable branches.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit ae3023e9675a033ff66b9bb14598aa1f02530d7f)
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 0f92a5b..dda9737 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -1204,6 +1204,12 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
*params = (GLfloat) obj->Immutable;
break;
+ case GL_TEXTURE_SRGB_DECODE_EXT:
+ if (!ctx->Extensions.EXT_texture_sRGB_decode)
+ goto invalid_pname;
+ *params = (GLfloat) obj->Sampler.sRGBDecode;
+ break;
+
default:
goto invalid_pname;
}
@@ -1349,6 +1355,12 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
*params = obj->RequiredTextureImageUnits;
break;
+ case GL_TEXTURE_SRGB_DECODE_EXT:
+ if (!ctx->Extensions.EXT_texture_sRGB_decode)
+ goto invalid_pname;
+ *params = obj->Sampler.sRGBDecode;
+ break;
+
default:
goto invalid_pname;
}
commit b130d42279419674cb5aecf321e1650d4f46419b
Author: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun Sep 16 19:54:11 2012 +1200
mesa: fix dropped && in glGetStringi()
This fixes glGetStringi(GL_EXTENSIONS,.. for core contexts. Previously,
all extension names returned would be NULL.
NOTE: This is a candidate for release branches.
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit d30a7d2eb4b6d853bfa90169341334f2b2a643d5)
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index f9d4435..69ad629 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -939,7 +939,7 @@ _mesa_get_enabled_extension(struct gl_context *ctx, GLuint index)
base = (GLboolean*) &ctx->Extensions;
n = 0;
for (i = extension_table; i->name != 0; ++i) {
- if (base[i->offset] & (i->api_set & (1 << ctx->API))) {
+ if (base[i->offset] && (i->api_set & (1 << ctx->API))) {
if (n == index)
return (const GLubyte*) i->name;
else
commit f0b188a6c67ed1b78d69d27d772f1d7c3069c954
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 6 14:59:39 2012 -0700
i965: Drop the confusing saturate argument to math instruction setup.
This was ridiculous. We were ignoring the inst->header.saturate flag in the
case of math and only math. On gen4, we would leave inst->header.saturate in
place if it happened to be set, which would end up being applied to the
implicit mov and thus trash the first argument. On gen6, we would overwrite
inst->header.saturate with the saturate flag from the argument, which was not
set appropriately in brw_vec4_emit.cpp, and was only not a bug due to our
incompetence at coalescing saturate moves.
By ripping the argument out and making saturate work just like all the other
brw_eu_emit.c code generation, we can avoid both these classes of bugs.
Fixes piglit fog-modes, and the new specific fs-saturate-exp2 case.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48628
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 9b4053cabd8bda180b352d2d2047209f6ca5f6e8)
diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h
index 5064c18..7c0aaed 100644
--- a/src/mesa/drivers/dri/i965/brw_eu.h
+++ b/src/mesa/drivers/dri/i965/brw_eu.h
@@ -974,7 +974,6 @@ void brw_SAMPLE(struct brw_compile *p,
void brw_math_16( struct brw_compile *p,
struct brw_reg dest,
GLuint function,
- GLuint saturate,
GLuint msg_reg_nr,
struct brw_reg src,
GLuint precision );
@@ -982,7 +981,6 @@ void brw_math_16( struct brw_compile *p,
void brw_math( struct brw_compile *p,
struct brw_reg dest,
GLuint function,
- GLuint saturate,
GLuint msg_reg_nr,
struct brw_reg src,
GLuint data_type,
diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
index 21d3c5a..ca06957 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
@@ -429,7 +429,6 @@ static void brw_set_math_message( struct brw_compile *p,
GLuint function,
GLuint integer_type,
bool low_precision,
- bool saturate,
GLuint dataType )
{
struct brw_context *brw = p->brw;
@@ -461,22 +460,24 @@ static void brw_set_math_message( struct brw_compile *p,
break;
}
+
brw_set_message_descriptor(p, insn, BRW_SFID_MATH,
msg_length, response_length, false, false);
if (intel->gen == 5) {
insn->bits3.math_gen5.function = function;
insn->bits3.math_gen5.int_type = integer_type;
insn->bits3.math_gen5.precision = low_precision;
- insn->bits3.math_gen5.saturate = saturate;
+ insn->bits3.math_gen5.saturate = insn->header.saturate;
insn->bits3.math_gen5.data_type = dataType;
insn->bits3.math_gen5.snapshot = 0;
} else {
insn->bits3.math.function = function;
insn->bits3.math.int_type = integer_type;
insn->bits3.math.precision = low_precision;
- insn->bits3.math.saturate = saturate;
+ insn->bits3.math.saturate = insn->header.saturate;
insn->bits3.math.data_type = dataType;
}
+ insn->header.saturate = 0;
}
@@ -1567,7 +1568,6 @@ void brw_WAIT (struct brw_compile *p)
void brw_math( struct brw_compile *p,
struct brw_reg dest,
GLuint function,
- GLuint saturate,
GLuint msg_reg_nr,
struct brw_reg src,
GLuint data_type,
@@ -1603,7 +1603,6 @@ void brw_math( struct brw_compile *p,
* becomes FC[3:0] and ThreadCtrl becomes FC[5:4].
*/
insn->header.destreg__conditionalmod = function;
- insn->header.saturate = saturate;
brw_set_dest(p, insn, dest);
brw_set_src0(p, insn, src);
@@ -1624,7 +1623,6 @@ void brw_math( struct brw_compile *p,
function,
src.type == BRW_REGISTER_TYPE_D,
precision,
- saturate,
data_type);
}
}
@@ -1689,7 +1687,6 @@ void brw_math2(struct brw_compile *p,
void brw_math_16( struct brw_compile *p,
struct brw_reg dest,
GLuint function,
- GLuint saturate,
GLuint msg_reg_nr,
struct brw_reg src,
GLuint precision )
@@ -1704,7 +1701,6 @@ void brw_math_16( struct brw_compile *p,
* becomes FC[3:0] and ThreadCtrl becomes FC[5:4].
*/
insn->header.destreg__conditionalmod = function;
- insn->header.saturate = saturate;
/* Source modifiers are ignored for extended math instructions. */
assert(!src.negate);
@@ -1732,7 +1728,6 @@ void brw_math_16( struct brw_compile *p,
function,
BRW_MATH_INTEGER_UNSIGNED,
precision,
- saturate,
BRW_MATH_DATA_VECTOR);
/* Second instruction:
@@ -1748,7 +1743,6 @@ void brw_math_16( struct brw_compile *p,
function,
BRW_MATH_INTEGER_UNSIGNED,
precision,
- saturate,
BRW_MATH_DATA_VECTOR);
brw_pop_insn_state(p);
diff --git a/src/mesa/drivers/dri/i965/brw_eu_util.c b/src/mesa/drivers/dri/i965/brw_eu_util.c
index 5405cf1..2037634 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_util.c
Reply to: