Mesa (7.10): 23 new commits
Ian Romanick
idr at kemper.freedesktop.org
Wed Jun 1 00:47:32 UTC 2011
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d08ca20ba26f5712556f54a6850ad1016c77be2
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 15 20:00:38 2011 -0700
Revert "intel: Add spans code for the ARB_texture_rg support."
This reverts what remains of commit
28bab24e1698843e27d27204a1117066e7ffeabb. It was garbage, trying to
use a MESA_FORMAT enum as a preprocessor token, and I don't know how I
thought it was even tested.
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit bc57df03568e9e1f05b9d29df8e3a7fe58d5a196)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd9a093086f4af147bd7619167d492c3cd941f98
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 15 19:58:21 2011 -0700
intel: Use mesa core's R8, RG88, R16, RG1616 RB accessors.
Fixes:
ARB_texture_rg/fbo-alphatest-formats
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 73f07004811a2522b45179c74cd9a6d6d2e5c578)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c7e0c21d42f6b0e8f28b1dd4d4b0296b829502c5
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 15 19:55:38 2011 -0700
swrast: Don't try to adjust_colors for <8bpc when handling R16, RG1616.
The GL_RED and GL_RG were tricking this code into executing, but it's
totally unprepared for a 16-bit channel and just rescaled the values
down to 0. We don't have anything with <8bit channels alongside >8bit
channels, so disabling it should be safe.
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 2b624634dda23d3b94045fb07aea558df39b48ff)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc8599cdf1a7c9a23f7591c11d67976c0f794e3e
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 15 19:11:53 2011 -0700
mesa: Add renderbuffer accessors for R8/RG88/R16/RG1616.
This will replace the current (broken by trying to use an enum in the
preprocessor) spantmp2.h support I wrote for the intel driver.
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit f0471d904cf5c03ecf2528268a116e4f147cd3c1)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=25134f877bf0321fbd1f2e2137ab1b7c60a956de
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 15 13:09:21 2011 -0700
mesa: Use _mesa_get_format_bytes to refactor out the RB get_row_*
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit a52803e1087749bfa571c29fc4c1a73fa9b7bf8e)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=27fb522faac031e04bf980fdfad5a2243a4c4889
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 15 12:58:17 2011 -0700
mesa: Use _mesa_get_format_bytes to refactor out the RB get_pointer_*
This is a squash of the following two commits:
mesa: Use _mesa_get_format_bytes to refactor out the RB get_pointer_*
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 6ab9889a2704304a45b4da5b28840af08f6f42c5)
mesa: Fix return type of _mesa_get_format_bytes() (#37351)
Despite that negative values aren't sensible here, making this unsigned
is dangerous. Consider get_pointer_generic, which computes a value of
the form:
void *base + (int x * int stride + int y) * unsigned bpp
The usual arithmetic conversions will coerce the (x*stride + y)
subexpression to unsigned. Since stride can be negative, this is
disastrous.
Fixes at least the following piglit tests on Ironlake:
fbo/fbo-blit-d24s8
spec/ARB_depth_texture/fbo-clear-formats
spec/EXT_packed_depth_stencil/fbo-clear-formats
NOTE: This is a candidate for the 7.10 branch.
Reviewed-by: Chad Versace <chad.versace at intel.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
(cherry picked from commit e8b1c6d6f55f5be3bef25084fdd8b6127517e137)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3436f5d82fb55c0bcee215c204d8d5ff6419a684
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 15 11:58:58 2011 -0700
intel: Use Mesa core's renderbuffer accessors for depth.
Since we're using GTT mappings now (no manual detiling), there's
really nothing special to accessing these buffers, other than needing
the new RowStride field of gl_renderbuffer to accomodate padding.
Reduces the driver size by 2.7kb, and improves glean depthStencil
performance 3-10x (!)
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 0778fdb002b000e241b042ad65b6da6dd8480454)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=77be3db45ca21d65a46060b8167aa99ec4ac89bf
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 15 11:47:35 2011 -0700
mesa: Add a function to set up the default renderbuffer accessors.
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 9f164823c79bf933bf88217894129dc2eae0cbed)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d58f70e5608186536015ae2f17e79b6d7299a3b
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 15 11:37:23 2011 -0700
mesa: Add a gl_renderbuffer.RowStride field like textures have.
This will allow some drivers to reuse the core renderbuffer.c get/put
row functions in place of using the spantmp.h macros. Note that
unlike textures, we use a signed integer here to allow for handling
FBO orientation.
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 155200c15431f8364114d9a37ec527af81c773a5)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb8336f82c42a71c68cf26ba4adbc65f470322e3
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 15 17:50:41 2011 -0700
swrast: Don't assert against glReadPixels of GL_RED and GL_RG.
Everything appears to already be in place for this. Fixes aborts in:
ARB_texture_rg/fbo-alphatest-formats-float
ARB_texture_rg/fbo-blending-formats-float.
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 641dd899bd485c194c20a871633797a47e4f912d)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d264ed0b48e1c14260c2429af62549b4b327852d
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 15 20:28:51 2011 -0700
intel: Use _mesa_base_tex_format for FBO texture attachments.
The _mesa_base_fbo_format variant doesn't handle some texture
internalformats, such as "3".
Fixes:
fbo-blending-formats.
fbo-alphatest-formats
EXT_texture_sRGB/fbo-alphatest-formats
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit cd3568c329cff16333455fa2228a7c27b261cf05)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e78908d1521dcc744a17d13eb3a716cdb3b8d2b3
Author: Eric Anholt <eric at anholt.net>
Date: Sat Apr 9 14:57:17 2011 -1000
glsl: Perform type checking on "^^" operands.
We were letting any old operand through, which generally resulted in
assertion failures later.
Fixes array-logical-xor.vert.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Chad Versace <chad.versace at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 756c262756b2434efeb2c2a33a180fda0757a6e5)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d779672fafe4680b20fa5fb81f1e6ec3d553f49
Author: Eric Anholt <eric at anholt.net>
Date: Sat Apr 9 12:54:34 2011 -1000
glsl: When we've emitted a semantic error for ==, return a bool constant.
This prevents later errors (including an assertion failure) from
cascading the failure.
Fixes invalid-equality-04.vert.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33303
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Chad Versace <chad.versace at intel.com>
(cherry picked from commit 175829f1a8ab0df7594131cc569462e45c1974ec)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ab66b7d0b6165964d56dea3886ec36d4deed816
Author: Eric Anholt <eric at anholt.net>
Date: Sat Apr 9 10:27:02 2011 -1000
glsl: Semantically check the RHS of `||' even when short-circuiting.
We just do the AST-to-HIR processing, and only push the instructions
if needed in the constant false case.
Fixes glslparsertest/glsl2/logic-02.frag
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Chad Versace <chad.versace at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 9e04b190b5f59c5b375645f5756a6edd98a7f90c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b47825e626f530a7910e9c2e5aa30df7a0c8bd71
Author: Eric Anholt <eric at anholt.net>
Date: Sat Apr 9 10:27:02 2011 -1000
glsl: Semantically check the RHS of `&&' even when short-circuiting.
We just do the AST-to-HIR processing, and only push the instructions
if needed in the constant true case.
Fixes glslparsertest/glsl2/logic-01.frag
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Chad Versace <chad.versace at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 7ec0c9789669ac88fcdd66c562e6d58281b477ce)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7609af4228bd5dea5008c8c64b962e13021bf889
Author: Eric Anholt <eric at anholt.net>
Date: Sat Apr 9 15:59:20 2011 -1000
glsl: Avoid cascading errors when looking for a scalar boolean and failing.
By always using a boolean, we should generally avoid further
complaints. The failure case I see is logic_not, where the user might
understandably make the mistake of using `!' on a boolean vector (like
a piglit case did recently!), and then get a further complaint that
the new boolean type doesn't match the bvec it gets assigned to.
Fixes invalid-logic-not-06.vert (assertion failure when the bad type
ends up in an expression and ir_constant_expression gets angry).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33314
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 01822706ec2c2501a2cd2431a90c56b334b79a5c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef96b6148b317bcde7cafa2f0125a1601f4a96a3
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Mon Apr 11 11:00:03 2011 -0700
i965: Never enable the GS on Gen6.
Prior to Gen6, we use the GS for breaking down quads, quad-strips,
and line loops. On Gen6, earlier stages already take care of this,
so we never need the GS.
Since this code is likely completely untested, remove it for now.
We can write new code when enabling real geometry shaders.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit 35b3f597bd1729da4483857cc0e88e81fb2a2419)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d9becfb1feca6aea6b64ea1e2475cad575a8301
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Tue Jan 4 14:34:55 2011 -0800
i965: Rename various gen6 #defines to match the documentation.
This should make it easier to cross-reference the code and hardware
documentation, as well as clear up any confusion on whether constants
like CMD_3D_WM_STATE mean WM_STATE (pre-gen6) or 3DSTATE_WM (gen6+).
This does not rename any pre-gen6 defines.
(cherry picked from commit e31defc825ee94f1d1092e277954abad7097c552)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=157f4a9d28c09dceea335ba7e85e510a479199e5
Author: Hans de Goede <hdegoede at redhat.com>
Date: Sun Apr 10 22:21:03 2011 +0200
texstore: fix regression stricter check for memcpy path for unorm88 and unorm1616
According to https://bugs.freedesktop.org/show_bug.cgi?id=34280
commit 5d1387b2da3626326410804026f8b92f1a121fdc causes the font corruption
problems people have been seeing under various apps and gnome-shell on r200
cards.
This commit changed (loosened) the check for using the memcpy path in the
former al88 / al1616 texstore functions, which are now also used to
store rg texures. This patch restores the old strict check in case of
al textures. I've no idea why this fixes things, since I don't know the
code in question at all. But after seeing the bisect in bfdo34280 point
to this commit, I gave this fix a try and it fixes the font issues seen on
r200 cards.
[airlied:
r200 has no native working A8, so it does an internal storage format of AL88
however srcFormat == internalFormat == ALPHA when we get to this point,
so it copies, but it wants to store into an AL88 not ALPHA so fails,
I'll also push a piglit test for this on r200].
Many thanks to Nicolas Kaiser who did all the hard work of tracking this down!
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit e338a1b0cea94f8c57968b01eebd795c6c8ce74e)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f8729859eeaafcbb4fee0f22989afb223a43d6f
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Apr 8 18:06:35 2011 -0700
i965: Remove hint_gs_always and resulting dead code
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit a7fa203f0d645bdb06b3cb345ab1a0ccf4e62fe3)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=db17691e2845b5013d16fd5235aed13a1aba5b81
Author: Henri Verbeet <hverbeet at gmail.com>
Date: Thu Apr 7 23:48:28 2011 +0200
glx: Only remove the glx_display from the list after it's destroyed.
Signed-off-by: Henri Verbeet <hverbeet at gmail.com>
(cherry picked from commit a26121f37530619610a78a5fbe5ef87e44047fda)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=43ad25baa7c87dddea6e132e86506c8c5232565a
Author: Henri Verbeet <hverbeet at gmail.com>
Date: Thu Apr 7 23:48:28 2011 +0200
glx: Destroy dri2Hash on DRI2 display destruction.
Signed-off-by: Henri Verbeet <hverbeet at gmail.com>
(cherry picked from commit a75de67c51e9124a7c3846b4110552ea28c60349)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e5da5894d402fcbb5a3f8b71e1a8e7db90fe96b
Author: Henri Verbeet <hverbeet at gmail.com>
Date: Thu Apr 7 23:48:28 2011 +0200
mesa: Also update the color draw buffer if it's explicitly set to GL_NONE.
NOTE: This is a candidate for the 7.10 branch.
Signed-off-by: Henri Verbeet <hverbeet at gmail.com>
(cherry picked from commit 158d42c8b08411d761fa40299f3f29027ad3905f)
More information about the mesa-commit
mailing list