Mesa (10.2): 38 new commits
Carl Worth
cworth at kemper.freedesktop.org
Mon Jun 23 23:44:32 UTC 2014
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=274be620a8be7786e0ab11fda9e47a04ca5e9efc
Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
Date: Mon Jun 16 20:54:32 2014 +0300
i915: Fix gen2 texblend setup
Fix an off by one in the texture unit walk during texblend
setup on gen2. This caused the last enabled texunit to be
skipped resulting in totally messed up texturing.
This is a regression introduced here:
commit 1ad443ecdd694dd9bf3c4a5050d749fb80db6fa2
Author: Eric Anholt <eric at anholt.net>
Date: Wed Apr 23 15:35:27 2014 -0700
i915: Redo texture unit walking on i830.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
(cherry picked from commit ca55a1aaa78a79ed0bc4b2410d4a8b52ef05c5b2)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5751b661add600c520ece327c1198b179efbb731
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Wed Jun 18 22:25:33 2014 -0700
i965: Save meta stencil blit programs in the context.
When the last context in a share group is destroyed, the hash table
containing all of the shader programs (ctx->Shared->ShaderObjects) is
destroyed, throwing away all of the shader programs.
Using a static variable to store program IDs ends up holding on to them
after this, so we think we still have a compiled program, when it
actually got destroyed. _mesa_UseProgram then hits GL errors, since no
program by that ID exists.
Instead, store the program IDs in the context, so we know to recompile
if our context gets destroyed and the application creates another one.
Fixes es3conform tests when run without -minfmt (where it creates
separate contexts for testing each visual).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77865
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit a20994d61677adea7f15facbc6bb025f32b37c93)
Conflicts:
src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=282ca8ba98802c3275b04e1253d30f5dbca5add9
Author: Daniel Manjarres <danmanj at gmail.com>
Date: Fri Jun 20 10:51:33 2014 -0700
glx: Don't crash on swap event for a Window (non-GLXWindow)
Prior to GLX 1.3 there was the glxMakeCurrent() function that took a
single drawable handle. The Drawable could be either a bare XID for a
Window or an XID for a glxpixmap.
GLX 1.3 added glxMakeContextCurrent that takes 2 handles: one for
reading, one for writing. Nowadays the old glxMakeCurrent call is
implemented as a call to glxMakeContextCurrent with the single handle
duplicated.
Because of this it is allowed to use a plain-old Window ID as an
argument to glxMakeContextCurrent, although nobody really documents this
sort of thing. The manpage for the NEW call specifies the arguments as
GLXPixmaps, but the actual code accepts Window XIDs too, and handles
them correctly.
Similarly, the glxSelectEvents function can also take a bare Window XID.
The "piglit" tests all use GLXWindows and/or GLXPixmaps. You never
tested swap events with a bare Window XID. That is what my app was
doing.
The swap_events code worked with Window XIDs in mesa 7.x.y. The new code
added in versions 8, 9, and 10 assumes that all buffer swap events have
a GLXPixmap associated with them. Because of the historical quirks
above, this is not true. Swap events for bare Window XIDs do NOT have a
glxpixmap resulting in a segfault.
Any app that uses the old school glxMakeCurrent call with a Window XID
while trying to use swap_events will crash when the libs try to lookup
the nonexistent GLXPixmap associated with the incoming swap event.
I believe that the people who wrote the spec overlooked this, because
the "sbc" field comes from the OML_sync extension that is defined in
terms of glxpixmaps only.
v2 (idr): Formatting changes.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54372
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Acked-by: Jesse Barnes <jbarnes at virtuousgeek.org>
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 86bd2196b4ccec50443e99e6c8bf1659e1df9f37)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c50fa76c7e7977fc1767881c5007ece1bc8cf03e
Author: Iago Toral Quiroga <itoral at igalia.com>
Date: Mon Jun 16 17:00:15 2014 +0200
mesa: Copy Geom.UsesEndPrimitive when cloning a geometry program.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 96a95f48eaf8af2c6ace51531bdd5bfbcf71165e)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ad9264366a996dfa019525629e7438af5b62ec42
Author: Tom Stellard <thomas.stellard at amd.com>
Date: Tue Jun 17 08:12:06 2014 -0700
clover: Don't use llvm's global context
An LLVMContext should only be accessed by a single and using the global
context was causing crashes in multi-threaded environments. Now we use
a separate context for each compile.
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
CC: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 4aa128a123d7285677a527e724809339f15d33a7)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=855adad13229d8e5c7da9bcb04b819009d34cb21
Author: Tom Stellard <thomas.stellard at amd.com>
Date: Mon May 12 16:32:29 2014 -0400
clover: Prevent Clang from printing number of errors and warnings to stderr.
https://bugs.freedesktop.org/show_bug.cgi?id=78581
CC: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 0cc391f0136c1532701a04c9b2f3a4cc49f25e8c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3568cf8128a28f8c860fa2a4c5bbf75c2e090c7e
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Tue Jun 17 23:28:56 2014 -0400
nv30: hack to avoid errors on unexpected color/zeta combinations
This is just a hack, it should be possible to create a temporary zeta
surface and render to that instead. However that's more complicated and
this avoids the render being entirely broken and errors being reported
by the card.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 25182e249e50b0fce41d975ae2b3c9cbdb8d0ef3)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aca2d98c35b795bd7124527bd320e0d10adcf658
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Tue Jun 17 22:32:03 2014 -0400
nv30: avoid dangling references to deleted contexts
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit c092c46b27c6f6a6674e8d67fb3afdb684811819)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=08317fa9c4183e051d16f65eead742a39fd83014
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Tue Jun 17 22:22:56 2014 -0400
nv30: plug some memory leaks on screen destroy and shader compile
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 5af80f62680b8321c3af565bb57138a71429502c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d0c445af6e600be6912da6bbaecc8c1642ed56c
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue Jun 17 11:14:17 2014 -0700
meta: Respect the driver's maximum number of draw buffers
Commit c1c1cf5f9 added infrastructure for saving and restoring draw
buffer state. However, it universially used MAX_DRAW_BUFFERS, but many
drivers support far fewer than that at limit. For example, the radeon
and i915 drivers only support 1. Using MAX_DRAW_BUFFERS causes meta to
generate GL errors.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80115
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Tested-by: Kenneth Graunke <kenneth at whitecape.org> [on Broadwell]
Tested-by: jpsinthemix at verizon.net
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit cc219d1d6567cfada5d8e9adf01c2f00e00c93ca)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ad103d6647e95fda12717e00abeec67abfccbf0
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Mon May 12 15:46:11 2014 -0700
mesa: Remove glClear optimization based on drawable size
A drawable size of 0x0 means that we don't have buffers for a drawable yet,
not that we have a zero-sized buffer. Core mesa shouldn't be optimizing out
drawing based on buffer size, since the draw call could be what triggers
the driver to go and get buffers. As discussed in the referenced bug report,
the optimization was added as part of a scatter-shot attempt to fix a
different problem. There's no other example in mesa core of using the
buffer size in this way.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74005
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Kristian Høgsberg <krh at bitplanet.net>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 7928b946adbcbbb835c0080967bbb538f6bd35dc)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=12fcbcde47e360e87c7f8525b271fd8d52c418bf
Author: Grigori Goronzy <greg at chown.ath.cx>
Date: Wed Jun 4 18:54:38 2014 +0200
radeon/uvd: disable VC-1 simple/main on UVD 2.x
It's about as broken as on later UVD revisions.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66452
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Christian König <christian.koenig at amd.com>
(cherry picked from commit 6cd30f5d730c3c23251a8e72e17fe65810460764)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8e3158a43813b8824652d61134f775d0bf9d071
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat Jun 14 13:23:47 2014 -0400
nv50: make sure to mark first scissor dirty after blit
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit af05270ccfaa15fde9845a2250922caa8902c0fe)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef5f998b769fa549b54dad6f7bb77ab17c391a73
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri Jun 13 15:26:40 2014 -0700
i965: Use 8x4 aligned rectangles for HiZ operations on Broadwell.
Like on Haswell, we need to use 8x4 aligned rectangle primitives for
hierarchical depth buffer resolves and depth clears. See the comments
in brw_blorp.cpp's brw_hiz_op_params() constructor. (The Broadwell
documentation confirms that this is still necessary.)
This patch makes the Broadwell code follow the same behavior as Chad and
Jordan's Gen7 BLORP code. Based on a patch by Topi Pohjolainen.
This fixes es3conform's framebuffer_blit_functionality_scissor_blit
test, with no Piglit regressions.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 49659ad90c501ae584b7d76ca98f35a8f57d40fe)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=31dd2a6f18eb441c310148336b410b2f6bafde04
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sat Jun 14 12:58:03 2014 -0700
i965/vec4: Use the sampler for pull constant loads on Broadwell.
We've used the LD sampler message for pull constant loads on earlier
hardware for some time, and also were already using it for the FS on
Broadwell. This patch makes us use it for Broadwell VS/GS as well.
I believe that when I wrote this code in 2012, we still used the data
port in some cases, and I somehow neglected to convert it while
rebasing.
Improves performance in GLBenchmark 2.7 Egypt by 416.978% +/- 2.25821%
(n = 17). Many other applications should benefit similarly: this speeds
up uniform array access in the VS, which is commonly used for skinning
shaders, among other things.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Tested-by: Ben Widawsky <ben at bwidawsk.net>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 5d8e246ac86b4a94a0c2cf2bc707eceb3fe20cb6)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c07485eab198769b83d15d67e9d8a3999cee966b
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sat Jun 14 01:43:28 2014 -0700
i965: Add missing newlines to a few perf_debug messages.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 847abaccc04026b5c150748b6484061f2f8b3165)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b941857eeb452638a4d73c66049a00bb0558551
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sat Jun 14 01:43:27 2014 -0700
i965: Drop Broadwell perf_debugs about missing MOCS that aren't missing.
I actually added MOCS support for these things, but forgot to delete the
corresponding perf_debug() warnings.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit d053a05ef3c0aa491d485074e48a6715d7018f9c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b753df1f4c3a8074c2d8bd438b549c4b8fab35c
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sat Jun 14 01:43:26 2014 -0700
i965: Add missing MOCS setup for 3DSTATE_INDEX_BUFFER on Broadwell.
Somehow I missed this when adding all of the other MOCS values.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 7f256c1c705e74d626a668bdfc2b281167a957c2)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=01a79ac679916b08cc0bb194c317aee13a5c2704
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sat Jun 14 03:53:07 2014 -0700
i965/vec4: Fix dead code elimination for VGRFs of size > 1.
When faced with code such as:
mov vgrf31.0:UD, 960D
mov vgrf31.1:UD, vgrf30.xxxx:UD
The dead code eliminator didn't consider reg_offsets, so it decided that
the second instruction was writing was writing to the same register as
the first one, and eliminated the first one. But they're actually
different registers.
This fixes INTEL_DEBUG=shader_time for vertex shaders. In the above
code, vgrf31.0 represents the offset into the shader_time buffer where
the data should be written, and vgrf31.1 represents the actual time
data. With a completely undefined offset, results were...unexpected.
I think this is probably one of the few cases (maybe only case) where we
generate multiple MOVs to a large VGRF. Normally, we just use them as
texturing results; the other SEND-from-GRF uses a size 1 VGRF.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79029
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit d0575d98fc595dcc17706dc73d1eb461027ca17a)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83be6a5517ae8908bfbdbb57f5fcef1539e4c044
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Fri Jun 13 12:15:04 2014 -0700
meta_blit: properly compute texture width for the CopyTexSubImage fallback
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit ffe609cc69f328de5b57d4d7ab1d270fcf28de5f)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=348125e7f75bdc2f948e701b8edbf8534f3bbc6e
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Jun 11 22:15:58 2014 +0100
configure: correctly autodetect xvmc/vdpau/omx
Commit e62b7d38a1d (configure: autodetect video state-trackers
when non swrast driver is present) added a check that caused
the autodetection to be omitted when we have the swrast gallium
driver. Whereas it should have skipped the VL targets when only
swrast was selected.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79907
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Christian König <christian.koenig at amd.com>
(cherry picked from commit 816d392b586ecd95bd5b2dc24945bb9fc5d73d6e)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=126600c918d87356a80e4b94fa22105a0459c30d
Author: Neil Roberts <neil at linux.intel.com>
Date: Mon Jun 9 17:43:37 2014 +0100
i965: Set the fast clear color value for texture surfaces
When a multisampled texture is used for sampling the fast clear color value
needs to be programmed into the surface state. This was being left as all
zeroes so if the surface was cleared to a value other than black then it
wouldn't work properly. This doesn't matter for single-sample textures because
in that case the MCS buffer is resolved before it is used as a texture source.
https://bugs.freedesktop.org/show_bug.cgi?id=79729
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 765efeef883cdbb86e052acd887e0c3c0e39b732)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee2035a95ff39c0ed5d9f040047648b256eae311
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Mon Jun 9 02:59:22 2014 -0700
i965: Invalidate live intervals when inserting Gen4 SEND workarounds.
We need to invalidate the live intervals when inserting new
instructions.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 237aac39b1994b0fa1e8cd3490ad415b144a8b5f)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=07a6f8bcabf4260b620cb308418d69d28e3f9e62
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Mon Jun 9 02:59:21 2014 -0700
i965: Don't use the head sentinel as an fs_inst in Gen4 workaround code.
When walking backwards, we want to stop at the head sentinel, which is
where scan_inst->prev->prev == NULL, not scan_inst->prev == NULL.
Fixes random crashes, as well as valgrind errors.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit ecc78eab119ac8fa3df380a80bc94975e986523c)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d46c58b83dec2a182f3f10dcff7ac65d2dc57ce
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Tue Jun 10 11:25:04 2014 +0900
configure: Only check for OpenCL without LLVM when the latter is certain
LLVM is enabled by default for some architectures, but the test was failing
before that.
Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 2d399bb1837e01856c8e489aa5ec439ce9a1fdbc)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7fd6e52ec0b7c580efb78c8bd6997b91b4d7108
Author: Adrian Negreanu <adrian.m.negreanu at intel.com>
Date: Fri Jun 6 12:16:12 2014 +0300
android, dricore: undefined reference to _mesa_streaming_load_memcpy
_mesa_streaming_load_memcpy is defined in main/streaming-load-memcpy.c
I'm adding it to the dricore lib
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
(cherry picked from commit 357a8b6f334da9e78d9cadebb8d729a0d1d38c3d)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a46fa0f9de4a4349b7e93bf515db9a3c523d3b6f
Author: Adrian Negreanu <adrian.m.negreanu at intel.com>
Date: Fri Jun 6 12:16:11 2014 +0300
android, mesa_gen_matypes: pull in timespec POSIX definition
This fixes:
include/c11/threads_posix.h: In function 'cnd_timedwait':
include/c11/threads_posix.h:140:21: error: storage size of 'abs_time' isn't known
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
(cherry picked from commit 6eb3888c863dfef249c3910dbe3fe1f2b251db05)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4a19c1e2c1b2178f2f70841d81ba4a328873b26
Author: Adrian Negreanu <adrian.m.negreanu at intel.com>
Date: Fri Jun 6 12:16:10 2014 +0300
android, egl: typo dri2_fallback_pixmap_surface -> dri2_fallback_create_pixmap_surface
I used commit bc8b07a6 as reference, and only the droid_display_vtbl had this issue.
This fixes:
src/egl/drivers/dri2/platform_android.c:641:29:
error: 'dri2_fallback_pixmap_surface' undeclared here (not in a function)
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
(cherry picked from commit 6980cae6aeb6671b6b0245e20a2d34957c1fff0a)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bed18b082a96ab3107425a197b8ec423790440c3
Author: Adrian Negreanu <adrian.m.negreanu at intel.com>
Date: Fri Jun 6 12:16:09 2014 +0300
android, egl: add correct drm include for libmesa_egl_dri2
Fixes:
src/egl/drivers/dri2/platform_android.c:38:
include/GL/internal/dri_interface.h:51:17:
fatal error: drm.h: No such file or directory
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
(cherry picked from commit 4dc5545eff9f8fbf4e3d80bad5421821434605f9)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=43752c3c376dcaa150b2e3dff1a659cf6a01653f
Author: Adrian Negreanu <adrian.m.negreanu at intel.com>
Date: Fri Jun 6 12:16:08 2014 +0300
android: add src/gallium/auxiliary as include path for libmesa_dricore
This fixes:
In file included from
/home/adrian/workspace/mesa/mesa-master.git/src/mesa/vbo/vbo_exec_api.c:445:0:
/home/adrian/workspace/mesa/mesa-master.git/src/mesa/vbo/vbo_attrib_tmp.h:28:38:
fatal error: util/u_format_r11g11b10f.h: No such file or directory
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
(cherry picked from commit 0048483f73c0cdd6015f1f8a65b9e9d0fce4e93b)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aa03f78fc88bdd7115fc22895ac819bfdf44c78b
Author: Adrian Negreanu <adrian.m.negreanu at intel.com>
Date: Fri Jun 6 12:16:07 2014 +0300
android: add libloader to libGLES_mesa and libmesa_egl_dri2
This fixes
src/egl/drivers/dri2/platform_android.c:664: error: undefined reference to 'loader_set_logger'
src/egl/drivers/dri2/platform_android.c:678: error: undefined reference to 'loader_get_driver_for_fd'
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
(cherry picked from commit a49ebfab1d093475610e8504cf3400c054e300c0)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6194593661fda6b199eebf4dc14ad4e653a45f77
Author: Adrian Negreanu <adrian.m.negreanu at intel.com>
Date: Fri Jun 6 12:16:06 2014 +0300
android: adapt to the megadriver mechanism
Fixes linker error:
ld:
.../libmesa_dri_common_intermediates/libmesa_dri_common.a(dri_util.o):
in function globalDriverAPI:dri_util.c(.data.rel+0x0): error:
undefined reference to 'driDriverAPI'
As an example, you can see that mesa_dri_drivers
also uses common/libmegadriver_stub (src/mesa/drivers/dri/Makefile.am)
The _stub part might be confusing, but
it actually provides the dri-driver shared lib constructor,
megadriver_stub_init, which will later on load the real
platform dependent part and call
l __driDriverGetExtensions_<platform>
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
(cherry picked from commit aba0f152be5bbc9fa844a53014bde7c02f056e4f)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7654120e8643ff7d633324c0e649f3cc04da85c3
Author: Adrian Negreanu <adrian.m.negreanu at intel.com>
Date: Fri Jun 6 12:16:05 2014 +0300
add megadriver_stub_FILES
So that android part can also use $(megadriver_stub_FILES)
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
(cherry picked from commit eb3f80dbba3c7e6e33d9b98a6b88761550fddb97)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d6d80b44c48487d72ef1b2fdd1e55018e2b149fc
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Thu May 15 22:54:48 2014 +0100
configure: error out when building opencl without LLVM
Cc: Tom Stellard <thomas.stellard at amd.com>
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
(cherry picked from commit 93257a56b5b585e79e4ba9f95b38f5bd718e3959)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a5d00e243c12bbf0306a0435f20f2804451e0a6a
Author: José Fonseca <jfonseca at vmware.com>
Date: Fri Jun 6 23:59:18 2014 +0100
mesa/main: Prevent sefgault on glGetIntegerv(GL_ATOMIC_COUNTER_BUFFER_BINDING).
A recent ApiTrace change, that tries to dump more buffer state
causes Mesa from my distro (10.1.4) to segfaults here.
I haven't actually confirm this fixes it (I can't repro on master),
but it seems a good idea to be defensive here anyway.
Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit eb58aa9cf015e79a0fcf2e088676e6aa1d5dabce)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bfff355cef9b56a5ae1e7d7fbaa8c626fb287ad4
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat Jun 7 16:37:57 2014 -0400
gk110/ir: fix bfind emission
There is a short-immediate version as well, but it should never end up
getting used since it would have gotten folded earlier.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit bd7dd3ed06ea9e88a9f6e18f45338bd99fde86f1)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e1bdee5ec018ab92ccef76882e74fca31115fde
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat Jun 7 00:18:34 2014 -0400
gk110/ir: fix emitting constbuf file index
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 7a673187948b38d2d80aa48d9fc09176fa3547e8)
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e50fc38120735603e8a8150fb450fa8dd049f36
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Fri Jun 6 23:32:29 2014 -0400
gk110/ir: emit saturate flag on fadd when needed
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.2" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 4a3a71a183eba60539ca3c556938344bcf180d70)
More information about the mesa-commit
mailing list