summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-06-23i965: Invalidate live intervals when inserting Gen4 SEND workarounds.Kenneth Graunke1-0/+6
We need to invalidate the live intervals when inserting new instructions. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Cc: mesa-stable@lists.freedesktop.org (cherry picked from commit 237aac39b1994b0fa1e8cd3490ad415b144a8b5f)
2014-06-23i965: Don't use the head sentinel as an fs_inst in Gen4 workaround code.Kenneth Graunke1-1/+1
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@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Cc: mesa-stable@lists.freedesktop.org (cherry picked from commit ecc78eab119ac8fa3df380a80bc94975e986523c)
2014-06-23configure: Only check for OpenCL without LLVM when the latter is certainMichel Dänzer1-4/+4
LLVM is enabled by default for some architectures, but the test was failing before that. Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Tom Stellard <thomas.stellard@amd.com> Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 2d399bb1837e01856c8e489aa5ec439ce9a1fdbc)
2014-06-23android, dricore: undefined reference to _mesa_streaming_load_memcpyAdrian Negreanu1-0/+5
_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@lists.freedesktop.org> Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> (cherry picked from commit 357a8b6f334da9e78d9cadebb8d729a0d1d38c3d)
2014-06-23android, mesa_gen_matypes: pull in timespec POSIX definitionAdrian Negreanu2-0/+2
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@lists.freedesktop.org> Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> (cherry picked from commit 6eb3888c863dfef249c3910dbe3fe1f2b251db05)
2014-06-23android, egl: typo dri2_fallback_pixmap_surface -> ↵Adrian Negreanu1-1/+1
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@lists.freedesktop.org> Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> (cherry picked from commit 6980cae6aeb6671b6b0245e20a2d34957c1fff0a)
2014-06-23android, egl: add correct drm include for libmesa_egl_dri2Adrian Negreanu1-0/+1
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@lists.freedesktop.org> Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> (cherry picked from commit 4dc5545eff9f8fbf4e3d80bad5421821434605f9)
2014-06-23android: add src/gallium/auxiliary as include path for libmesa_dricoreAdrian Negreanu1-1/+2
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@lists.freedesktop.org> Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> (cherry picked from commit 0048483f73c0cdd6015f1f8a65b9e9d0fce4e93b)
2014-06-23android: add libloader to libGLES_mesa and libmesa_egl_dri2Adrian Negreanu2-1/+7
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@lists.freedesktop.org> Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> (cherry picked from commit a49ebfab1d093475610e8504cf3400c054e300c0)
2014-06-23android: adapt to the megadriver mechanismAdrian Negreanu2-0/+18
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@lists.freedesktop.org> Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> (cherry picked from commit aba0f152be5bbc9fa844a53014bde7c02f056e4f)
2014-06-23add megadriver_stub_FILESAdrian Negreanu2-1/+4
So that android part can also use $(megadriver_stub_FILES) Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> (cherry picked from commit eb3f80dbba3c7e6e33d9b98a6b88761550fddb97)
2014-06-23configure: error out when building opencl without LLVMEmil Velikov1-0/+4
Cc: Tom Stellard <thomas.stellard@amd.com> Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Tom Stellard <thomas.stellard@amd.com> (cherry picked from commit 93257a56b5b585e79e4ba9f95b38f5bd718e3959)
2014-06-23mesa/main: Prevent sefgault on glGetIntegerv(GL_ATOMIC_COUNTER_BUFFER_BINDING).José Fonseca1-1/+5
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@lists.freedesktop.org> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit eb58aa9cf015e79a0fcf2e088676e6aa1d5dabce)
2014-06-23gk110/ir: fix bfind emissionIlia Mirkin1-1/+1
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@alum.mit.edu> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit bd7dd3ed06ea9e88a9f6e18f45338bd99fde86f1)
2014-06-23gk110/ir: fix emitting constbuf file indexIlia Mirkin1-2/+3
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 7a673187948b38d2d80aa48d9fc09176fa3547e8)
2014-06-23gk110/ir: emit saturate flag on fadd when neededIlia Mirkin1-0/+1
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 4a3a71a183eba60539ca3c556938344bcf180d70)
2014-06-16targets/xa: limit the amount of exported symbolsEmil Velikov2-0/+41
In the presence of LLVM the final library exports every symbol from the llvm namespace. Resolve this by using a version script (w/o the version/name tag). Considering that there are only ~35 symbols, explicitly list them to minimize the chances of rogue symbols sneaking in. v2: Conditionally include the version-script. Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> (v1) Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> (cherry picked from commit a75baba2f14a2bcdaf640aeef86d67b41bb2a76f) Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
2014-06-06docs: Add MD5 checksum, etc. for 10.2.1 releaseIan Romanick2-1/+10
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-06docs: Add initial 10.2.1 release notesIan Romanick2-0/+61
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-06Bump version to 10.2.1mesa-10.2.1Ian Romanick1-1/+1
2014-06-06radeonsi: Fix build error introduced in 5ab9a9cIan Romanick1-1/+0
While resolving conflicts in cherry picking commit d226191, I accidentally introduced some garbage. Because radeonsi isn't built by default, the problem went unnoticed by me. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reported-by: Laurent Carlier <lordheavym@gmail.com> Tested-by: Laurent Carlier <lordheavym@gmail.com>
2014-06-06docs: Add MD5 checksum, etc. for 10.1 releaseIan Romanick2-2/+11
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-06Bump version to 10.2 (final)mesa-10.2Ian Romanick1-1/+1
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2014-06-06gk110/ir: fix slct emissionIlia Mirkin1-1/+1
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 9fef8b3d811000146b989a101ad0e26ae6530fe4)
2014-06-06gk110/ir: fix interp mode emissionIlia Mirkin1-1/+2
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit d588a4919b732246b7aa26685ef65545929a4f7b)
2014-06-06nvc0: don't bother trying to set up compute for gk110+Ilia Mirkin1-3/+4
The nouveau fw currently prints a bunch of errors. No point in seeing those all the time, esp since compute doesn't really work in the first place. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Ben Skeggs <bskeggs@redhat.com> Cc: "10.2" <mesa-stable@lists.freedesktop.org> Conflicts: src/gallium/drivers/nouveau/nvc0/nvc0_screen.c (cherry picked from commit ca65fc418f756496d480a9a4566543837a582826)
2014-06-06gk110: add in forgotten code for gk110 isaIlia Mirkin1-0/+13
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Ben Skeggs <bskeggs@redhat.com> Cc: "10.2" <mesa-stable@lists.freedesktop.org> Conflicts: src/gallium/drivers/nouveau/nvc0/nvc0_surface.c (cherry picked from commit b9ec766bd02d55c20ff7ce5b95207ea7f6ed1de5)
2014-06-06gk110/ir: fix ISAD emission with register argsIlia Mirkin1-1/+1
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit ed1b9e5721f6c7a74e042eadb31fc5dcb2fc3552)
2014-06-06gk110/ir: fix quadon opcode emissionIlia Mirkin1-1/+1
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 6e046508a17b7eee24285e94f144a42ded3ebcdc)
2014-06-06gk110/ir: emit texbar the same way that the blob doesIlia Mirkin1-1/+1
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Ben Skeggs <bskeggs@redhat.com> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 73eec47ef81954f7c2bf7c8bf03b300d11d05b82)
2014-06-06nv50/ir: clear subop when folding constant expressionsTobias Klausmann1-0/+1
Some operations (e.g. OP_MUL/OP_MAD/OP_EXTBF) might have a subop set. After folding, make sure that it is cleared Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 3164bfc73418e2e046c7a750eaac8a6d66dfe02d)
2014-06-06i965: Support GL_CLAMP natively on Broadwell.Kenneth Graunke3-4/+13
The new hardware actually supports this OpenGL 1.x feature natively, so we can finally drop our shader workarounds. Not many applications use GL_CLAMP, and most use it unintentionally, but it's trivial to do right, so we should. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 221169693bf1dfdaf46dddc1df318cee992237aa)
2014-06-06i965: Pass brw to translate_wrap_mode().Kenneth Graunke3-8/+9
This lets us do generation checks. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 7f3d64a77b9ca6d738f67c7a3dd4499cdf817d79)
2014-06-06i965: Fix copy and pasted values in Broadwell code.Kenneth Graunke1-10/+21
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 7913b4b97bab750ffad54e53dec9bbeb56307066)
2014-06-06egl: Check for NULL native_window in eglCreateWindowSurfaceSinclair Yeh1-0/+4
We have customers using NULL as a way to test the robustness of the API. Without this check, EGL will segfault trying to dereference dri2_surf->wl_win->private because wl_win is NULL. This fix adds a check and sets EGL_BAD_NATIVE_WINDOW v2: Incorporated feedback from idr - moved the check to a higher level function. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 91ff0d4c6510dc38f279c586ced17fba917873e7)
2014-06-06r600g,radeonsi: don't use hardware MSAA resolve if dst is fast-clearedMarek Olšák2-2/+5
It doesn't work and our docs say so too. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (cherry picked from commit d2261918202697febed0de18f66416e273001088)
2014-06-06r600g,radeonsi: disable fast clear if render condition is onMarek Olšák1-0/+3
For some reason, CP DMA doesn't follow the predicate bit if I enable it, so this is the only option. This fixes piglit: spec/NV_conditional_render/clear Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (cherry picked from commit bf701a84eb000910015a3c3ee9860141cde4990d)
2014-06-06mesa: Make glGetIntegerv(GL_*_ARRAY_SIZE) return GL_BGRA.José Fonseca2-2/+12
Same as b026b6bbfe3f15c8a7296ac107dc3d31f74e401e, but COLOR_ARRAY_SIZE/SECONDARY_COLOR_ARRAY_SIZE. Ideally we wouldn't munge the incoming state, so that we wouldn't need to unmunge it back on glGet*. But the array size state is copied and referred in many places, many of which couldn't take an GLenum like GL_BGRA instead of a plain integer. So just hack around on glGet*, to ensure there is no risk of introducing regressions elsewhere. This bug causes problems to Apitrace, resulting in wrong traces. See https://github.com/apitrace/apitrace/issues/261 for details. Tested with piglit arb_vertex_array_bgra-get, which was created for this purpose. Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit e3e13d6b857b3083e2553457fe30ddfd4eddead4)
2014-06-06mesa/main: Make get_hash.c values constant.José Fonseca1-1/+1
Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 53468dee0359a4ec3c9edd334656de0ddc47e477)
2014-06-06egl/main: Fix eglMakeCurrent when releasing context from current thread.Beren Minor1-2/+6
EGL 1.4 Specification says that eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT) can be used to release the current thread's ownership on the surfaces and context. MESA's egl implementation was only accepting the parameters when the KHR_surfaceless_context extension is supported. [chadv] Add quote from the EGL 1.4 spec. Cc: "10,1, 10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Chad Versace <chad.versace@linux.intel.com> (cherry picked from commit 0ca0d5743fb42a956289a87efd4c8fcda88cf93a)
2014-06-06Revert "glx: load dri driver with RTLD_LOCAL so dlclose never fails to unload"Marek Olšák1-5/+5
This reverts commit e3cc0d90e14e62a0a787b6c07a6df0f5c84039be. It breaks too many apps and completely breaks my desktop too. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79469 We'll probably need to re-release all stable versions after this is committed. Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 0d5ec2c615784929be095951f9269773a790a2dd)
2014-06-06llvmpipe: fix crash when not all attachments are populated in a fbRoland Scheidegger1-3/+9
Framebuffers can have NULL attachments since a while. llvmpipe handled that properly for lp_rast_shade_quads_mask but it seems the change didn't make it to lp_rast_shade_tile. This fixes piglit fbo-drawbuffers-none test (though I need to increase the FB_SIZE from 32 to 256 so the tris cover some tiles fully). https://bugs.freedesktop.org/show_bug.cgi?id=79421 Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Jose Fonseca <jfonseca@vmware.com> (cherry picked from commit 576868140bbb1abd177e7fd122720883d773137e)
2014-05-30Bump version to 10.2-rc5mesa-10.2-rc5Ian Romanick1-1/+1
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2014-05-30i915: add a missing NULL pointer checkLubomir Rintel1-1/+1
mesaVisual can be NULL with configless context since this commit: commit 551d459af421a2eb937e9e16301bb64da4624f89 Author: Neil Roberts <neil@linux.intel.com> Date: Fri Mar 7 18:05:47 2014 +0000 Add the EGL_MESA_configless_context extension ... Previously the i965 and i915 drivers were explicitly creating a zeroed visual whenever 0 is passed for the EGLConfig. We attempt to dereference the visual in i915 and now we don't create a zeroed-out one one it crashes, breaking at least weston in an i915. There's no point in doing so as it would be zero anyway. v2: Fixed a typo in commit message. Added some tags. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1100967 Cc: "10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 90b5747856dd116e1a7e0fd4a93781400f276c3e)
2014-05-30glapi: Duplicate GLES1 prototypes in glapi_dispatch.cIan Romanick1-0/+57
These prototypes are necessary because GLES1 library builds will create dispatch functions for them. We can't directly include GLES/gl.h because it would conflict the previously-included GL/gl.h. Since GLES1 ABI is not expected to every add more functions, the path of least resistance is to just duplicate the prototypes for the functions that aren't already in desktop OpenGL. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79294 Acked-by: Matt Turner <mattst88@gmail.com> Tested-by: Andreas Boll <andreas.boll.dev@gmail.com> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 7b1aeec9cd8c9b790d452eaf769ccbce51627908)
2014-05-30nvc0: revert mistaken logic to collapse color outputs to the beginningIlia Mirkin1-9/+4
In commit af38ef907, I added a "fix" to color outputs not being assigned correctly when sample mask was being output. This was totally wrong -- the color indices (i.e. "si" values) were the ones that were wrong. Undo that hunk. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Acked-by: Emil Velikov <emil.l.velikov@gmail.com> (cherry picked from commit 0d699530ff9fe68a1898f875b889422536bfc8e5) Requested-by: Ilia Mirkin <imirkin@alum.mit.edu>
2014-05-30mesa/st: fix color outputs in presence of sample mask outputIlia Mirkin1-13/+17
Commit c5d822dad90 added support for sample mask incorrectly. It became treated as a color output, and messed up the color output indices. Revert the hunk that did that, and add explicit support just like for depth/stencil writes. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Acked-by: Marek Olšák <marek.olsak@amd.com> (cherry picked from commit ab7bd7093dfd18778ece4ed9098666c9ebc68d51) Requested-by: Ilia Mirkin <imirkin@alum.mit.edu>
2014-05-30configure: fix build error with XARob Clark1-0/+1
Fixes: xa_tracker.c: In function 'xa_tracker_create': xa_tracker.c:147:5: error: implicit declaration of function 'pipe_loader_drm_probe_fd' [-Werror=implicit-function-declaration] in some build configurations, as XA now implicitly depends on gallium_drm_loader. Signed-off-by: Rob Clark <robclark@freedesktop.org> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> (cherry picked from commit 20d14ef2633215c5d24741de76b5d59aa3dcbc22) Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=511700 Requested-by: Matt Turner <mattst88@gmail.com>
2014-05-30i965: Fix Line Stipple enable bit in 3DSTATE_SF for Haswell.Pavel Popov1-1/+1
Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Pavel Popov <pavel.e.popov@intel.com> (cherry picked from commit d292d40207359cc70c004182484aaa939fd29e59)
2014-05-29glx: load dri driver with RTLD_LOCAL so dlclose never fails to unloadJerome Glisse1-5/+5
There is no reason anymore to load with RTLD_GLOBAL and for some driver this even result in dlclose failing to unload leading to catastrophic failure with swrast fallback. Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Jérôme Glisse <jglisse@redhat.com> (cherry picked from commit e3cc0d90e14e62a0a787b6c07a6df0f5c84039be)