Mesa (8.0): 32 new commits
Ian Romanick
idr at kemper.freedesktop.org
Tue Feb 7 16:24:28 PST 2012
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e86d90eb208292916c8a04c5d75499492003dd16
Author: Eric Anholt <eric at anholt.net>
Date: Mon Jan 30 13:30:53 2012 -0800
dri: Add Unigine Tropics as an app that requires the GLSL warn workaround.
I wasn't seeing it be needed because of the previous bug.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov at intel.com>
(cherry picked from commit b8c9252570d126e06607cd28b14f0fe3a2ffe4cf)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1531b94471fa283690fabb19e9a157247ba5fb8b
Author: Eric Anholt <eric at anholt.net>
Date: Mon Jan 30 13:29:07 2012 -0800
dri: Fix typo in xml file that made all applications use the workaround.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov at intel.com>
(cherry picked from commit 4dd2743d4542bedd935134d351e528ad574f7ee5)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5efe0881ed385de36fa2f4889e1dd962990420a
Author: Eric Anholt <eric at anholt.net>
Date: Wed Jan 25 14:22:03 2012 -0800
dri: Add a default drirc to be installed to provide application workarounds.
Specifially, this being present works around a bug in Unigine
Sanctuary on i965 which previously resulted in bad rendering.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit ff2497dca39d688bbceba9f524a61e99d93a9607)
NOTE: Compared to ff2497d this does not install the default drirc.
The pre-automake build system is sufficiently braindamaged to make
this exceptionally difficult.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=73e15679cede19a780481bb60fa2ca582c6abf0e
Author: Chih-Wei Huang <cwhuang at linux.org.tw>
Date: Thu Feb 2 20:23:57 2012 +0800
vbo: fix a building error
Signed-off-by: Marek Olšák <maraeo at gmail.com>
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit f8be4f33d31d004bfcf090fa7d4aa37b750e43af)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=974a67b41e879b91765e3ef647ae22fe99a47079
Author: Eric Anholt <eric at anholt.net>
Date: Mon Jan 30 09:50:35 2012 -0800
glsl: Add error case for switch() with two default cases.
Fixes piglit switch-case-duplicated.vert.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 57e44371a5b6aa8122b6a482ed6bd33e797ea1d2)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83075bd0fe1fa4519f40edde1f9bc70967ee03a9
Author: Eric Anholt <eric at anholt.net>
Date: Mon Jan 30 08:50:14 2012 -0800
glsl: Throw an error when faced with a duplicated switch() case label.
The error message I chose matches gcc's error. Fixes piglit
switch-case-duplicated.vert.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 140632190cf41e6a035ca199b181091d4ed46986)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d799a7b585225441b5a424fbd3de8b719d0ada6e
Author: Eric Anholt <eric at anholt.net>
Date: Mon Jan 30 09:46:09 2012 -0800
glsl: Add other missing error location information for switch statements.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 01a5a2c9d761d4c9d72c236084efee700dcb28b8)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b4df494b1f5f020444b14fcaeea6e02adb7d7ac
Author: Eric Anholt <eric at anholt.net>
Date: Mon Jan 30 09:41:55 2012 -0800
glsl: Add missing location info to case labels.
Otherwise, the upcoming error messages said the location was 0:0(0).
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 663dcbbffeaedf0643e7e9d930ccfbcd698d1d9c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=728bda08d85813eeda12ae52e0893a37533ba02c
Author: Eric Anholt <eric at anholt.net>
Date: Sat Jan 28 11:43:22 2012 -0800
glsl: Throw the required error when a case label is a non-constant.
It's not quite spelled out in the spec text, but the grammar indicates
that only constant values are allowed as switch() case labels (and
only constant values make sense, anyway).
Fixes piglit glsl-1.30/compiler/switch-statement/switch-case-uniform-int.vert.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 2c3e10e71935506798c413363df27afc4348fb53)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f775d9aa848c61dcf7eb2ca6d599b40366034848
Author: Eric Anholt <eric at anholt.net>
Date: Sat Jan 28 11:26:02 2012 -0800
glsl: Save and restore the whole switch state for nesting.
This stuffs them all in a struct for sanity. Fixes piglit
glsl-1.30/execution/switch/fs-uniform-nested.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 22d81f154fed9e004cca91807808ae3b81b01ced)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6887ec766b33ed7a9d44376050d5876f2b6c88ec
Author: Eric Anholt <eric at anholt.net>
Date: Mon Jan 30 13:20:27 2012 -0800
mesa: Fix the error message function names for glFlushMappedBufferRange().
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 27af00eac8c574c2fc145e333d1c0ade1fd91cda)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6d82dc18f11e21eb57e229ac9b95a2850f2e7971
Author: Eric Anholt <eric at anholt.net>
Date: Wed Jan 25 16:30:26 2012 -0800
mesa: Fix bad-enum/no-buffer error handling for buffer object functions.
For all the extension entrypoints using the get_buffer() helper, they
wanted the same error handling. In some cases, the error was doing
the same error return whether target was a bad enum, or a user buffer
wasn't bound.
(Actually, GL_ARB_map_buffer_range doesn't specify the error for a zero
buffer being bound for MapBufferRange, though it does for
FlushMappedBufferRange. This appears to be an oversight).
Fixes piglit GL_ARB_copy_buffer/negative-bound-zero.
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit f20fb80a916d9f88dbc7efc43d4c31e038cb70c6)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=02962ea086abac01fdb9e4539db30e7c3bc0a4a4
Author: Carl Worth <cworth at cworth.org>
Date: Thu Feb 2 11:29:51 2012 -0800
glsl: Avoid ralloc_stealing a long-lived object to a short-lived parent
In commit 6ecee54a9aecc120cb68b02f7e14dcac86b9eca2 a call to
talloc_reference was replaced with a call to talloc_steal. This was in
preparation for moving to ralloc which doesn't support reference
counting.
The justification for talloc_steal within token_list_append in that
commit is that the tokens are being copied already. But the copies are
shallow, so this does not work.
Fortunately, the lifetime of these tokens is easy to understand. A
token list for "replacements" is created and stored in a hash table
when a function-like macro is defined. This list will live until the
macro is #undefed (if ever).
Meanwhile, a shallow copy of the list is created when the macro is
used and the list expanded. This copy is short-lived, so is unsuitable
as a new parent.
So we can just let the original, longer-lived owner continue to own
the underlying objects and things will work.
This fixes bug #45082:
"ralloc.c:78: get_header: Assertion `info->canary == 0x5A1106'
failed." when using a macro in GLSL
https://bugs.freedesktop.org/show_bug.cgi?id=45082
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
NOTE: This is a candidate for stable release branches.
(cherry picked from commit cd2e2187cb45accb13bf89ef297324332c46f379)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=358389fe5954c69eb5d75e8c0d0caa9c12cd492b
Author: Brian Paul <brianp at vmware.com>
Date: Tue Jan 31 18:24:07 2012 -0700
mesa: reference shared state in glPushAttrib(GL_TEXTURE_BIT)
This fixes a dangling texture object pointer bug hit via wglShareLists().
When we push the GL_TEXTURE_BIT state we may push references to the default
texture objects which are owned by the gl_shared_state object. We don't
want to accidentally delete that shared state while the attribute stack
references shared objects. So keep a reference to it.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <jfonseca at vmware.com>
(cherry picked from commit a1471e4877515e2ce4fcc129c4ce26f5c306b193)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ed8367d72e25069172a8b57c19ed35ed3ff8990
Author: Brian Paul <brianp at vmware.com>
Date: Tue Jan 31 18:23:03 2012 -0700
mesa: use new _mesa_reference_shared_state() function
This cleans up the reference counting of shared context state.
The next patch will use this to fix an actual bug.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <jfonseca at vmware.com>
(cherry picked from commit 361cd53a77dd48fbf2a0321446c0b7c07365bff9)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f723df005c2e66925dcb5aff4ab609d784d953d5
Author: Eric Anholt <eric at anholt.net>
Date: Wed Jan 25 14:13:13 2012 -0800
i965: Add a driconf option to force GLSL extension behavior to "warn".
This can be used to work around broken application behavior, like in
Unigine where it attempts to use texture arrays without declaring
either "#extension GL_EXT_texture_array : enable" or "#version 130".
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 642247883fb9e6dce9bad724f7f6503321e0ef6f)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=92d842c073e7f2afbe3ee2fbfb930bb6233a497b
Author: Eric Anholt <eric at anholt.net>
Date: Wed Jan 18 12:14:09 2012 -0800
mesa: Add a flag for forcing all GLSL extensions to "warn".
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit b9e27cc1426e3242a003fa5ae91fab330694009a)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b5e151ffae3ff50e9012243b7fcbbb60c3a0042
Author: Eric Anholt <eric at anholt.net>
Date: Fri Jan 27 12:59:24 2012 -0800
i965/vs: Avoid allocating registers in to the gen7 MRF hack region.
This is the corresponding fix to the previous one for the FS, but I
don't have a particular test for it.
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 9195191e50429d9cf25e6498f9fb108758ac2be6)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=20da01fecdd2379bd6df1407d1c344aa8ddd5c45
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Wed Jan 25 19:38:10 2012 -0800
swrast: Fix fixed-function fragment processing
On i965, _mesa_ir_link_shader is never called. As a consequence, the
current fragment program (ctx->FragmentProgram->_Current) exists but is
invalid because it has no instructions. Yet swrast continued to attempt to
use the empty program.
To avoid using the empty program, this patch 1) defines a new function,
_swrast_use_fragment_program, which checks if the current fragment program
exists and differs from the fixed function fragment program, and, when
appropriate, 2) replaces checks of the form
if (ctx->FragmentProgram->_Current == NULL)
with
if (_swrast_use_fragment_program(ctx))
Fixes the following oglconform regressions on i965/gen6:
api-fogcoord(basic.allCases.log)
api-mtexcoord(basic.allCases.log)
api-seccolor(basic.allCases.log)
api-texcoord(basic.allCases.log)
blend-separate(basic.allCases)
colorsum(basic.allCases.log)
The tests were ran with the GLXFBConfig:
visual x bf lv rg d st colorbuffer sr ax dp st accumbuffer ms cav
id dep cl sp sz l ci b ro r g b a F gb bf th cl r g b a ns b eat
----------------------------------------------------------------------------
0x021 24 tc 0 32 0 r y . 8 8 8 8 . . 0 24 8 0 0 0 0 0 0 None
(Note: I originally believed that the hunk in
_swrast_update_fragment_program was unnecessary. But it is required to fix
blend-separate.)
Note: This is a candidate for the 8.0 branch.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43327
Reveiwed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Ian Romanick <idr at freedesktop.org>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
(cherry picked from commit 1c0f1dd42a50464eeb81de4aad8eecf24b3d6c89)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=203ef2a12b8e8fa520decf9e9024329f4dc96996
Author: Eric Anholt <eric at anholt.net>
Date: Tue Jan 24 14:52:04 2012 -0800
mesa: Don't round-trip integer texture data through a floating point temp.
This was losing bits of precision. Fixes (with the previous commits):
piglit EXT_texture_integer/getteximage-clamping
piglit EXT_texture_integer/getteximage-clamping GL_ARB_texture_rg
oglc advanced.mipmap.upload
Regresses oglc negative.typeFormatMismatch.teximage from fail to
abort, because it's been hitting texstore for a format/type combo that
shouldn't happen.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 5f65598cc79eccd38bf7f95ab167ed62e575daf2)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=05ff4d209d67962c6f367a94dcf0045ea242d5c3
Author: Eric Anholt <eric at anholt.net>
Date: Tue Jan 24 14:48:56 2012 -0800
mesa: When unpacking signed integer pixel data, don't clamp to 0.
In the core, we always treat spans of int/uint data as uint, so this
extract function was truncating storage of integer pixel data to a n
int texture to (0, max_int) instead of (min_int, max_int). There is
probably missing code for handling truncation on conversion between
pixel formats, still, but this does improve things.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit dadbec1e90415f0744eb91e684bf9d7496f474c0)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c1ccb52c72e73ad657bc5b5d2cb04759953fd3ab
Author: Eric Anholt <eric at anholt.net>
Date: Tue Jan 24 14:16:59 2012 -0800
mesa: Add clamping for packing of integer data.
Mostly fixes piglit EXT_texture_integer/getteximage-clamping. The
remaining failure involves precision loss on storing of int32 texture
data (something I knew was an issue, but wasn't trying to test).
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 8b97bb02fb1a55a6b0fe558ea1eb97bb4dae0347)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=35af0909077b13ec198ca6b46101260a4c47a960
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jan 19 16:34:24 2012 -0800
mesa: Add missing format unpack for some integer texture formats.
This cut and paste is pretty awful. I'm tempted to do a lot of this
using preprocessor tricks for customizing the parameter type from a
template function, but that's just a different sort of hideous.
Fixes 8 Intel oglconform int-textures cases.
NOTE: This is a candidate for the 8.0 branch.
v2: Add alpha formats, too.
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit de24ccabd6494125e10017e0914b3298ea3791ea)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=80cd02f5176da3597e706941b74f0de1f69ea70c
Author: Eric Anholt <eric at anholt.net>
Date: Tue Jan 24 16:32:36 2012 -0800
i965: Don't allow rendering to non-GL_RED/RG/RGBA integer textures.
Fixes piglit EXT_texture_integer/fbo-blending.
(cherry picked from commit 3a8cf3357abb50d4ee11cfb801f965e3df7592fb)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0749290d69f4f79cf6af7ac6af56c6d71c1c4c46
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jan 19 17:23:25 2012 -0800
intel: Pass the gl_renderbuffer to render_target_supported() vtable method.
I'm going to want to go looking at it for an integer texture fix.
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 796f44d77906342e5912e7da6bdba1ba86bab9f0)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f62c8648d35a51f17bef08dab841a1d223f8f2c6
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jan 19 17:41:39 2012 -0800
intel: Make a renderbuffer wrapping a texture have the same _BaseFormat.
Otherwise, when you asked for the _BaseFormat of an rb wrapping a
GL_RGB texture, you got GL_RGBA because that's what we were storing
the texture data as.
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 7cac88679bb600f35694e91859c4682c04c32f7a)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=869728bd99ebc14e3b58f11e16e5c1b73916df6c
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jan 19 17:40:41 2012 -0800
intel: Simplify intel_renderbuffer_update_wrapper() by passing in the image.
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit b73f5df6483b2e37235b258f705944321ee617f5)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1100a19da8bd37aa9eb31aeb2dddeb1081c5da7f
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jan 19 17:32:55 2012 -0800
intel: Drop intel_wrap_miptree().
Most of this function was just calling
intel_renderbuffer_update_wrapper(), which was called immediately
afterwards in the only caller.
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 74484c5d411788c855cf91a2017d763d6a8fb4f2)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f811d501b6c254f7577fbca0cdafff8cb8ca4c2f
Author: Yuanhan Liu <yuanhan.liu at linux.intel.com>
Date: Fri Jan 20 07:48:52 2012 +0800
i965: fix inverted point sprite origin when rendering to FBO
When rendering to FBO, rendering is inverted. At the same time, we would
also make sure the point sprite origin is inverted. Or, we will get an
inverted result correspoinding to rendering to the default winsys FBO.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44613
NOTE: This is a candidate for stable release branches.
v2: add the simliar logic to ivb, too (comments from Ian)
simplify the logic operation (comments from Brian)
v3: pick a better comment from Eric
use != for the logic instead of ^ (comments from Ian)
Signed-off-by: Yuanhan Liu <yuanhan.liu at linux.intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit eaf360e5bffc5630789367020252cd12fe586177)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ecd0d460707336abfc593f9113a45e9914587a3e
Author: Eric Anholt <eric at anholt.net>
Date: Fri Jan 27 12:54:11 2012 -0800
i965/fs: Fix rendering corruption in unigine tropics.
We were allocating registers into the MRF hack region, resulting in
sparkly renering in a few of the scenes. We could do better
allocation by making an MRF class, having MRFs conflict with the
corresponding GRFs, and tracking the live intervals of the "MRF"s and
setting up the conflicts. But this is way easier for the moment.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit e910241e9754b6e673ed0fc3133c8b1de56e76c7)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf4a7c41f6f2594ce4e8841ae1b268568f4ad1a7
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Feb 2 16:32:45 2012 -0700
intel: Avoid divide by zero for very small linear blits
If size is small (such as 1),
pitch = ROUND_DOWN_TO(MIN2(size, (1 << 15) - 1), 4);
makes pitch = 0. Then
height = size / pitch;
causes a division-by-zero exception. If pitch is zero, set height to
1 and avoid the division.
This fixes piglit's bin/getteximage-formats test and glean's
bufferObject test.
NOTE: This is a candidate for the 8.0 release branch.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44971
(cherry picked from commit d59466279e45a1e9c3f9081f72fedbdf961afbe1)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=74a5f030664a9509664c91346f2cde7ed06cd3c9
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Feb 1 11:37:54 2012 -0700
intel: Remove num_mapped_regions assertion from _intel_batchbuffer_flush
There are cases where a buffer can be mapped while another buffer is
flushed. This can happen in the CopyPixels meta-op path for piglit's
fbo-mipmap-copypix. After some discussion with Eric, it seems this
assertion is no longer necessary, and it has always been too strict.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43328
Cc: Eric Anholt <eric at anholt.net>
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>
(cherry picked from commit 65b096aeddd9b45ca038f44cc9adfff86c8c48b2)
More information about the mesa-commit
mailing list