summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-05-16mesa: fix double-freeing of dispatch tables inside glBegin/End.Brian Paul1-2/+2
We allocate dispatch tables for BeginEnd and OutsideBeginEnd. But when we destroy the context we were freeing the BeginEnd and Exec tables. If Exec==BeginEnd we did a double-free. This would happen if the context was destroyed while inside a glBegin/End pair. Now free the BeginEnd and OutsideBeginEnd pointers. Cc: "10.1", "10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (cherry picked from commit ef6b6658f91bd5871739bdb71a08042f26abe389)
2014-05-16glsl_to_tgsi: Make sure the 'shader' member is always initializedMichel Dänzer1-0/+3
Fixes the valgrind report below and random crashes with piglit on radeonsi. ==30005== Conditional jump or move depends on uninitialised value(s) ==30005== at 0xB13584E: st_translate_program (st_glsl_to_tgsi.cpp:5100) ==30005== by 0xB14698B: st_translate_fragment_program (st_program.c:747) ==30005== by 0xB14777D: st_get_fp_variant (st_program.c:824) ==30005== by 0xB11219C: get_color_fp_variant (st_cb_drawpixels.c:1042) ==30005== by 0xB1131AE: st_DrawPixels (st_cb_drawpixels.c:1154) ==30005== by 0xAFF8806: _mesa_DrawPixels (drawpix.c:162) ==30005== by 0x4EB86DB: stub_glDrawPixels (generated_dispatch.c:6640) ==30005== by 0x4F1DF08: piglit_visualize_image (piglit-util-gl.c:1574) ==30005== by 0x40691D: draw_image_to_window_system_fb(int, bool) (draw-buffers-common.cpp:733) ==30005== by 0x406C8B: draw_reference_image(bool, bool) (draw-buffers-common.cpp:854) ==30005== by 0x40722A: piglit_display (alpha-to-coverage-dual-src-blend.cpp:117) ==30005== by 0x4EA7168: run_test (piglit_fbo_framework.c:52) Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com> (cherry picked from commit 2bab95973d8ad3a84f62670143d6f26c230d9582)
2014-05-16i965/fb: Use meta path for stencil up/downsamplingTopi Pohjolainen1-1/+8
Cc: "10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> (cherry picked from commit d45fadf11a8dbd9cdf0a1548a38127462b4ceee0)
2014-05-16i965/meta: Stencil blit for miptree updownsamplingTopi Pohjolainen2-0/+38
Cc: "10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 475216a4f082b7db9651238e1bd31f6d52c7c475)
2014-05-16i965/fb: Use meta path for stencil blitsTopi Pohjolainen1-0/+9
This is effective only on gen8 for now as previous generations still go through blorp. Cc: "10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit b18f6b9b86531581da567eaa400923e35e22006d)
2014-05-16i965/meta: Stencil blitsTopi Pohjolainen3-0/+497
v2: Create the intel renderbuffer with level hardcoded to zero instead of overriding it in the surface state configuration. Also moved the dimension adjustments for tiling, mip level, msaa into the render buffer creation. Finally prepares for another blit path needed for miptree updownsampling. v3 (Ken): Dropped unnecessary memory context for "ralloc_asprintf()" Cc: "10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> (cherry picked from commit d1829badf5caae794393de77cfe34eda44c1fcc9)
2014-05-16meta: Refactor state save/restore for framebuffer texture blitsTopi Pohjolainen2-22/+52
Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 2a549c43a8c585b312fda920fcd7048e52fdcb05) Note: This patch was cherry picked so that the next patch would build.
2014-05-16i965: Extend brw_get_rb_for_first_slice() for specified level/layerTopi Pohjolainen2-7/+29
v2: Configure stencil directly for final dimensions instead of adjusting bit by bit for tiling, mip level and msaa. v3 (Ken): Used non-static constant for horizontal alignment Cc: "10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 9d752c098c5dc819fd08b9611ca52d847c1b9495)
2014-05-16i965/gen8: Surface state overriding for stencilTopi Pohjolainen1-13/+21
v2: Allow hardware to offset accesses to individual layers. Also leave the mip-level overriding for the creator of the intel renderbuffer to handle. Merged with "i965/gen8: Allow stencil buffers to be configured as single sampled" Ken: I left the "_mesa_problem()" still in place. I think it is clearer to remove it in a separate patch. Cc: "10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 36caae48b25b29310be1b7cbbafe7461bb51248d)
2014-05-16i965/wm: Surface state overrides for configuring w-tiled as y-tiledTopi Pohjolainen2-0/+30
v2: Use intel_mipmap_tree::total_width in order to get correct alignment automatically. Also use "mt->total_height / mt->physical_depth0" as surface height allowing hardware to offset to correct slice. Cc: "10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 6aefaa4eb23dec764a59f9e28bbe4a7d5036fdbf)
2014-05-16i965 meta up/downsample: Fix renderbuffer _BaseFormatJordan Justen1-1/+2
mt->format is of type mesa_format, and therefore can't be used with _mesa_base_fbo_format which requires a GLenum input. On gen8, this fixes various piglit fbo-depthstencil tests with samples > 1. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 103057b2b7c0cf26c28b40fe5802acb8c6195c77)
2014-05-16mesa/st: fix number of ubos being declared in a shaderRoland Scheidegger1-3/+5
Previously the code used the total number of ubos being declared in the linked program (so the ubos of all shaders combined), use the number from the particular shader instead. This fixes an assertion failure with piglit arb_uniform_buffer_object-maxblocks seen in llvmpipe since 8a9f5ecdb116d0449d63f7b94efbfa8b205d826f as it now emits code for each declared buffer, not just the ones actually used. CC: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 3e817e7e56806d8adb8f16c35136045c29908944)
2014-05-16docs: Add a note about llvm-shared-libs and libxatrackerEmil Velikov1-0/+19
Both changes landed in 10.2, and for people not following the development cycle these will come as a surprise. Note that the pipe_* interface is not stable. Cc: "10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Acked-by: Rob Clark <robclark@freedesktop.org> (cherry picked from commit e48054d0364cfc4c92120ea90b6f526c3527230a)
2014-05-16configure: correctly set LD_NO_UNDEFINEDEmil Velikov1-0/+13
Commit 11623be934f85 was meant to have this hunk, which I accidently dropped during git rebase. Cc: 10.2 <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Jonathan Gray <jsg@jsg.id.au> (cherry picked from commit f57d092199318f03f6522d0ca616f1f8220b2e6e)
2014-05-16radeonsi: Fix anisotropic filtering state setupMichel Dänzer3-13/+12
Bring it back in line with r600g. I broke this in the original radeonsi bringup. :( Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78537 Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit c5828b0599a5c00ebab488b795c63a21f1dc53cd)
2014-05-16glsl: simplify the M_PI*f macros, fixes build on OpenBSDJonathan Gray1-5/+3
The M_PI*f macros used a preprocessor paste to append 'f' to M_PI defines, which works if the values are only numbers but breaks on OpenBSD where M_PI definitions have casts and brackets to meet requirements of a future version of POSIX, http://austingroupbugs.net/view.php?id=801 http://austingroupbugs.net/view.php?id=828 Simplify the M_PI*f macros by using casts directly in the defines as suggested by Kenneth Graunke. Cc: "10.2" <mesa-stable@lists.freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78665 Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Jonathan Gray <jsg@jsg.id.au> (cherry picked from commit 0c0bbe77d0f92acf34c4582207b9def2e2fe308d)
2014-05-16i965: Don't _swrast_BlitFramebuffer when doing CopyTexSubImage.Kenneth Graunke1-1/+1
The point of copytexsubimage_using_blit_framebuffer is to use a hardware accelerated BlitFramebuffer path. If that fails, we shouldn't do a swrast blit---we should try our CTSI fallback code. This is especially important for i965 and GLES, where we don't even create a swrast context. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77705 Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz> Cc: "10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit bd44ac8b5ca08016bb064b37edaec95eccfdbcd5)
2014-05-16wayland: Move version 2 request to end of interface specificationKristian Høgsberg1-16/+19
We're moving towards requiring interface additions to be appended to the end of the interface block. No functional change, opcodes are assigned as before, but version 2 additions are now grouped together, which prevents a scanner warning. Cc: "10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> (cherry picked from commit 06842d436e163836de9532cd06029d165ea2e049)
2014-05-16meta: Refactor configuration of renderbuffer samplingTopi Pohjolainen2-13/+30
Cc: "10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 4dc9c314c89c011aee3c33997cbc9cd6bc78674f)
2014-05-16meta: Refactor binding of renderbuffer as texture imageTopi Pohjolainen2-30/+47
Cc: "10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit a2952315ac2c97311c0a967bf1c337a6c0b82a2f)
2014-05-16meta: Merge compiling and linking of blit programTopi Pohjolainen3-31/+39
Cc: "10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit ac4db0aa559ac07262d977f35915953f97875333)
2014-05-16i965/blorp: Expose coordinate scissoring and mirroringTopi Pohjolainen4-118/+213
Cc: "10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 3a43cd0c3e611085347f67976a619b915dff07b7)
2014-05-16i965/gen8: Use helper variables for surface parametersTopi Pohjolainen1-4/+8
Cc: "10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 4a92ad553111729dc4b5b02e47477133e7219131)
2014-05-14i965/gen8: Set depth extent fieldJordan Justen1-1/+1
The depth extent field is used to limit the allowed slice range that can be rendered to. With the previous setting, only slice 0 could be rendered. This fixes piglit amd_vertex_shader_layer-layered-depth-texture-render. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz> (cherry picked from commit c51c19289106a2ac2a962ce342dd97f1564807a6)
2014-05-14i965/gen8 depth: Set depth size based on LOD0 for 3D texturesJordan Justen1-2/+2
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz> (cherry picked from commit 294ada2fefb67f2bae272a313af0d40f18f24e20)
2014-05-14i965/gen7 depth: Set depth size based on LOD0 for 3D texturesJordan Justen1-2/+2
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz> (cherry picked from commit e6d6ed55ab92f657dec49b3e1d939a34a1225919)
2014-05-14i965/gen8 renderbuffer: Set depth size based on LOD0 for 3D texturesJordan Justen1-1/+1
Fixes piglit's 'gl-3.2-layered-rendering-clear-color-all-types 3d mipmapped' Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz> (cherry picked from commit e47d08adef06a3ccb57a6672c878b4e5fbdf5c0b)
2014-05-14i965/gen7 renderbuffer: Set depth size based on LOD0 for 3D texturesJordan Justen1-1/+1
If blorp is disabled for color clears, then piglit's 'gl-3.2-layered-rendering-clear-color-all-types 3d mipmapped' will fail. Currently, gen8 fails similarly on this test because gen8 does not use blorp. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz> (cherry picked from commit b875f39e2967fa383e2c896bc354429fe10cd7a5)
2014-05-14i965/Gen8: Set up layer constraints properly for depth buffersChris Forbes1-9/+6
Same issues as the previous commit fixed for Gen7: - Bogus physical->logical layer conversion; depth/stencil surfaces are still IMS layout on Gen8. - mt_layer ignored in layered rendering case, which breaks handling of views with MinLayer. - Render target array extent not set correctly for arrays. I'm not able to test this one since I can't get a Broadwell yet, but it's the same set of fixes as for Gen7. V2: Restore the MAX2() to account for zero depth/layer_count. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 23e9f06569f58062820ab058d8057e9325042105)
2014-05-14i965/Gen7: Set up layer constraints properly for depth buffersChris Forbes1-9/+6
Again, a few problems: - Layered attachments did not honor MinLayer. - Non-layered MSAA attachments rendered to the wrong layer due to dividing by the layer count. All depth buffers use the IMS layout, so the physical layer count == logical layer count. - Layered attachments were not limited to irb->layer_count, so we could render off the end of the texture. V2: Restore the MAX2() to account for zero depth/layer_count. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 77d55ef4819436ebbf9786a1e720ec00707bbb19)
2014-05-14i965/Gen8: Set up layer constraints properly for renderbuffersChris Forbes1-10/+5
Fixing the same issues the previous commit does for Gen7. Note that I can't test this one, since I don't have a Broadwell. V2: Restore the MAX2() to account for zero depth/layer_count. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 9269ea599cf8b22577fe4dc5996535f2cc0b7950)
2014-05-14i965/Gen7: Set up layer constraints properly for renderbuffersChris Forbes1-10/+7
There were a few problems here, which mostly just broke layered rendering into a view: - Render target view extent was always set to be == depth. This is benign for non-layered-rendering, but allows writes off the end of the render target for layered rendering, which ends badly. - Layered rendering did not honor the mt_layer setting, so would not properly handle MinLayer being set on a view. V2: Restore the MAX2() to account for zero depth/layer_count. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit dd43900b7bb3bec0b136bb244a04841123575467)
2014-05-13nv50,nvc0: fix blit 3d path for 1d array texturesIlia Mirkin1-0/+6
Need to adjust coordinates since the shader receives the array index as depth in z, but the TEX instruction expects it to be the second coordinate for a 1D array texture. This fixes fbo-generatemipmap-array. 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 8baed872126b331aa8d789b78986c0100c6d853a)
2014-05-13nv50,nvc0: leave queries on during blit, turn them on for 2d engineIlia Mirkin6-6/+35
Fixes the new logic of the conditional rendering piglit test. 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 4467c0c9fbf2c13b6c73a002e8247448ee12d4c4)
2014-05-13mesa/st: leave current query enabled during glBlitFramebufferIlia Mirkin3-0/+4
Also make sure that pipe_blit_info gets zero'd out so that query isn't accidentally left enabled. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Marek Olšák <marek.olsak@amd.com> (cherry picked from commit 64a7ddf40de45ad964502c3b05392b0190464177)
2014-05-13gallium: add bit to pipe_blit_info to leave current query enabledIlia Mirkin1-0/+3
Previously the implication was that queries should be disabled during blits. However glBlitFramebuffer() is supposed to obey the current query, and this new bit will indicate that to the driver. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Marek Olšák <marek.olsak@amd.com> (cherry picked from commit 752ce0affb1bc45a3caa67b7a2788eec30a9f85f)
2014-05-13nv50: fix setting of texture ms info to be per-stageIlia Mirkin3-6/+10
Different textures may be bound to each slot for each stage. So we need to be able to upload ms parameters for each one without stages overwriting each other. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Ben Skeggs <bskeggs@redhat.com> Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 863573b9cbeb26722fe7bdfbcc4ca6bffdc7dbf6)
2014-05-13nv50/ir: make sure to reverse cond codes on all the OP_SET variantsIlia Mirkin1-1/+2
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Ben Skeggs <bskeggs@redhat.com> Cc: "10.2 10.1" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 68f47cad0d23281309741cc47eeaa26ebbb41bca)
2014-05-13Add .cherry-ignore fileIan Romanick1-0/+3
e696727 adds a change, and 155f98d reverts that change. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2014-05-09mesa: Bump version to 10.2-rc2Ian Romanick1-1/+1
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2014-05-09glx/tests: Partially revert commit 51e3569573a7b3f8da0df093836761003fcdc414Emil Velikov1-3/+3
C++ does not support designated initializers, thus compilation is not guaranteed to succeed. Surprisingly gcc 4.6.3 fails to build the code, while version 4.9.0 compiles it without a hitch. Cc: "10.2" <mesa-stable@lists.freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78403 Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Tested-by: Vinson Lee <vlee@freedesktop.org> (cherry picked from commit 326b8e253e5ee2e09e54ad46d8370a6e8c8d46da)
2014-05-09configure: error out if building GBM without driEmil Velikov1-0/+7
Both backends require --enable-dri, and building an empty libgbm makes little to no sense. Error out at configure to prevent the user from shooting themselves in the foot. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78225 Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit e477d12c3396ded1607b6f57c15e100ca08f44f5)
2014-05-09i965: Fix GPU hangs on Broadwell in shaders with some control flow.Kenneth Graunke1-7/+7
According to the documentation, we need to set the source 0 register type to IMM for flow control instructions that have both JIP and UIP. Fixes GPU hangs in approximately 10 Piglit tests, 5 es3conform tests, Unigine Crypt, a WebGL raytracer demo, and several Steam titles. Cc: "10.2" <mesa-stable@lists.freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75478 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75878 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76939 Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Tested-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Tested-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com> (cherry picked from commit 9584959123b0453cf5313722357e3abb9f736aa7)
2014-05-09radeonsi: Enable geometry shaders with LLVM 3.4.1Tom Stellard4-9/+13
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> CC: "10.1 10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 93c2ebbd83604263fa46351a7efcde382322024b)
2014-05-09configure.ac: Add LLVM_VERSION_PATCH to DEFINESTom Stellard1-1/+7
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> CC: "10.1 10.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit c5d000832579c17fdeff7ec8aaf7430d9b2e1049)
2014-05-09st/xa: Fix performance regression introduced by commit "Cache render target ↵Thomas Hellstrom1-1/+1
surface" The mentioned commit has the nasty side-effect of turning off accelerated copies. Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@vmware.com> Reviewed-by: Rob Clark <robdclark@gmail.com> (cherry picked from commit 9306b7c171b29ac99f837e9efcd0281caf1d332e)
2014-05-09clover: Destory pipe_screen when device does not support compute v2Tom Stellard1-1/+4
v2: - Make sure screen was successfully created before destroying it. Cc: "10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Francisco Jerez <currojerez@riseup.net> (cherry picked from commit c5f0c98c49a78777b2564a53028e345195ef275f)
2014-05-09pipe-loader: Don't destroy the winsys in the sw loaderTom Stellard1-3/+0
The screen takes ownership of the winsys, and is responsible for destroying it. Users of pipe-loader should make sure they destory and screens they've created to avoid memory leaks. This fixes a crash in clover introduced by ce6c17c0833032e91a2d1b34f9eb80c738a854a2 where the pipe-loader was destroying the winsys while a screen was still using it. Cc: "10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> (cherry picked from commit c650033b863c3ac8388ff1b192b476f63cf81202)
2014-05-09draw: do not use draw_get_option_use_llvm() inside draw execution pathsRoland Scheidegger5-12/+12
1c73e919a4b4dd79166d0633075990056f27fd28 made it possible to not allocate the tgsi machine if llvm was used. However, draw_get_option_use_llvm() is not reliable after draw context creation, since drivers can explicitly request a non-llvm draw context even if draw_get_option_use_llvm() would return true (and softpipe does just that) which leads to crashes. Thus use draw->llvm to determine if we're using llvm or not instead (and make draw->llvm available even if HAVE_LLVM is false so we don't have to put even more ifdefs). Cc: "10.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 9af68e9b1d116cdc8eb6a22bac091fe4716679e6)
2014-05-09mesa: Fix MaxNumLayers for 1D array textures.Kenneth Graunke1-0/+2
1D array targets store the number of slices in the Height field. Cc: "10.2 10.1 10.0" <mesa-stable@lists.freedesktop.org> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> (cherry picked from commit 5c399ca8e4ccae509a5116b3b9f41634a7ca4322)