URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b0bce4c7831ffb1706fbbc51dc23cefd51022692 Author: Marek Olšák <marek.ol...@amd.com> Date: Sat Aug 29 22:59:23 2015 +0200
radeonsi: fix a Unigine Heaven hang when drirc is missing Cc: 10.6 11.0 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> Acked-by: Christian König <christian.koe...@amd.com> (cherry picked from commit 9b510a9652297a63677f1d55b2bf444694fd94e1) Conflicts: src/gallium/drivers/radeonsi/si_shader.h src/gallium/drivers/radeonsi/si_state_shaders.c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2cdcc8b29f50ea89188cff877bec79ce1beee02 Author: Dave Airlie <airl...@redhat.com> Date: Tue Sep 1 12:29:58 2015 +1000 r600g: fix calculation for gpr allocation I've been chasing a geom shader hang on rv635 since I wrote r600 geom code, and finally I hacked some values from fglrx in and I could run texelfetch without failures. This is totally my fault as well, maths fail 101. This makes geom shaders on r600 not fail heavily. Cc: "10.6" "11.0" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> Reviewed-by: Edward O'Callaghan <eocallag...@alterapraxis.com> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 0de53ccc8cbee0f63ba25c9e72664b3cbd31be54) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bfc5ed5322f37e0673234e95eb2b6e6538441966 Author: Dave Airlie <airl...@redhat.com> Date: Mon Aug 31 14:22:23 2015 +1000 r600/sb: update last_cf for finalize if. As Glenn did for finalize_loop we need to update_cf when we add a POP at the end of a shader. I think this fixes one of the earlier shader going off end of memory problems we've stopped. Reviewed-by: Glenn Kennard <glenn.kenn...@gmail.com> Cc: "10.6" "11.0" <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 3063913f77cd2db1a263cb824a5c8c3dcc1a51a0) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3db7a7e814a7d9b75a13450fd51389987bac8f9e Author: Daniel Scharrer <dan...@constexpr.org> Date: Fri Aug 28 11:45:35 2015 +0200 mesa: add missing queries for ARB_direct_state_access This adds index queries (glGet*i_v) for GL_TEXTURE_BINDING_* and GL_SAMPLER_BINDING, as well as textue queries (glGetTex{,ture}Parameter*) for GL_TEXTURE_TARGET. CC: "10.6 11.0" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Fredrik Höglund <fred...@kde.org> Signed-off-by: Fredrik Höglund <fred...@kde.org> (cherry picked from commit 5aaaaebf22c920745d577c49e463d23b90ba5ea8) Conflicts: src/mesa/main/texparam.c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b968dde1eae5cb205851eb26980828f790f218d Author: Ilia Mirkin <imir...@alum.mit.edu> Date: Thu Aug 27 15:28:24 2015 -0400 mesa: only copy the requested teximage faces Cube maps are special in that they have separate teximages for each face. We handled that by copying the data to them separately, but in case zoffset != 0 or depth != 6 we would read off the end of the client array or modify the wrong images. zoffset/depth have already been verified by the time the code gets to this stage, so no need to double-check. Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> Reviewed-by: Brian Paul <bri...@vmware.com> Cc: "10.6 11.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 2259b111003f2e8c55cae42677ec45345fb1b6e3) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a85a781dad23080c880d5514be2e8442f6de2463 Author: Jason Ekstrand <jason.ekstr...@intel.com> Date: Wed Aug 19 14:29:53 2015 -0700 i965/fs: Split VGRFs after lowering pull constants The split_virtual_grfs code doesn't properly rewrite reladdr so we need to make sure that any uniform indirects are lowered away first. This fixes the glsl-fs-uniform-indexed-by-swizzled-vec4.shader_test in piglit Cc: "10.6" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (cherry picked from commit fee0c5af11dd0995de96e7053377d425a66d03a0) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c759491e8150810dba09fa446e1f5a8e66be2488 Author: Marek Olšák <marek.ol...@amd.com> Date: Mon Aug 24 00:22:37 2015 +0200 mesa: create multisample fallback textures like normal textures This works if drivers upsample on upload (like all radeon ones do). The alternative is an unexpected GL error from anything calling _mesa_update_state and possibly other issues. Cc: 10.6 11.0 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit f432ae899fb81468778dbeb17ac7615da3ed5c0d) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d93f14ec8ec37410b265967876696508dffc9146 Author: Dave Airlie <airl...@redhat.com> Date: Wed Jul 29 18:09:44 2015 +1000 mesa: enable texture stencil8 for multisample This fixes GL45-CTS.gtf44.GL31Tests.texture_stencil8.texture_stencil8_gl44 from the ogl conform suite. Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu> Cc: 10.6 11.0 <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 529acab22a3e21e0ed0c5243675aec6c0ee27e8f) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ed069d5bce5aaf21df97eec86b958e9c4bb7f97 Author: Chris Wilson <ch...@chris-wilson.co.uk> Date: Sun Aug 23 09:24:57 2015 +0100 i965: Always re-emit the pipeline select during invariant state emission On the older platforms where we don't have logical contexts preserving state across batches, we emit the invariant state setup on every batch using the brw_invariant_state atom. This includes the pipeline selection which is cached with the introduction of commit 0e0e23ef537c9add672ff322f34e129a07edc55e Author: Jordan Justen <jordan.l.jus...@intel.com> Date: Wed Apr 22 11:43:50 2015 -0700 i965/state: Emit pipeline select when changing pipelines However, we do not reset the cache between batches on context-less platforms resulting in us not setting the pipeline selection and can cause GPU hangs if a media pipelined was loaded in the meantime (e.g. mixing mplayer/gstreamer using libva and gnome-shell). A simple solution is to just forcibly re-emit the pipeline select along with the invariant state and reset the cache at that point. Reported-and-tested-by: Tomasz C. <toma...@o2.pl> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91254 Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> Cc: Jordan Justen <jordan.l.jus...@intel.com> Cc: Kenneth Graunke <kenn...@whitecape.org> Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com> Cc: "10.6 11.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 4e5752e2b78243a71766538f62ca0a80488047a7) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0c7866eb90c235e16c64c93e97c8ca0a5ee1fc4 Author: Tapani Pälli <tapani.pa...@intel.com> Date: Mon Jun 29 15:23:45 2015 +0300 glsl: create program resource list after LinkShader Resource list can be created properly only after LinkShader hook has been called to make sure all dead variables have been removed. Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Martin Peres <martin.pe...@linux.intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90925 (cherry picked from commit f045b8b2ff5ac75da3e092f482fd1717571d8462) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=792a07075b8613c5020ff26ae0ba31d57a5c822c Author: Tapani Pälli <tapani.pa...@intel.com> Date: Mon Jun 29 14:39:05 2015 +0300 glsl: expose build_program_resource_list function This is required so that we can move resource list creation to happen later. Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Martin Peres <martin.pe...@linux.intel.com> (cherry picked from commit 73afa31f07fe4af605088f6590edc4227652c482) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b9ea26d7fe46b038adc05c6a93c077fbbaf17d4 Author: Tapani Pälli <tapani.pa...@intel.com> Date: Mon Jun 29 14:19:00 2015 +0300 glsl: build stageref mask using IR, not symbol table Instead of using symbol table, build mask by inspecting IR. This change is required by further patches to move resource list creation to happen later when symbol table does not exist anymore. Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Martin Peres <martin.pe...@linux.intel.com> (cherry picked from commit ccaf37f4496eb836866c9daacf21f1f5ac8c6d66) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=90f74f1c0e6dbb1edb48941c3a5b427bce846584 Author: Dave Airlie <airl...@redhat.com> Date: Tue Sep 1 15:57:02 2015 +1000 mesa/readpixels: check strides are equal before skipping conversion The CTS packed_pixels test checks that readpixels doesn't write into the space between rows, however we fail that here unless we check the format and stride match. This fixes all the core mesa problems with CTS packed_pixels tests. Cc: "11.0" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 32769ac016dee4ce5767a922f91de47df4ce984d) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a4aa31b22461a139537ed0658beb3ad383c0be44 Author: Dave Airlie <airl...@redhat.com> Date: Tue Sep 1 15:44:46 2015 +1000 texcompress_s3tc/fxt1: fix stride checks (v1.1) The fastpath currently checks the RowLength != width, but if you have a RowLength of 7, and Alignment of 4, then that shouldn't match. align the rowlength to the pack alignment before comparing. This fixes compressed cases in CTS packed_pixels_pixelstore test when SKIP_PIXELS is enabled, which causes row length to get set. v1.1: add fxt1 fix (Iago) Cc: "11.0" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit b4a70401f52e5d7e08c94715b250ea1de8f63d15) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=65cc30d7281b831fc5baede4b7757e9a5257b27e Author: Dave Airlie <airl...@redhat.com> Date: Tue Sep 1 15:13:45 2015 +1000 st/readpixels: fix accel path for skipimages. We don't need to use the 3d image address here as that will include SKIP_IMAGES, and we are only blitting a single 2D anyways, so just use the 2D path. This fixes some memory overruns under CTS packed_pixels.packed_pixels_pixelstore when PACK_SKIP_IMAGES is used. Cc: "11.0" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 6a3e1fb958778e00e8fe2d860b6327fc4409c148) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=71fa292d4835c50343d4fab4ddf57f4c5b133b26 Author: Chris Wilson <ch...@chris-wilson.co.uk> Date: Sat Jun 6 09:33:33 2015 +0100 i965: Prevent coordinate overflow in intel_emit_linear_blit Fixes regression from commit 8c17d53823c77ac1c56b0548e4e54f69a33285f1 Author: Kenneth Graunke <kenn...@whitecape.org> Date: Wed Apr 15 03:04:33 2015 -0700 i965: Make intel_emit_linear_blit handle Gen8+ alignment restrictions. which adjusted the coordinates to be relative to the nearest cacheline. However, this then offsets the coordinates by up to 63 and this may then cause them to overflow the BLT limits. For the well aligned large transfer case, we can use 32bpp pixels and so reduce the coordinates by 4 (versus the current 8bpp pixels). We also have to be more careful doing the last line just in case it may exceed the coordinate limit. Reported-and-tested-by: kaillass...@hotmail.fr Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90734 Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> Cc: Kenneth Graunke <kenn...@whitecape.org> Cc: Ian Romanick <ian.d.roman...@intel.com> Cc: Anuj Phogat <anuj.pho...@gmail.com> Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Anuj Phogat <anuj.pho...@gmail.com> (cherry picked from commit d38a5601068ae1d923efece8f28757777f4474e4) [Emil Velikov: drop the extra INTEL_MIPTREE_TRMODE_NONE arguments] Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> Conflicts: src/mesa/drivers/dri/i965/intel_blit.c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=209394406e7b924178c4b192b67f4cc9fcb941ad Author: Marek Olšák <marek.ol...@amd.com> Date: Sun Aug 23 12:57:09 2015 +0200 gallium/radeon: fix the ADDRESS_HI mask for EVENT_WRITE CIK packets Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> (cherry picked from commit 437cb1e3f482570447501526927df4d80c845bf5) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f06559076fa0639222b2e3fa75ab906fc4cd85f Author: Glenn Kennard <glenn.kenn...@gmail.com> Date: Thu Aug 27 19:04:17 2015 +0200 r600g/sb: Don't crash on empty if jump target Signed-off-by: Glenn Kennard <glenn.kenn...@gmail.com> Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 608c7b4a63d5818f7ae0b3d48496b02cf8458d9b) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f92f4dea9a1ff6879f38348ff377d4445e1ef0d Author: Glenn Kennard <glenn.kenn...@gmail.com> Date: Thu Aug 27 19:04:16 2015 +0200 r600g/sb: Don't read junk after EOP Shaders that contain instruction data after an instruction with EOP could end up parsing that as an instruction, leading to various crashes and asserts in SB as it gets very confused if it sees for instance a loop start instruction jumping off to some random point. Add a couple of asserts, and print EOP bit if set in old asm printer. Signed-off-by: Glenn Kennard <glenn.kenn...@gmail.com> Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit a830225adbb77073272961df409885cca6b861ee) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a9310b8b12a63eccc57a245a0c0db46b81f028e Author: Glenn Kennard <glenn.kenn...@gmail.com> Date: Thu Aug 27 19:04:15 2015 +0200 r600g/sb: Handle undef in read port tracker e8e443 missed adding check for undef values also in unreserve function, leading to an assert triggering. Signed-off-by: Glenn Kennard <glenn.kenn...@gmail.com> Cc: <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 36f1999a87258603b6720d55e6020d5d24c215c9) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=278346a7d6493685e29ae1ba7d9c2658fa323453 Author: Dave Airlie <airl...@redhat.com> Date: Mon Aug 24 09:52:12 2015 +1000 mesa/texgetimage: fix missing stencil check GetTexImage can read to stencil8 but only from a stencil or depthstencil textures. This fixes a bunch of failures in CTS GL33-CTS.gtf32.GL3Tests.packed_pixels Reviewed-by: Marek Olšák <marek.ol...@amd.com> Cc: "11.0" <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit c1452983b44cc8ee238b8c7e2cfca1105c707487) [Emil Velikov: use glGetTex%sImage + suffix, instead of caller] Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a6b7e9dcd38c768dbcf19565b819889bcb20218 Author: Ilia Mirkin <imir...@alum.mit.edu> Date: Sun Aug 23 03:11:09 2015 -0400 nv50: fix 2d engine blits for 64- and 128-bit formats This fixes bin/ext_framebuffer_multisample-formats all_samples Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> Cc: "11.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit e18c29b03105567cf20bc235ce23cf08986cc537) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8427d56d96dd41bbc750a2aa019a9325ff14f55e Author: Dave Airlie <airl...@redhat.com> Date: Mon Jul 27 13:13:49 2015 +1000 mesa/arb_gpu_shader_fp64: add support for glGetUniformdv This was missed when I did fp64, I've sent a piglit test to cover the case as well. Reviewed-by: Timothy Arceri <t_arc...@yahoo.com.au> Cc: "11.0" <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dave Airlie <airl...@redhat.com> (cherry picked from commit 45971fd0df1cbfc400f89f2e8df206625b40d65f) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e0b333a6a476d1085d53d062a00ac32919bcb7ff Author: Ilia Mirkin <imir...@alum.mit.edu> Date: Sat Aug 22 23:59:50 2015 -0400 nv50,nvc0: disable depth bounds test on blit Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> Cc: "11.0" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit abbf05cfc2bea0787bcf710ef984d73ee8ba8f9e) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6dffbe9f3cec5d89ae5749bdd1746ae90dcbbe7 Author: Neil Roberts <n...@linux.intel.com> Date: Wed Aug 19 18:55:44 2015 -0700 i965/bdw: Fix 3DSTATE_VF_INSTANCING when the edge flag is used When the edge flag element is enabled then the elements are slightly reordered so that the edge flag is always the last one. This was confusing the code to upload the 3DSTATE_VF_INSTANCING state because that is uploaded with a separate loop which has an instruction for each element. The indices used in these instructions weren't taking into account the reordering so the state would be incorrect. v2: Use nr_elements instead of brw->vb.nr_enabled so that it will cope when gl_VertexID is used. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91292 Cc: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Ben Widawsky <b...@bwidawsk.net> Signed-off-by: Ben Widawsky <b...@bwidawsk.net> Tested-by: Mark Janes <mark.a.ja...@intel.com> (cherry picked from commit 3a1ab2348050fd32f41553b9febfd9972b5761aa) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=56c9b963768c4b808aa05b08c8c062c6267e22fd Author: Neil Roberts <n...@linux.intel.com> Date: Mon Jul 13 18:01:14 2015 +0100 i965: Swap the order of the vertex ID and edge flag attributes The edge flag data on Gen6+ is passed through the fixed function hardware as an extra attribute. According to the PRM it must be the last valid VERTEX_ELEMENT structure. However if the vertex ID is also used then another extra element is added to source the VID. This made it so the vertex ID is in the wrong register in the vertex shader and the edge attribute is no longer in the last element. v2: Also implement for BDW+ v3 [by Ben]: Remove 10.5 tag. Too late. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84677 Cc: <mesa-sta...@lists.freedesktop.org> Reviewed-by: Kristian Høgsberg <k...@bitplanet.net> Signed-off-by: Ben Widawsky <b...@bwidawsk.net> Tested-by: Ben Widawsky <b...@bwidawsk.net> Tested-by: Mark Janes <mark.a.ja...@intel.com> (cherry picked from commit fb02b4ec482762ccf2a9fedf24fe6f50787932a9) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b47e739f2fa721dfb2da5d70c37235cfb136d6d4 Author: Glenn Kennard <glenn.kenn...@gmail.com> Date: Sun Aug 23 01:01:31 2015 +0200 r600g: Fix assert in tgsi_cmp Fixes https://bugs.freedesktop.org/show_bug.cgi?id=91726 Signed-off-by: Glenn Kennard <glenn.kenn...@gmail.com> Cc: "11.0" <mesa-sta...@lists.freedesktop.org> Signed-off-by: Dave Airlie <airl...@gmail.com> (cherry picked from commit 50932268aad0cc21511f370793e77c76e038bd06) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf1c7b46e552d3f5e9e1b589df975b0e78f16c80 Author: David Heidelberg <da...@ixit.cz> Date: Sat Apr 11 00:13:53 2015 +0200 st/nine: Require gcc >= 4.6 Nine code uses some C11 features, and this leads to compile error on gcc <= 4.5 Another way would have been to use the -fms-extensions CFLAG Signed-off-by: David Heidelberg <da...@ixit.cz> Cc: "10.4 10.5 10.6" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 56717c0b069a20b0c4438ac1dc9280cd9026b36f) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=619163ca6a6e2f1693166b391610f28af1433432 Author: Ilia Mirkin <imir...@alum.mit.edu> Date: Thu Aug 20 20:06:50 2015 -0400 st/mesa: pass through 4th opcode argument in bitmap/pixel visitors Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> Cc: "10.6" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Marek Olšák <marek.ol...@amd.com> (cherry picked from commit 3525aa1dc9c27fb2394a37788a29c272b3a81d1b) [Emil Velikov: s/emit_asm/emit/] Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc2226214db0550961989b616f5fb88db34e9afe Author: Ilia Mirkin <imir...@alum.mit.edu> Date: Thu Aug 20 19:59:04 2015 -0400 st/mesa: fix assignments with 4-operand arguments (i.e. BFI) Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> Cc: "10.6" <mesa-sta...@lists.freedesktop.org> Reviewed-by: Marek Olšák <marek.ol...@amd.com> (cherry picked from commit 681efdf7a18b73ce06989cb2d3299e3feabdb5f5) [Emil Velikov: s/emit_asm/emit/] Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> Conflicts: src/mesa/state_tracker/st_glsl_to_tgsi.cpp URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ab8bd7d99a2f8e235b1a02b92847cba55a13054 Author: Tapani Pälli <tapani.pa...@intel.com> Date: Thu Aug 20 10:25:59 2015 +0300 mesa: update fbo state in glTexStorage We have to re-validate FBOs rendering to the texture like is done with TexImage and CopyTexImage. Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Anuj Phogat <anuj.pho...@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91673 Cc: "10.6" <mesa-sta...@lists.freedesktop.org> (cherry picked from commit 7eda897bf05dc572dbe83f3a1075b773b0c65708) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=38457285b755a879a953779702262fafd813d2b8 Author: Emil Velikov <emil.l.veli...@gmail.com> Date: Wed Sep 2 21:05:50 2015 +0100 get-pick-list.sh: Require explicit "10.6" for nominating stable patches A nomination unadorned with a specific version is now interpreted as being aimed at the 11,0 branch, which was recently opened. Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit