summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-10-04Revert "radeon/winsys: pad IBs to a multiple of 8 DWs"mesa-9.1.7Carl Worth1-30/+0
This reverts commit 4a8d1c5ef2f9c57a3c2feb829be3534ac43b9077. This commit causes compilation failures ("'SI' undeclared"), which, embarrassingly enough, I failed to notice earlier.
2013-10-04doc: Add releases notes for the upcoming 9.1.7 release.Carl Worth1-0/+166
Complete except for the md5sums, (which we cannot have generated yet).
2013-10-04Bump version to 9.1.7Carl Worth3-4/+4
Even remembering to fix MESA_PATCH this time, (which I had missed in the bump to 9.1.6).
2013-10-04mesa: Don't return any data for GL_SHADER_BINARY_FORMATSIan Romanick1-1/+1
We return 0 for GL_NUM_SHADER_BINARY_FORMATS, so GL_SHADER_BINARY_FORMATS should not write any data to the application buffer. Fixes piglit test 'arb_get_program_binary-overrun shader'. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com> (cherry picked from commit 0667e2c969c0931a1feee530508f8441a11bda32)
2013-10-04wayland-egl.pc requires wayland-client.pc.Torsten Duwe1-0/+1
Mesa provides the wayland-egl libs and the pkgconfig file, but the headers originate from the wayland package. Ensure everything matches, by requiring application builds to look at the wayland headers as well. Signed-off-by: Torsten Duwe <duwe@suse.de> Signed-off-by: Johannes Obermayr <johannesobermayr@gmx.de> (cherry picked from commit 3bc642cbf69b3ba71fc636d6120fc7ac0b83aecb)
2013-10-04st/gbm: Add $(WAYLAND_CFLAGS) for HAVE_EGL_PLATFORM_WAYLAND.Johannes Obermayr1-0/+1
(cherry picked from commit 87ebbe1270e203259f6036edc1d846f77fdfa61b)
2013-10-04meta: Set correct viewport and projection in decompress_texture_image.Kenneth Graunke1-0/+5
_mesa_meta_begin() sets up an orthographic project and initializes the viewport based on the current drawbuffer's width and height. This is likely the window size, since it occurs before the meta operation binds any temporary buffers. decompress_texture_image needs the viewport to be the size of the image it's trying to draw. Otherwise, it may only draw part of the image. v2: Actually set the projection properly too. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68250 Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Cc: Mak Nazecic-Andrlon <owlberteinstein@gmail.com> (cherry picked from commit 62411681da4d1b7f9417f34dbf92a3e79e24dc09)
2013-10-04cherry-ignore: Ignore last two patches in current get-pick-list outputCarl Worth1-0/+6
Neither of these are suitable for 9.1 for now. For both patches, the original authors of the patch have been emailed.
2013-10-04Update get-pick-list to look specifically for "9.1" in NOTECarl Worth1-1/+1
We previously adjusted this script so that the new-style markup, (with CC) would only trigger if it specifically mentioned "9.1", but the old-style markup (with "NOTE:") was always triggering. Fix it to look for "9.1" as well. This removes several patches from the current output.
2013-10-03glx: Initialize OpenGL version to 1.0Rico Schüller3-14/+14
The old code in dri2_glx suffered from a typographical error that caused the default version to be 2.1 instead of 1.2 (minimum required by the Linux OpenGL ABI). drisw_glx had a similar error resulting in a default version of 0.1. Some driver/card combinations (r200/RV280, i915/915G) don't support OpenGL 2.1. These create in some corner cases an indirect context instead of a direct context when calling glXCreateContextAttribsARB(). This happens because of a bad default value. To avoid this, just used the default value specified by the GLX_ARB_create_context specification: "The default values for GLX_CONTEXT_MAJOR_VERSION_ARB and GLX_CONTEXT_MINOR_VERSION_ARB are 1 and 0 respectively. In this case, implementations will typically return the most recent version of OpenGL they support which is backwards compatible with OpenGL 1.0 (e.g. 3.0, 3.1 + GL_ARB_compatibility, or 3.2 compatibility profile)" Refactor all the default value setting to dri2_convert_glx_attribs, and make sure the correct defaults are set in that one place. Signed-off-by: Rico Schüller <kgbricola@web.de> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Bugzilla http://bugs.winehq.org/show_bug.cgi?id=34238 Cc: "9.1 9.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 8b302e1635534bfc6ed3ad671f2428470b3a765d) Conflicts: src/glx/dri2_glx.c src/glx/dri_common.c src/glx/drisw_glx.c
2013-10-03glsl: Move and refine test for unsized arrays in GLSL ESIan Romanick1-6/+27
GLSL ES does not allow unsized arrays, and GLSL ES 1.00 does not allow array initializers. However, GLSL ES 3.00 allows array initializers, and the initializer can explicitly size the array. The specification even includes some examples of this: float x[] = float[2] (1.0, 2.0); // declares an array of size 2 float y[] = float[] (1.0, 2.0, 3.0); // declares an array of size 3 float a[5]; float b[] = a; Move the unsized array check to after the initializer has been processed. If the array is still unsized, generate the error. This should have no effect in GLSL ES 1.00 because, as previously mentioned, array initializers are not allowed. Fixes piglit "glsl-es-3.00 compiler array-sized-by-initializer.vert". Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Cc: "9.1 9.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 42624b1c8145375f987e380bb78456658f845a17) Conflicts: src/glsl/ast_to_hir.cpp
2013-10-03mesa: Generate a renderbuffer wrapper even if the texture has no imageIan Romanick1-2/+3
This prevents a segfault in check_begin_texture_render when an FBO is rebound while in this state. This fixes the piglit test fbo-incomplete-invalid-texture. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Cc: "9.1 9.2" mesa-stable@lists.freedesktop.org (cherry picked from commit 2f9fe2d80a35b8857682771fddbee628213da7b3) Conflicts: src/mesa/main/fbobject.c
2013-10-03mesa: Don't call driver RenderTexture for invalid zoffsetIan Romanick1-0/+6
This fixes the segfault in the 'invalid slice of 3D texture' and 'invalid layer of an array texture' subtests of piglit's fbo-incomplete test. The 'invalid layer of an array texture' subtest still fails. v2: Fix off-by-one comparison error noticed by Chris Forbes. Also, 1D_ARRAY textures have Depth == 1. Instead, compare against Height. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> [v1] Cc: "9.1 9.2" mesa-stable@lists.freedesktop.org (cherry picked from commit 41485fea7c6061cca9d2706f39fa425da291b260)
2013-10-03mesa: Don't call driver RenderTexture for really broken texturesIan Romanick1-2/+20
This fixes the segfault in the '0x0 texture' subtest of piglit's fbo-incomplete test. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Cc: "9.1 9.2" mesa-stable@lists.freedesktop.org (cherry picked from commit fb49713f8ed099559d255403dc1065a06305e0d8) Conflicts: src/mesa/main/fbobject.c
2013-10-02mesa: Remove all traces of GL_OES_matrix_getIan Romanick3-12/+0
I believe this extension was enabled by accident. As far as I can tell, there has never been any code in Mesa to actually support it. Not only that, this extension is only useful in the common-lite profile, and Mesa does the common profile. This "fixes" the piglit test oes_matrix_get-api. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Cc: "9.1 9.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 3e1fdf389918b3488f06116c1837594d469dbaa2)
2013-10-02Use -Bsymbolic when linking libEGL.soCarl Worth1-1/+1
For some reason that I don't yet fully understand, Glaze does not work with libEGL unless libEGL is linked with -Bsymbolic.[*] Beyond that specific reason, all of the reasons for which libGL.so is linked with -Bsymbolic, (see the commit history), should also apply here. [*] The specific behavior I am seeing is that when Glaze calls dlopen for libEGL.so, ifunc resolvers within Glaze for EGL functions are called before the dlopen returns. These resolvers cannot succeed, as they need the return value from dlopen in order to find the functions to resolve to. I don't know what's causing these resolvers to be called, but I have verified that linking libEGL with -Bsymbolic causes this problematic behavior to stop. CC: "9.1 and 9.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Chad Versace <chad.versace@linux.intel.com> (cherry picked from commit 9baf35de5cd4a0d832ee185afb709868fd55bc93)
2013-10-02i965/gen4: Fix fragment program rectangle texture shadow compares.Eric Anholt1-4/+4
The rescale_texcoord(), if it does something, will return just the GLSL-sized coordinate, leaving out the 3rd and 4th components where we were storing our projected shadow compare and the texture projector. Deref the shadow compare before using the shared rescale-the-coordinate code to fix the problem. Fixes piglit tex-shadow2drect.shader_test and txp-shadow2drect.shader_test Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=69525 NOTE: This is a candidate for stable branches. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 938956ad52bc7659212b5877080967d4af0aad81)
2013-10-02radeon/winsys: pad IBs to a multiple of 8 DWsAlex Deucher1-0/+30
This aligns the gfx, compute, and dma IBs to 8 DW boundries. This aligns the the IB to the fetch size of the CP for optimal performance. Additionally, r6xx hardware requires at least 4 DW alignment to avoid a hw bug. This also aligns the DMA IBs to 8 DW which is required for the DMA engine. This alignment is already handled in the gallium driver, but that patch can be removed now that it's done in the winsys. Reviewed-by: Marek Olšák <marek.olsak@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> CC: "9.2" <mesa-stable@lists.freedesktop.org> CC: "9.1" <mesa-stable@lists.freedesktop.org> (cherry picked from commit a81beee37e0dd7b75422448420e8e8b0b4b76c1e)
2013-10-02nvc0: fix blitctx memory leakJoakim Sindholt3-0/+9
Cc: "9.2 and 9.1" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 2a7762bdb62faa1d54c445fcec7733cf6f690ac5)
2013-10-02nvc0/ir: fix use after free in texture barrier insertion passTiziano Bacocco1-1/+2
Fixes crash with Amnesia: The Dark Descent. Cc: "9.2 and 9.1" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 7086636358b611a2bb124253e1fe870107e1cecb)
2013-10-02nouveau: initialise the nouveau_transfer mapsEmil Velikov1-0/+2
Cc: "9.2 and 9.1" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> (cherry picked from commit dc10251d086576a007c77b7ca7854f5fe8c7e134)
2013-10-02i965/fs: Gen4: Zero out extra coordinates when using shadow compareChris Forbes1-1/+7
Fixes broken rendering if these MRFs contained anything other than zero. NOTE: This is a candidate for stable branches. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit f35dea05b1329b9303a11fb803897fb189ff99b4)
2013-10-02glsl: Use alignment of container record for its first fieldIan Romanick2-2/+28
The first field of a record in a UBO has the aligment of the record itself. Fixes piglit vs-struct-pad, fs-struct-pad, and (with the patch posted to the piglit list that extends the test) layout-std140. NOTE: The bit of strangeness with the version of visit_field without the record_type poitner is because that method is pure virtual in the base class. The original implementation of the class did this to ensure derived classes remembered to implement that flavor. Now they can implement either flavor but not both. I don't know a C++ way to enforce that. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Paul Berry <stereotype441@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68195 Cc: "9.2 9.1" mesa-stable@lists.freedesktop.org (cherry picked from commit 574e4843e9e26aa6affa31c80ac42f745b68268b)
2013-10-02glsl: Add new overload of program_resource_visitor::visit_field methodIan Romanick2-10/+48
The outer-most record is passed into the visit_field method for the first field. In other words, in the following structure: struct S1 { vec4 v; float f; }; struct S { S1 s1; S1 s2; }; uniform Ubo { S s; }; s.s1.v would get record_type = S (because s1.v is the first non-record field in S), and s.s2.v would get record_type = S1. s.s1.f and s.s2.f would get record_type = NULL becuase they aren't the first field of anything. This new overload isn't used yet, but the next patch will add several uses. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Paul Berry <stereotype441@gmail.com> Cc: "9.2 9.1" mesa-stable@lists.freedesktop.org (cherry picked from commit 5ac884fd9f213baed1de52eb7d17b86455c48a02)
2013-10-02meta: Fix blitting a framebuffer with renderbuffer attachmentAnuj Phogat1-10/+15
This patch fixes a case of framebuffer blitting with renderbuffer as color attachment and GL_LINEAR filter. Meta implementation of glBlitFrambuffer() converts source color buffer to a texture and uses it to do the scaled blitting in to destination buffer. Using the exact source rectangle to create the texture does incorrect linear filtering along the edges. This patch makes the changes to extend the texture edges by one pixel in x, y directions. This ensures correct linear filtering. It fixes failing piglit fbo-attachments-blit-scaled-linear test. Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> CC: "9.2" <mesa-stable@lists.freedesktop.org> CC: "9.1" <mesa-stable@lists.freedesktop.org> Reviewed-by: Paul Berry <stereotype441@gmail.com> (cherry picked from commit d944a6144f6ee6a0b24126ce72de280db90038c9)
2013-10-02nv30: remove no-longer-used formats from tableIlia Mirkin1-3/+0
Commit 14ee790df77 removed the formats from the vtxfmt_table but forgot to also update the info_table. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "9.2 and 9.1" <mesa-stable@lists.freedesktop.org> (cherry picked from commit c1a6f59b20dab380b77ad1375062f9987cad9183)
2013-10-02mesa/vbo: Fix handling of attribute 0 in non-compatibilty contextsIan Romanick1-23/+59
It is only in OpenGL compatibility-style contexts where generic attribute 0 and GL_VERTEX_ARRAY have a bizzare, aliasing relationship. Moreover, it is only in OpenGL compatibility-style contexts and OpenGL ES 1.x where one of these attributes provokes the vertex. In all other APIs each implicit call to glArrayElement provokes a vertex regardless of which attributes are enabled. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Robert Bragg <robert@sixbynine.org> Cc: "9.0 9.1 9.2" <mesa-stable@lists.freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55503 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66292 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67548 (cherry picked from commit 41eef83cc030e7087b79b0070d00fbc56538fb81)
2013-10-02nv30: U8_USCALED only works for size 4Ilia Mirkin1-3/+0
See https://bugs.freedesktop.org/show_bug.cgi?id=61635 for a sample program. Changing it to use a vec4 makes it work. Remove the unsupported formats. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "9.2 and 9.1" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 14ee790df77c810f187860a8d51096173ff39fcf)
2013-10-02r600g: disable GPUVM by defaultAlex Deucher1-1/+1
Cayman and trinity systems still seem to suffer from stability problems with GPUVM. This also fixes compute on these asics. It can still be enabled for testing by setting env var RADEON_VA=true. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=65958 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> CC: "9.2" <mesa-stable@lists.freedesktop.org> CC: "9.1" <mesa-stable@lists.freedesktop.org> Reviewed-by: Christian König <christian.koenig@amd.com> (cherry picked from commit c88783047e2a0faa39d6f3ac6fbd3f26a480d5d3)
2013-10-02nv50: handle pure integer vertex attributesEmil Velikov2-2/+14
And as a side effect fix a crash in the following piglit test: general/attribs GL3 Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Cc: "9.2 and 9.1" mesa-stable@lists.freedesktop.org (cherry picked from commit 07c8f7a6f8dfe724c1ae92ec45dd04532b6fd453)
2013-10-02mesa: Validate the layer selection of an array texture tooIan Romanick1-4/+30
Previously only the slice of a 3D texture was validated in the FBO completeness check. This fixes the failure in the 'invalid layer of an array texture' subtest of piglit's fbo-incomplete test. v2: 1D_ARRAY textures have Depth == 1. Instead, compare against Height. v3: Handle CUBE_MAP_ARRAY textures too. Noticed by Marek. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Cc: "9.1 9.2" mesa-stable@lists.freedesktop.org (cherry picked from commit 25281fef0f480260c2e180e70af3eafdd5ecc9cd)
2013-10-02mesa: Remove stray debug printfs in attachment completeness codeIan Romanick1-2/+0
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Cc: "9.1 9.2" mesa-stable@lists.freedesktop.org (cherry picked from commit 0c3dbd689b3269c605ee07589a35af9147db5fe0)
2013-09-05nvc0: restore viewport after blitMaarten Lankhorst3-4/+8
Based on calim's original fix in the nine branch. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Cc: "9.2 and 9.1" <mesa-stable@lists.freedesktop.org> (cherry picked from commit ad4dc7723199b3052231f5b4aed1bd1ba1505025) Conflicts: src/gallium/drivers/nvc0/nvc0_context.h
2013-08-02mesa: Fix MESA_PATCH versionAndreas Boll1-1/+1
2013-08-02docs: Fix a typo in the 9.1.6 release notesAndreas Boll1-1/+1
2013-08-01docs: Add 9.1.6 release md5sumsCarl Worth1-1/+3
2013-08-01docs: Add release notes for 9.1.6 releasemesa-9.1.6Carl Worth1-0/+166
2013-08-01Bump version to 9.1.6Carl Worth3-3/+3
2013-08-01get-pick-list: Ignore commits which CC mesa-stable unless they say "9.1"Carl Worth1-1/+1
With the recent creation of the 9.2 branch, we're now seeing a steady flow of new patches to mesa-stable@ intended for that branch. To avoid wasting effort trying to apply these to 9.1, we now require developers to specifically mention "9.1" to target the 9.1 branch.
2013-08-02i965/vs: Gen4/5: enable front colors if back colors are writtenChris Forbes1-0/+8
Fixes undefined results if a back color is written, but the corresponding front color is not, and only backfacing primitives are drawn. Results are still undefined if a frontfacing primitive is drawn, but that's OK. The other reasonable way to fix this would have been to just pick the one color slot that was populated, but that dilutes the value of the tests. On Gen6+, the fixed function clipper and triangle setup already take care of this. Fixes 11 piglits: spec/glsl-1.10/execution/interpolation/interpolation-none-gl_Back*Color-* NOTE: This is a candidate for stable branches. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 1ec66f2fb2fea0497efebc1db83c75ec95a816a4)
2013-07-31get-pick-list: Allow for non-whitespace between "CC:" and "mesa-stable"Carl Worth1-1/+1
We recently proposed a new syntax for stable-patch nominations such as: CC: "9.2 and 9.1" <mesa-stable@lists.freedesktop.org> and this has already appeared in the wild. So we extend the regular expression to pick this up as well.
2013-07-31i965/vs: Put lod parameter in the correct place for Gen4Chris Forbes1-1/+1
This was never visible before due to the bogus sampler state pointer. Fixes remaining vertex texturing breakage on Gen4. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Cc: mesa-stable@lists.freedesktop.org (cherry picked from commit cace82b0cdd9b93a21adbb5857f1f69ee0a2f925)
2013-07-31i965/vs: set up sampler state pointer for Gen4/5.Chris Forbes1-6/+21
Fixes broken filter and lod selection for vertex texturing. (txs/txf only worked properly because they ignore the sampler state completely) Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Cc: mesa-stable@lists.freedesktop.org (cherry picked from commit 97676032c28e20b4c4150c3632794f5bdaa9efad) Backported-by: Carl Worth <cworth@cworth.org> to compile on 9.1 branch.
2013-07-31egl: Restore "bogus" DRI2 invalidate event code.Eric Anholt1-0/+14
I had removed it in commit 1e7776ca2bc59a6978d9b933d23852d47078dfa8 because it was obviously wrong -- why do we care whether the server is a version that emits events, if we're not watching for the server's events, anyway? And why would you only invalidate on a server that emits invalidate events, when the comment said to emit invalidates if the server *doesn't*? Only, I missed that we otherwise don't flag that our buffers might have changed at swap time at all, so the driver was only checking for new buffers when triggered by the Viewport hack. Of course you don't expect Viewport to be called after a swap. So, this is effectively a revert of the previous commit, except that I dropped the check for only emitting invalidates on a new server -- we *always* need to invalidate if we're doing a SwapBuffers. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=63435 Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Cc: "9.1 and 9.2" <mesa-stable@lists.freedesktop.org> (cherry picked from commit eed0a80137dfac641adfd39ce316938dbcf2be10)
2013-07-31mesa: improve free() cleanup in generate_mipmap_compressed()Brian Paul1-10/+7
Free all our temporary buffers in one place at the end of the function. Fixes memory leak detected by Coverity. Note: This is a candidate for the 9.x branches Cc: mesa-stable@lists.freedesktop.org Reviewed-by: José Fonseca <jfonseca@vmware.com> (cherry picked from commit e5f32a0b3a9f8541f0c8ffc5f303612ac9963bb1)
2013-07-30get-pick-list.sh: Include commits mentionining "CC: mesa-stable..." in pick listCarl Worth1-1/+1
We recently adopted a new convention that patches can be nominated for the stable branch by including a line in the commit message as follows: CC: mesa-stable@lists.freedesktop.org This is a convenient syntax as "git send-email" will notice this line and automatically copy the resulting patch email to the mesa-stable mailing list. Here we extend the regular expression in the get-pick-list.sh script to also notice this pattern, (as well as the traditional "NOTE: This patch is a candidate..." form.
2013-07-30cherry-ignore: Drop 13 patches from the pick listCarl Worth1-0/+25
Each of these have recently been discussed with the original patch authors (see posts to the mesa-stable@lists.freedesktop.org mailing list).
2013-07-30glsl: Classify "layout" like other identifiers.Kenneth Graunke1-1/+1
When "layout" isn't being lexed as LAYOUT_TOK, we should treat it like an ordinary identifier. This means we need to classify it to determine whether we should return IDENTIFIER, TYPE_IDENTIFIER, or NEW_IDENTIFIER. Fixes the WebGL conformance test "shader-with-non-reserved-words." Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64087 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 c178ec0d7e8cc7007cb34e4f56f14261a057c200)
2013-07-30i965/vs: Fix flaky texture swizzlingChris Forbes1-1/+1
If any component used the ZERO or ONE swizzle, its corresponding member in the `swizzle` array would never be initialized. We *mostly* got away with this, except when that memory happened to contain a value that clobbered another channel when combined using BRW_SWIZZLE4(). NOTE: This is a candidate for stable branches. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 124f567f1d575eaea98a6ae1d0a4687b8fb5bba2)
2013-07-30gallium/vl: add prime supportDave Airlie1-1/+19
This fixes the dri2 opening to check if DRI_PRIME is set, and picks the correct drm device path to open, this along with a change to libvdpau allows vdpauinfo to work at least, Martin Peres tested with nouveau, and there seems to be a further issue with final displaying, it only works sometimes, but this patch is at least necessary to help debug further. Signed-off-by: Dave Airlie <airlied@redhat.com> Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Christian König <christian.koenig@amd.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67283 Tested-by: Armin K. <krejzi@email.com> (cherry picked from commit 19338157c97becac1e61cc51dc0904ddfab8e9da)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 00:31:04 +0000