mesa-dpm: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits:
commit eb2d05d5fcc04bee0c3557e1cea24fab2df231d9
Merge: 4717670 368d3a2
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 11 20:19:17 2011 +0100
merge patched-debian-unstable into debian-unstable
commit 368d3a29c759c1b8ec6486f7e0642f84b3cec736
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 11 17:36:34 2011 +0100
Fix talloc linking.
It seems impossible to mix static libraries with dynamic libraries, at
least under the “foo.a bar.a -lbaz” form. Also, no combination of
pkg-config/--libs/--static/talloc seems to return the wanted
“/usr/lib/libtalloc.a”, one only gets “-ltalloc”.
So hardcode the path for now, using another variable. This way,
$(TALLOC_LIBS) might be added to other places where dynamic variables
are OK, and we don't break that.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 71ad4af6ddbcf22d9b0db0456a765f79418e266b
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 11 17:30:52 2011 +0100
Fix FTBFS in gallium on non-Linux.
Closes: #585618 (http://bugs.debian.org/585618).
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 21caf38b6913f631ebdc0d429a8991bee65b7cda
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 11 17:10:16 2011 +0100
Fix FTBFS on GNU/kFreeBSD.
Some parts need to be enabled on GNU/kFreeBSD.
Closes: #524690 (http://bugs.debian.org/524690).
Signed-off-by: Aurelien Jarno <aurel32@debian.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit ee0a2e318d107d0426b06b147f99e1061fa9a508
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 11 17:09:31 2011 +0100
Fix build on GNU/Hurd.
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 325b3b06eb69aa515acc4625b3c344285cc6fe62
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 11 17:06:18 2011 +0100
Fix libOSMesa versioning.
Revert accidental SONAME bump.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 2cb261c895d73ec6abe4ba4c4484ec4b6909d292
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 11 17:00:55 2011 +0100
Define USE_IEEE on m68k and s390.
Closes: #349437 (http://bugs.debian.org/349437).
Signed-off-by: David Nusinow <dnusinow@debian.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 4717670f0d53676681d7c057742acde4d20f524f
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 11 16:45:59 2011 +0100
Import Debian packaging (except patches).
Taken from the preparation of the upcoming 7.10-4 upload.
commit 09ee53a02c9b0f01d9fc07ff0cb62809215f8197
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 11 20:17:40 2011 +0100
Initialize git-dpm
commit 07ac1cdffbbccbc3a0446a77b8331693f5811bd0
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 11 19:54:19 2011 +0100
Import mesa_7.10.orig.tar.gz
commit 7a3f869a475ff9c605f5a29db08768bd5fc4fb34
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Jan 7 14:09:03 2011 -0800
mesa: set version string to 7.10
commit c18447bf97d20deb570216045d4ba5ec9c251392
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Jan 7 14:07:22 2011 -0800
docs: Update 7.10 release notes
commit 5768445eafa9665d7607a98a4f6eb3c65e699833
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Jan 7 13:38:26 2011 -0800
docs: Import 7.9.1 release notes from 7.9 branch
(cherry picked from commit 46a360b26a4d5e9ff8e00388605799ed60849a03)
commit fbd98eae6a576205bdd54abaf4edff523108c8f3
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Fri Jan 7 03:10:50 2011 -0500
r600c: fix up SQ setup in blit code for Ontario/NI
commit 14950c50e159f249bbf761821b5a73c530eba333
Author: Marek Olšák <maraeo@gmail.com>
Date: Tue Jan 4 21:54:23 2011 +0100
r300/compiler: disable the rename_regs pass for loops
This workaround fixes rendering of kwin thumbnails.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit 8543902bfbdfc15c39525bd99bee22e2f2126e74)
commit ca8e49f303fc81270b1f14c21c9c09682f24c484
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Tue Jan 4 15:37:12 2011 -0500
r600g: support up to 64 shader constants
From the r600 ISA:
Each ALU clause can lock up to four sets of constants
into the constant cache. Each set (one cache line) is
16 128-bit constants. These are split into two groups.
Each group can be from a different constant buffer
(out of 16 buffers). Each group of two constants consists
of either [Line] and [Line+1] or [line + loop_ctr]
and [line + loop_ctr +1].
For supporting more than 64 constants, we need to
break the code into multiple ALU clauses based
on what sets of constants are needed in that clause.
Note: This is a candidate for the 7.10 branch.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
commit f2f89f7b180af664459d88dd272d794722daa7cf
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Thu Jan 6 18:40:17 2011 -0500
r600c: add support for NI asics
commit 3285d1dc572c1ffa077641c0f2f6ff9ba4d1bdf5
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Thu Jan 6 18:17:18 2011 -0500
r600g: add support for NI (northern islands) asics
This adds support for barts, turks, and caicos.
commit 9ba827100a2d49ca839c7c8a1d0dec258b5c7ecd
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Dec 24 17:33:41 2010 +1000
r600g: hack around property unknown issues.
should fix https://bugs.freedesktop.org/show_bug.cgi?id=32619
Need to add proper support for properties later.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 002ce07abe5581d98b72ea30dc5982fe6de0db3b
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Wed Dec 22 01:30:41 2010 -0500
r600g: remove useless switch statements
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
commit 949c24862afcaf50b2c204f88582099c60fdbc51
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Dec 22 14:54:17 2010 +1000
r600g: fix evergreen segfaults.
evergreen was crashing running even gears here.
This is a 7.10 candidate if its broken the same.
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 34c58f6d469242616579e95df9a5909a9e177988
Author: Jerome Glisse <jglisse@redhat.com>
Date: Tue Dec 21 10:49:53 2010 -0500
r600g: avoid segfault
Candidates 7.10
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
commit ece71d605bdc2f1196599bd26ad00e06126fe2c3
Author: Jerome Glisse <jglisse@redhat.com>
Date: Mon Dec 20 15:30:42 2010 -0500
r600g: properly unset vertex buffer
Fix bug http://bugs.freedesktop.org/show_bug.cgi?id=32455
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
commit 0fc205152c0706cff0eb9835e6a249376581366d
Author: Jerome Glisse <jglisse@redhat.com>
Date: Wed Dec 15 12:07:09 2010 -0500
r600g: need to reference upload buffer as the might still live accross flush
Can't get away from referencing upload buffer as after flush a vertex buffer
using the upload buffer might still be active. Likely need to simplify the
pipe_refence a bit so we don't waste so much cpu time in it.
candidates for 7.10 branch
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
commit 44346148446bc0cb89e3f003f249a98721bec6f4
Author: Jerome Glisse <jglisse@redhat.com>
Date: Tue Dec 14 13:50:46 2010 -0500
r600g: fix segfault when translating vertex buffer
Note the support for non float vertex draw likely regressed need to
find what we want to do there.
candidates for 7.10 branches
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
commit e7b12f2a0e88e754c68faf7c0e034f7bfc0775f1
Author: Jerome Glisse <jglisse@redhat.com>
Date: Fri Dec 10 11:17:27 2010 -0500
r600g: fix bo size when creating bo from handle
Spoted by Alex Diomin
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
commit b11623a5df731cc49f97649a4bb86c0d3b097f93
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Jan 4 16:09:00 2011 -0800
glsl: Allow less restrictive uses of sampler array indexing in GLSL <= 1.20
GLSL 1.10 and 1.20 allow any sort of sampler array indexing.
Restrictions were added in GLSL 1.30. Commit f0f2ec4d added support
for the 1.30 restrictions, but it broke some valid 1.10/1.20 shaders.
This changes the error to a warning in GLSL 1.10, GLSL 1.20, and GLSL
ES 1.00.
There are some spurious whitespace changes in this commit. I changed
the layout (and wording) of the error message so that all three cases
would be similar. The 1.10/1.20 and 1.30 text is the same. The only
difference is that one is an error, and the other is a warning. The
GLSL ES 1.00 wording is similar but not quite the same.
Fixes piglit test
spec/glsl-1.10/compiler/constant-expressions/sampler-array-index-02.frag
and bugzilla #32374.
commit bbf7cc1f2a13c89e5923e2155a8f9e0326714019
Author: Zou Nan hai <nanhai.zou@intel.com>
Date: Thu Jan 6 11:36:23 2011 +0800
i965: skip too small size mipmap
this fixes doom3 crash.
commit 4e8f123f14e4a5bbd47c8cf7ec0c02d4ee6efd2d
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Wed Jan 5 13:32:40 2011 +0800
i965: use BLT to clear buffer if possible on Sandybridge
This fixes https://bugs.freedesktop.org/show_bug.cgi?id=32713
(cherry picked from commit 266d8eed6927650a55974a293959fe21073030bb)
commit f5c13469320032fe894a95ce493fa64441aa341f
Author: Chia-I Wu <olv@lunarg.com>
Date: Tue Jan 4 01:05:22 2011 +0800
autoconf: Fix --with-driver=xlib --enable-openvg.
st/egl should be enabled with --enable-openvg even the driver is xlib or
osmesa. Also, GLX_DIRECT_RENDERING should not be defined because libdrm
is not checked.
(cherry picked from commit ada9c78c29ef11720d464211c098b740f8aa11a4)
commit ebcb7f27e5950041478d92c82f0f2419b35cdbd2
Author: Chia-I Wu <olv@lunarg.com>
Date: Tue Jan 4 00:53:19 2011 +0800
docs: Add an example for EGL_DRIVERS_PATH.
EGL_DRIVERS_PATH can be set to test EGL without installation.
(cherry picked from commit cba77869547f8edb1c1fdafcf457bccc4097042b)
commit 52586ceb2b408e21e4d30d354a77732e7ed7ed10
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 4 10:00:51 2011 -0800
intel: When validating an FBO's combined depth/stencil, use the given FBO.
We were looking at the current draw buffer instead to see whether the
depth/stencil combination matched. So you'd get told your framebuffer
was complete, until you bound it and went to draw and we decided that
it was incomplete.
(cherry picked from commit b7b2791c6bea6ad0db76fdad9a217aa1efffea93)
commit 438fc337d4b242a1bc7134e7e0f06d448ea6331c
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 4 09:57:21 2011 -0800
intel: Fix segfaults from trying to use _ColorDrawBuffers in FBO validation.
The _ColorDrawBuffers is a piece of computed state that gets for the
current draw/read buffers at _mesa_update_state time. However, this
function actually gets used for non-current draw/read buffers when
checking if an FBO is complete from the driver's perspective. So,
instead of trying to just look at the attachment points that are
currently referenced by glDrawBuffers, look at all attachment points
to see if they're driver-supported formats. This appears to actually
be more in line with the intent of the spec, too.
Fixes a segfault in my upcoming fbo-clear-formats piglit test, and
hopefully bug #30278
(cherry picked from commit 0ea49380e20bdf76cd0e434d3d431ca9f526f1f1)
commit 7b6c5804f01dba8540aa9bd57a5ac963e4074264
Author: Eric Anholt <eric@anholt.net>
Date: Thu Dec 9 17:08:31 2010 -0800
intel: Add a couple of helper functions to reduce rb code duplication.
(cherry picked from commit e339b669a14f37698b842c0c51c1f5e4001ef12f)
commit 29bcf0a940e245a6497e51ff8e243ef41623f520
Author: Eric Anholt <eric@anholt.net>
Date: Thu Dec 9 17:30:41 2010 -0800
intel: Add spans code for the ARB_texture_rg support.
This starts spantmp2.h down the path of using MESA_FORMAT_* for
specifying the format instead of the crazy GL format/type combo.
(cherry picked from commit 28bab24e1698843e27d27204a1117066e7ffeabb)
commit fa61cb36095bff78b59711df19572189fed6cec2
Author: Eric Anholt <eric@anholt.net>
Date: Sun Jan 2 19:29:20 2011 -0800
intel: Use tri clears when we don't know how to blit clear the format.
Bug #32207. Fixes ARB_texture_rg/fbo-clear-formats (see my
fbo-clear-formats piglit branch currently)
(cherry picked from commit 30fef21aa34667d332669f1445de74b49994eb0e)
commit db4e1c44b27bbf90706cf90887aa52dfebae4981
Author: Eric Anholt <eric@anholt.net>
Date: Sun Jan 2 17:04:57 2011 -0800
intel: Handle forced swrast clears before other clear bits.
Fixes a potential segfault on a non-native depthbuffer, and possible
accidental swrast fallback on extra color buffers.
(cherry picked from commit 94ed481131e4f5ba2c83fe7f3b12715661660133)
commit d4ae5f3411cc43657f7ecf1037bcccb2844adfd5
Author: Eric Anholt <eric@anholt.net>
Date: Sat Dec 25 08:57:22 2010 -0800
intel: Only do frame throttling at glFlush time when using frontbuffer.
This is the hack for input interactivity of frontbuffer rendering
(like we do for backbuffer at intelDRI2Flush()) by waiting for the n-2
frame to complete before starting a new one. However, for an
application doing multiple contexts or regular rebinding of a single
context, this would end up lockstepping the CPU to the GPU because
every unbind was considered the end of a frame.
Improves WOW performance on my Ironlake by 48.8% (+/- 2.3%, n=5)
(cherry picked from commit b01b73c482474609aceb6bb13b083e96c06ba353)
commit 1feecbdb00cc838be8c7de0396f8a82707b6f6e8
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Tue Jan 4 13:46:13 2011 +0800
i965: Fix provoking vertex select in clip state for sandybridge
Triangle fan provoking vertex for first convention should be
'vertex 1' in sandybridge clip state.
Partly fix glean/clipFlat case
(cherry picked from commit 9977297ad9bc0e816810bd3a39d89e5c1cffff72)
commit 8847205976c73f724d7383577d4f31007ba3aefe
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Tue Jan 4 15:25:43 2011 +0800
i965: Use last vertex convention for quad provoking vertex on sandybridge
Until we know how hw converts quads to polygon in beginning of
3D pipeline, for now unconditionally use last vertex convention.
Fix glean/clipFlat case.
(cherry picked from commit bea6539abff17f39c822ac9c1c94f8249c396b18)
commit 8604d91ae45d81e517ad5daab617d1474a6e7248
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 28 17:19:10 2010 -0800
i965: Do lowering of array indexing of a vector in the FS.
Fixes a regression in ember since switching to the native FS backend,
and the new piglit tests glsl-fs-vec4-indexing-{2,3} for catching this.
(cherry picked from commit df4d83dca4618eb7077637865763d3e9ab750d11)
commit bba89b379344d3057b8fab65e43cb1d92c6966f5
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 28 13:55:14 2010 -0800
i965: Fix regression in FS comparisons on original gen4 due to gen6 changes.
Fixes 26 piglit cases on my GM965.
(cherry picked from commit 54df8e48bcceacbfa468d5237f2981b26493df29)
commit f4f3274ba3720eb08d555d43a89494182202ff73
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 27 21:08:59 2010 -0800
i965: Factor out the ir comparision to BRW_CONDITIONAL_* code.
(cherry picked from commit 74dffb39c3434b590b36833905f2b12a6e3477e9)
commit 7b1200901a9537c8b3b8d614b01d7770989d5b9f
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 13 15:18:13 2010 -0800
i965: Improve the hacks for ARB_fp scalar^scalar POW on gen6.
This is still awful, but my ability to care about reworking the old
backend so we can just get a temporary value into a POW is awfully low
since the new backend does this all sensibly.
Fixes:
fp1-LIT test 1
fp1-LIT test 3 (case x < 0)
fp1-POW test (exponentiation)
fp-lit-mask
(cherry picked from commit d88aa6fe3e9e08af332a900c69bf2bf5c4420e90)
commit 9dfa27c92492b667bf3bd23b1da7875597ebbe72
Author: Tom Stellard <tstellar@gmail.com>
Date: Tue Jan 4 10:53:49 2011 -0800
r300/compiler: Fix black terrain in Civ4
rc_inst_can_use_presub() wasn't checking for too many RGB sources in
Alpha instructions or too many Alpha sources in RGB instructions.
(cherry picked from commit e96e86d07be86ce12628d750ff686d6aea919fff)
commit b71bff0100d33ebcf7bce4e6a3abef53461ecd2d
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon Dec 27 15:44:52 2010 -0800
i965: Internally enable GL_NV_blend_square on ES2.
Hopefully should fix bug #32520.
(cherry picked from commit 6bb1e4541eb707d525163987b167bd974c87067e)
commit 8cfce0c6430e554bff8425adbe7f9d1cb5018196
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon Dec 27 00:40:26 2010 -0800
i965: Flatten if-statements beyond depth 16 on pre-gen6.
Gen4 and Gen5 hardware can have a maximum supported nesting depth of 16.
Previously, shaders with control flow nested 17 levels deep would
cause a driver assertion or segmentation fault.
Gen6 (Sandybridge) hardware no longer has this restriction.
Fixes fd.o bug #31967.
(cherry picked from commit 634a7dce9c1d9e4a8576ff8197c8adaea7e9ddd1)
commit 9d3573c905298f2e5c4d60f0a967d14923148ad6
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon Dec 27 00:22:38 2010 -0800
glsl: Support if-flattening beyond a given maximum nesting depth.
This adds a new optional max_depth parameter (defaulting to 0) to
lower_if_to_cond_assign, and makes the pass only flatten if-statements
nested deeper than that.
By default, all if-statements will be flattened, just like before.
This patch also renames do_if_to_cond_assign to lower_if_to_cond_assign,
to match the new naming conventions.
(cherry picked from commit 9ac6a9b2fa45debac63f2e2b20d78c4776d06e37)
commit 8d2c910e66219ae937bf33402c1815b06217ec71
Author: Marek Olšák <maraeo@gmail.com>
Date: Mon Nov 29 05:24:18 2010 +0100
mesa: fix texel store functions for some float formats
These are copy-paste errors obviously.
(cherry picked from commit bf7b6f60aea3caa12c858271af167387fc0cfa4e)
commit f0c2420917d56bf8684fdc940ee60a69c14a1702
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Jan 4 09:43:44 2011 -0800
Refresh autogenerated file builtin_function.cpp.
See also a954dbeb.
commit 83b39afc4642d4e8d4862b6b9e11c4d96cc0fc35
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Fri Dec 17 19:25:37 2010 -0800
glsl/builtins: Compute the correct value for smoothstep(vec, vec, vec).
These mistakenly computed 't' instead of t * t * (3.0 - 2.0 * t).
Also, properly vectorize the smoothstep(float, float, vec) variants.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit d7423a653175352c5e2017f1de647bc7ef5ede43)
commit adb49457c68b925bcc6f05587f11a0c64dae3942
Author: Brian Paul <brianp@vmware.com>
Date: Tue Jan 4 08:00:33 2011 -0700
st/mesa: fix renderbuffer pointer check in st_Clear()
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=30694
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit efbd33aff93d875af95d40db018b7911a3f87d02)
commit 9da0e20e467b996ead83497242596891c4f7b7a8
Author: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu Dec 16 17:40:00 2010 -0800
Remove OES_compressed_paletted_texture from the ES2 extension list.
We don't support it.
(cherry picked from commit d0f8eea9a06d8268a21ac58b134964a602f9594e)
commit 07342c84a91a1e1ad04de8b087b97369e96ad932
Author: Brian Paul <brianp@vmware.com>
Date: Mon Dec 13 08:41:08 2010 -0700
glsl: new glsl_strtod() wrapper to fix decimal point interpretation
We always want to use '.' as the decimal point.
See http://bugs.freedesktop.org/show_bug.cgi?id=24531
NOTE: this is a candidate for the 7.10 branch.
(cherry picked from commit bb10e081c8ddc452bca44ba583f239219a5b9372)
commit 3501fd85942dc905de53710e3a57f16641e4e70d
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Dec 13 15:42:46 2010 -0800
ir_to_mesa: Don't generate swizzles for record derefs of non-scalar/vectors
This is the same as what the array dereference handler does.
Fixes piglit test glsl-link-struct-array (bugzilla #31648).
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit 2d577ee730c30caacf711babde6542766aa0b655)
commit 4febfee3b77faa8abbcc152896d76de30043c823
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Dec 13 15:16:39 2010 -0800
linker: Allow built-in arrays to have different sizes between shader stages
Fixes pitlit test glsl-link-varying-TexCoord (bugzilla #31650).
(cherry picked from commit cb2b547a4771ddf56975ede566dbf3a8f5389689)
commit d3fa3c60f2e12915813eabbbeecc5976d749a9dc
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Dec 10 15:48:15 2010 -0800
glsl: Inherrit type of declared variable from initializer after processing assignment
do_assignment may apply implicit conversions to coerce the base type
of initializer to the base type of the variable being declared. Fixes
piglit test glsl-implicit-conversion-02 (bugzilla #32287). This
probably also fixes bugzilla #32273.
NOTE: This is a candidate for the 7.9 branch and the 7.10 branch.
(cherry picked from commit d7f27e2e76eac9bc2ee0fa36f52542fdcb9563dd)
commit 4ad4c700bf87dfcb4ef62154964302d4bf148505
Author: Henri Verbeet <hverbeet@gmail.com>
Date: Wed Dec 22 08:28:39 2010 +0100
st/mesa: Handle wrapped depth buffers in st_copy_texsubimage().
(cherry picked from commit 59051ad44310d7f744fcb0706326564990b554dd)
commit aa196d047c2d42835f3f6f25ac304b312f33f4f9
Author: Fredrik Höglund <fredrik@kde.org>
Date: Wed Dec 15 20:00:42 2010 +0100
r600g: fix pow(0, 0) evaluating to NaN
We have to use the non-IEEE compliant version of MUL here, since
log2(0) is -inf, and 0 * -inf is NaN in IEEE arithmetic.
candidates for 7.10 branch
commit 747279c21cabef8c55842d5b8ca04f0f63e53c2d
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Sun Dec 12 22:44:53 2010 -0500
r600g: fix rendering with a vertex attrib having a zero stride
The hardware supports zero stride just fine. This is a port
of 2af8a1983180fc0168c1e0e53bcc69ee3d684ea4 from r300g.
NOTE: This is a candidate for both the 7.9 and 7.10 branches.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
commit 0092793735b9a5da6d5c02d1e4582967cd2e510c
Author: richard <richard@richard-desktop.(none)>
Date: Thu Dec 16 15:52:55 2010 -0500
r600c : inline vertex format is not updated in an app, switch to use vfetch constants. For the 7.9 and 7.10 branches as well.
commit 96685a662f5f3e980895fa8589fd486903852537
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Tue Dec 28 11:03:45 2010 +0800
i965: Fix occlusion query on sandybridge
Clear target query buffer fixed occlusion query on sandybridge.
https://bugs.freedesktop.org/show_bug.cgi?id=32167
(cherry picked from commit 689aca782216d2666486dea02206cbc9c4162e0d)
commit 7e3c1f221a30284c79362a2bcb6b4a4910dce134
Author: Marek Olšák <maraeo@gmail.com>
Date: Mon Dec 27 16:15:24 2010 +0100
r300g: mark vertex arrays as dirty after a buffer_offset change
We shouldn't hit this bug in theory.
NOTE: This is a candidate for the 7.10 branch.
(cherry picked from commit d9b84017e0000b4740bf3318f54a3a5e31858f4f)
commit 1e58915062afa642b8f2d55c5ad590b65ffffecc
Author: Marek Olšák <maraeo@gmail.com>
Date: Tue Dec 28 19:41:00 2010 +0100
r300g/swtcl: re-enable LLVM
Based on a patch from Drill <drill87@gmail.com>.
NOTE: This is a candidate for the 7.10 branch.
(cherry picked from commit 88550083b3857184445075e70fed8b2eed4952a1)
Conflicts:
src/gallium/drivers/r300/r300_context.c
commit 1ca240ec2d81ccf3e6a55b736b6aa11959d87b6a
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Mon Dec 27 16:39:08 2010 +0800
i965: don't spawn GS thread for LINELOOP on Sandybridge
LINELOOP is converted to LINESTRIP at the beginning of the 3D pipeline.
This fixes https://bugs.freedesktop.org/show_bug.cgi?id=32596
(cherry picked from commit b832ae8a4a77563c50a6e82c49b4732f6a0dbf11)
commit d7e5620d6e215b516d72823f3ddbd6248551f7cd
Author: Eric Anholt <eric@anholt.net>
Date: Thu Dec 9 09:42:05 2010 -0800
i965: Add support for gen6 reladdr VS constant loading.
(cherry picked from commit 3a3b1bd722786ab0b1386a3a505cadfa89798232)
commit 0bb9a3215ecf4c6e4ef30a1e206f05f8183ef131
Author: Eric Anholt <eric@anholt.net>
Date: Thu Dec 9 09:36:17 2010 -0800
i965: Add support for gen6 constant-index constant loading.
(cherry picked from commit 15566183a64ef3f9940962a3b08b1c3469c98566)
commit 962ef4cada6ccc6ca44139980801289c11ba52cc
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 15 15:15:02 2010 -0800
i965: Set the alternative floating point mode on gen6 VS and WM.
This matches how we did the math instructions pre-gen6, though it
applies to non-math as well.
Fixes vp1-LIT test 2 (degenerate case: 0 ^ 0 -> 1)
(cherry picked from commit c52adfc2e1d130effea940e75690897eb5d3ceaa)
commit a8e34dd8c2f2d513fdbb6823691464622f2335d7
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue Dec 21 11:55:11 2010 +0000
intel: Check for unsupported texture when finishing using as a render target
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32541
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 8b9570e685f010745e2dfb1bff00d555e2e5f6ba)
commit 4fd0d556fc924467300fea579434a84dcac994d5
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Wed Dec 22 10:52:12 2010 -0500
i965: explicit tell header present for fb write on sandybridge
Determine header present for fb write by msg length is not right
for SIMD16 dispatch, and if there're more output attributes, header
present is not easy to tell from msg length. This explicitly adds
new param for fb write to say header present or not.
Fixes many cases' hang and failure in GL conformance test.
(cherry picked from commit 4374703a9b2ce0be105ee544c8402a932e3e1f52)
commit 8a908819cc83115497215876dac5ed6807c6bcf7
Author: Eric Anholt <eric@anholt.net>
Date: Tue Dec 21 13:04:07 2010 -0800
i965: Avoid using float type for raw moves, to work around SNB issue.
The SNB alt-mode math does the denorm and inf reduction even for a
"raw MOV" like we do for g0 message header setup, where we are moving
values that aren't actually floats. Just use UD type, where raw MOVs
really are raw MOVs.
Fixes glxgears since c52adfc2e1d130effea940e75690897eb5d3ceaa, but no
piglit tests had regressed(!)
(cherry picked from commit 4fe78d3e12fa963273de4d83b1fd55a78a5d41bf)
commit 6af8eac21b551c27ad654dd7bee9c84068ded887
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 15 12:10:03 2010 -0800
intel: Support glCopyTexImage() from XRGB8888 to ARGB8888.
The only mismatch between the two is that we have to clear the
destination's alpha to 1.0. Fixes WOW performance on my Ironlake,
from a few frames a second to almost playable.
(cherry picked from commit 290a1141bc561cbd8fd2bbbb0a7c24d1b6abe0b4)
commit 0874c37195af85ed2e1e8677e63898289cd24405
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 15 11:54:38 2010 -0800
intel: Try to sanely check that formats match for CopyTexImage.
Before, we were going off of a couple of known (hopeful) matches
between internalFormats and the cpp of the read buffer. Instead, we
can now just look at the gl_format of the two to see if they match.
We should avoid bad blits that might have been possible before, but
also allow different internalFormats to work without having to
enumerate each one.
(cherry picked from commit ec03b316b4dc5d56b8510cc5aeb0f71a4fdada18)
commit 0874356dbf13f8ded19e59637a80328289229495
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 15 11:46:37 2010 -0800
intel: Drop commented intel_flush from copy_teximage.
The blit that follows appears in the command stream so it's serialized
with previous rendering. Any queued vertices in the tnl layer were
already flushed up in mesa/main/.
(cherry picked from commit e65c643792d1327a0a491f5d4a707467a6955746)
commit 3232019b67d0780fdbb033b4a49b1709c30dfc94
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 15 11:37:45 2010 -0800
intel: Update renderbuffers before looking up CopyTexImage's read buffer.
Not fixing a particular bug, just noticed by code inspection.
(cherry picked from commit 99c7840b0c10dbc731cad93b02b3865855ad086b)
commit fdf27dfdf81d8d830755c9520aadb7c9a8a78239
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Thu Dec 23 15:06:33 2010 +0800
i965: Use MI_FLUSH_DW for blt ring flush on sandybridge
Old MI_FLUSH command is deprecated on sandybridge blt.
(cherry picked from commit 845d651cf686ba885dffd9e05df971fa68c3431a)
commit 10757e86f21411d3d76b3e6320dbadf71a4a1ca2
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 13 11:32:19 2010 -0800
i965: Add support for using the BLT ring on gen6.
(cherry picked from commit c27285610c9f9b50d06bf0f2725da195937cb48d)
commit d62a383d536831a8e2edb9f952b3ba07edda813f
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 13 13:37:54 2010 -0800
i965: Fix gl_FragCoord.z setup on gen6.
Fixes glsl-bug-22603.
(cherry picked from commit 036c817f77f71e7c4b17571ae100a9bc93d8fe5b)
commit c043c5ae0097952e181711f23d717c6efbb19f34
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 13 12:15:21 2010 -0800
i956: Fix the old FP path fragment position setup on gen6.
Fixes fp-arb-fragment-coord-conventions-none
(cherry picked from commit 5fbd8da8dfb89c61f0ed143ad3f21a2b8752a476)
commit da4ecaef8a288cc1fef12d671878db6649c5b5db
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 13 11:44:26 2010 -0800
i965: Fix ARL to work on gen6.
RNDD isn't one of the instructions that can do conversion from
execution type to destination type.
Fixes glsl-vs-arrays-3.
(cherry picked from commit 7cec7bf56c1b8aa03800e01fa06f29a02edae755)
commit 9a6d7d7eb8da876345ed5ccb225d67f8110ae9f9
Author: Eric Anholt <eric@anholt.net>
Date: Mon Dec 13 11:02:15 2010 -0800
intel: Include stdbool so we can stop using GLboolean when we want to.
This requires shuffling the driconf XML macros around, since they use
true and false tokens expecting them to not get expanded to anything.
(cherry picked from commit df9f89154471ec162227ebce1681c5010f64e6e6)
commit 1988cba847386f5e03703137136c4fee08318ba2
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Fri Dec 24 09:34:50 2010 +0800
i965: use align1 access mode for instructions with execSize=1 in VS
All operands must be 16-bytes aligned in aligh16 mode. This fixes l_xxx.c
in oglconform.
(cherry picked from commit dc987adc9f5f9f851be124985fa6bbcdbfa4a7a5)
commit 8953ac25705f2971913b91e8fac3179c6d033ba5
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Fri Dec 24 09:24:08 2010 +0800
i965: fix register region description
This fixes
brw_eu_emit.c:179: validate_reg: Assertion `width == 1' failed.
(cherry picked from commit 82493216044b0320219fc631baa7b02381daa0de)
commit 639f595fa0d1872973c7a5f8c8f40185d397ea6f
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Fri Dec 10 13:01:44 2010 +0800
i965: support for two-sided lighting on Sandybridge
VS places color attributes together so that SF unit can fetch the right
attribute according to object orientation. This fixes light issue in
mesa demo geartrain, projtex.
(cherry picked from commit e47eacdc53aec6743c42c8d9ab8298f802161733)
commit 604009fa77ec00d1366a97edaaece22f3a7b04e2
Author: Brian Paul <brianp@vmware.com>
Date: Fri Dec 10 10:02:33 2010 -0700
mesa/meta: fix broken assertion, rename stack depth var
assert(current_save_state < MAX_META_OPS_DEPTH) did not compile.
Rename current_save_state to SaveStackDepth to be more consistent with
the style of the other fields.
(cherry picked from commit 2a4df8933eaeb0bd0d6e63fee3d23a47c4b3adb7)
commit 7e856fd0430a6d4272b60511b9aac06c91c24887
Author: Xiang, Haihao <haihao.xiang@intel.com>
Date: Fri Dec 10 09:31:19 2010 +0800
meta: allow nested meta operations
_mesa_meta_CopyPixels results in nested meta operations on Sandybridge.
Previoulsy the second meta operation overrides all states saved by the
first meta function.
(cherry picked from commit d1196bbc191c4f1b355d432dcb2eeff9790fda34)
commit fd2b11e433a36202e2890c8dd5a821d10bd4e8f6
Author: Chia-I Wu <olv@lunarg.com>
Date: Sun Dec 26 23:34:57 2010 +0800
st/egl: Fix eglChooseConfig when configs is NULL.
When configs is NULL, the app wants to know the number of matching
configs.
(cherry picked from commit 9f2062fb12aa4e0d69583e88e70080efe70e1967)
commit 662afccabeae67ca8bb42a3f51f48fdc4c04a431
Author: Chia-I Wu <olv@lunarg.com>
Date: Sat Dec 25 02:45:13 2010 +0800
docs/egl: Update egl.html.
Various updates and a new section about packaging.
(cherry picked from commit 65e8f8111094a0acbdf5d0a400967a43b5da2996)
commit 7d0c7d52e4e561d78c4f687948657dba516edb85
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 22 22:46:12 2010 -0800
i965: Correct the dp_read message descriptor setup on g4x.
It's mostly like gen4 message descriptor setup, except that the sizes
of type/control changed to be like gen5. Fixes 21 piglit cases on
gm45, including the regressions in bug #32311 from increased VS
constant buffer usage.
(cherry picked from commit 5dc53444c8323c1787dddbe6b67048828df9c684)
commit b7c187df9ac9bb778cf0f2abb3ad86775e42b07b
Author: Chia-I Wu <olv@lunarg.com>
Date: Wed Dec 22 15:13:52 2010 +0800
st/egl: Assorted fixes for dri2_display_get_configs.
Set window_bit only when the visual id is greater than zero. Correct
visual types. Skip slow configs as they are not relevant. Finally, do
not return duplicated configs.
(cherry picked from commit 445cb9e53b1a98eb8af6ec499912a52b03fb1ce3)
commit 55fb7269f09317bea58c9b0f710738ebff61d31a
Author: Chia-I Wu <olv@lunarg.com>
Date: Wed Dec 22 14:21:21 2010 +0800
st/egl: Fix eglCopyBuffers.
Flush before presenting.
(cherry picked from commit a31e2e3312cae5c4253a47dc30926ceb8c821ce3)
commit 0dc5b97ddda96efa394634cfc67144a48730d93a
Author: Chia-I Wu <olv@lunarg.com>
Date: Wed Dec 22 13:59:58 2010 +0800
st/egl: Plug pbuffer leaks.
Unreference validated resources or remove unnecessary validations.
(cherry picked from commit 18bc427adecd7ecd728adc03ed73bb07878c0e8f)
commit 612e26e82c60809ab9c81213f39fbe527284af9f
Author: Marek Olšák <maraeo@gmail.com>
Date: Fri Dec 17 08:59:32 2010 +0100
r300g: finally fix the texture corruption on r3xx-r4xx
Even though a bound texture stays bound when calling set_fragment_sampler_views,
it must be assigned a new cache region depending on the occupancy of other
texture units.
This fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=28800
Thanks to Álmos <aaalmosss@gmail.com> for finding the bug in the code.
Reply to: