[Xquartz-changes] mesa: Changes to '10.6-darwin-build-fixes'
Jeremy Huddleston
jeremyhu at freedesktop.org
Wed Oct 7 15:53:52 PDT 2015
New branch '10.6-darwin-build-fixes' available with the following commits:
commit 4782ad2a6853c2b54c0d4f23e46583028d283538
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Mon May 12 16:30:26 2014 +0100
applegl: Provide requirements of _SET_DrawBuffers
_SET_DrawBuffers requires driDispatchRemapTable, so we need to link with libmesa
for remap.c. libmesa requires the C++ linker.
Also need to arrange to call _mesa_init_remap_table() to initialize the remap
table.
XXX: There has to be a better way fixing this.
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
(cherry picked from commit 9800301a312ac06e0ce0af20e5817ee1e44ed4a5)
commit e5dade0d046cbf5f26d4a169f5867eff9008b4fd
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date: Sun May 11 14:40:07 2014 +0100
darwin: Suppress type conversion warnings for GLhandleARB
On darwin, GLhandleARB is defined as a void *, not the unsigned int it is on
linux.
For the moment, apply a cast to supress the warning
Possibly this is safe, as for the mesa software renderer the shader program
handle is not a real pointer, but a integer handle
Probably this is not the right thing to do, and we should pay closer attention
to how the GLhandlerARB type is used.
main/shader_query.cpp:49:7: error: no matching function for call to '_mesa_lookup_shader_program_err'
_mesa_lookup_shader_program_err(ctx, program, "glBindAttribLocation");
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/mesa/main/shaderobj.h:81:1: note: candidate function not viable: cannot convert argument of incomplete type 'GLhandleARB' (aka 'void *') to 'GLuint' (aka 'unsigned int')
_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
^
main/shader_query.cpp:111:13: error: no matching function for call to '_mesa_lookup_shader_program_err'
shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/mesa/main/shaderobj.h:81:1: note: candidate function not viable: cannot convert argument of incomplete type 'GLhandleARB' (aka 'void *') to 'GLuint' (aka 'unsigned int')
_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
^
main/shader_query.cpp:218:7: error: no matching function for call to '_mesa_lookup_shader_program_err'
_mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation");
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/mesa/main/shaderobj.h:81:1: note: candidate function not viable: cannot convert argument of incomplete type 'GLhandleARB' (aka 'void *') to 'GLuint' (aka 'unsigned int')
_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
(cherry picked from commit 24eefbd4ca271f22400549dd44ccd409263089e1)
commit e4a087962a74ff7e46ae4c3ff56282a73ca34eaa
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Wed Feb 11 12:32:56 2015 -0800
glext.h: Add missing include of stddef.h for ptrdiff_t
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
(cherry picked from commit 8ea9fa778a04d1535f994e39dcfdae7ee1add37e)
commit 8957b696f9cc8a92b2c160c551c34545447ec28a
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sat Oct 3 13:16:18 2015 +0100
docs: add sha256 checksums for 10.6.9
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit ab9aacce2d26a802bac81fc25748320428996692
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sat Oct 3 12:37:15 2015 +0100
docs: add release notes for 10.6.9
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 1c261a97ec5fe16882f40d18acb997f8a7927e43
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sat Oct 3 12:34:16 2015 +0100
Update version to 10.6.9
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 00aa3ee7cf90cd2e3d96c53c76d94bd6f16f193d
Author: Kyle Brenneman <kbrenneman at nvidia.com>
Date: Mon Sep 28 12:12:05 2015 -0600
glx: Don't hard-code the name "libGL.so.1" in driOpenDriver (v3)
Add a macro GL_LIB_NAME to hold the filename that configure comes up with
based on the --with-gl-lib-name and --enable-mangling options.
In driOpenDriver, use the GL_LIB_NAME macro instead of hard-coding
"libGL.so.1".
v2: Add an #ifndef/#define for GL_LIB_NAME so that non-autoconf builds will
work.
v3: Fix the library filename in the Makefile.
Signed-off-by: Kyle Brenneman <kbrenneman at nvidia.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit d35391cfda13afdb19a47003af260e258575ef45)
commit 256df77d51729878809fd1243fc30151b507994d
Author: Kyle Brenneman <kbrenneman at nvidia.com>
Date: Mon Sep 28 11:59:22 2015 -0600
mapi: Make _glapi_get_stub work with "gl" or "mgl" prefix.
When USE_MGL_NAMESPACE is defined, _glapi_get_stub will check for the "m"
prefix before trying to skip it, so that "glFoo" and "mglFoo" are
equivalent.
This should let it work with all the places where something calls
_glapi_get_proc_offset with a hard-coded name that starts with the normal
"gl" prefix.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55552
Signed-off-by: Kyle Brenneman <kbrenneman at nvidia.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 798f260a2f553e339d7f5fc5120bb627893dc740)
commit f20d5a7bfc624da4c5cf411ab6183f0f93a2deae
Author: Kyle Brenneman <kbrenneman at nvidia.com>
Date: Mon Sep 28 11:59:21 2015 -0600
glx: Fix build errors with --enable-mangling (v2)
Rearranged the GLX_ALIAS macro in glextensions.h so that it will pick up
the renames from glx_mangle.h.
Fixed the alias attribute for glXGetProcAddress when USE_MGL_NAMESPACE is
defined.
v2: Add a comment clarifying why GLX_ALIAS needs two macros.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55552
Signed-off-by: Kyle Brenneman <kbrenneman at nvidia.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit a27f2d991b1723c3349623401ce3c8f26dcdb28b)
commit a1a567c125d826ab1b029615782111dcfa1dfe57
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Aug 7 21:13:12 2015 +0100
i965: Remove early release of DRI2 miptree
intel_update_winsys_renderbuffer_miptree() will release the existing
miptree when wrapping a new DRI2 buffer, so we can remove the early
release and so prevent a NULL mt dereference should importing the new
DRI2 name fail for any reason. (Reusing the old DRI2 name will result
in the rendering going astray, to a stale buffer, and not shown on the
screen, but it allows us to issue a warning and not crash much later in
innocent code.)
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86281
Reviewed-by: Martin Peres <martin.peres at linux.intel.com>
Reviewed-by: Chad Versace <chad.versace at intel.com>
(cherry picked from commit 70e91d61fde239e8ae58148cacd4ff891126e2aa)
Nominated-by: Emil Velikov <emil.velikov at collabora.com>
commit f6c645d9d6042960bb2368802c54d8532158e7f3
Author: Brian Paul <brianp at vmware.com>
Date: Thu Sep 24 09:36:44 2015 -0600
st/mesa: try PIPE_BIND_RENDER_TARGET when choosing float texture formats
For 8-bit RGB(A) texture formats we set the PIPE_BIND_RENDER_TARGET flag
to try to get a hardware format which also supports rendering (for FBO
textures). Do the same thing for floating point formats.
This allows the Redway3D Flat demo to run.
Cc: 10.6 11.0 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
(cherry picked from commit cb758b892a7e62ff1f6187f2ca9ac543ff70a096)
commit 0dae12ac6e188307747c9698299b0ce649f9f505
Author: Leo Liu <leo.liu at amd.com>
Date: Fri Sep 18 15:51:26 2015 -0400
radeon/vce: fix vui time_scale zero error
if app pass 0 as frame_rate_num, it should not be encoded to the VUI.
Signed-off-by: Leo Liu <leo.liu at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Christian König <christian.koenig at amd.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 1e97b41893a4f53a71ee141a5e8a046fed7b49cd)
commit 41b44abdcbc5aa9a36afceee5f26fc7ea60ee497
Author: Roland Scheidegger <sroland at vmware.com>
Date: Sun Sep 20 01:33:17 2015 +0200
mesa: fix mipmap generation for immutable, compressed textures
If the immutable compressed texture didn't have the full mip pyramid,
this didn't work, because it tried to generate mip levels for non-existing
levels. _mesa_prepare_mipmap_level() would correctly handle this by returning
FALSE if the mip level didn't exist, however we actually created the
non-existing mip level right before that because we used _mesa_get_tex_image()
before calling _mesa_prepare_mipmap_level(). It would then proceed to crash
(we allocated the mip level, which is a bad idea on an immutable texture,
but didn't initialize the values, leading to assertion failures or segfaults).
Fix this by using _mesa_select_tex_image() instead and call it after
_mesa_prepare_mipmap_level(), as that function will allocate missing mip levels
for non-immutable textures already.
This fixes a (2 year old) crash with astromenace which was hack-fixed in ubuntu
packages instead: http://bugs.debian.org/718680 (I guess most apps do full mip
chains - I believe this app not doing it is actually unintentional, always one
level less than full mip chain...).
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 19604d30e1351868f7f54847c91ffec7b3fcd27e)
commit 1805e6473992b5e4c083bfd1ba2acee33ad9fbd8
Author: Marek Olšák <marek.olsak at amd.com>
Date: Wed Sep 23 02:33:24 2015 +0200
st/mesa: fix front buffer regression after dropping st_validate_state in Blit
Broken by: d082c5324914212f76e45be497229c7a0681f706
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92072
Cc: 10.6 11.0 <mesa-stable at lists.freedesktop.org>
Tested-by: Ilia Mirkin <imirkin at alum.mit.edu>
(cherry picked from commit f3a081953393c7d40bd8df9ec22a2551d01098f5)
commit 5b6ac61231902ea5b9948bc0770e6c40c007a5c5
Author: Kristian Høgsberg Kristensen <krh at bitplanet.net>
Date: Wed Sep 23 16:57:47 2015 -0700
i965: Respect stride and subreg_offset for ATTR registers
When we assign hw regs to attributes, we don't incorporate the stride
and subreg_offset from the fs_reg. It's rarely used, but the integer
multiplication lowering uses unusual stride and subreg_offset
combination breaks when one source is an attribute.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91970
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Kristian Høgsberg Kristensen <krh at bitplanet.net>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit 2ea16966ae66d4dd5c5dcb996d7996d9c734bbee)
commit dad649b66c8bd3f10fbf96cedea3ab7133ade758
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Sep 14 11:59:22 2015 -0700
t_dd_dmatmp: Use addition instead of subtraction in loop bounds
This is used everywhere else in this file because it avoids problems
when count is zero (due to trimming).
No piglit regressions on i915 (G33) or radeon (Radeon 7500).
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38109
Reviewed-by: Brian Paul <brianp at vmware.com>
Cc: Marius Predut <marius.predut at intel.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 25543d8ec506ef32599af6f5e0dd735e01b39909)
commit e0a6546ddd05e63381b7dc6780814fe8f1c2cc72
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Sep 14 11:56:20 2015 -0700
t_dd_dmatmp: Pull out common 'count -= count & 3' code
This was missing in the HAVE_TRIANGLES path, and that could cause
incorrect rendering.
No piglit regressions on i915 (G33) or radeon (Radeon 7500).
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38109
Reviewed-by: Brian Paul <brianp at vmware.com>
Cc: Marius Predut <marius.predut at intel.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit c0b3b2f7603eab210acdb2e654e5411fe912ca34)
commit 34ad2da6b9734faad54496144087b5ec5623b768
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Sep 14 11:50:28 2015 -0700
t_dd_dmatmp: Use '& 3' instead of '% 4' everywhere
No piglit regressions on i915 (G33) or radeon (Radeon 7500).
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 0d475ee2b989ac1697720ca391913e9158156bdc)
commit e158605a3790e40414d736e36d51baf56c4159fc
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Sep 14 11:46:50 2015 -0700
t_dd_dmatmp: Clean up improper code formatting from previous patch
No piglit regressions on i915 (G33) or radeon (Radeon 7500).
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit fad8d54de7e7f908cb0d06f0b54af8440e689928)
commit 430c84f73c86cfea361ffc25b5e446e0561e855e
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Sep 14 11:37:12 2015 -0700
t_dd_dmatmp: Make "count" actually be the count
The value passed in count previously was "vertex after the last vertex
to be processed." Calling that "count" was misleading and kind of mean.
Looking at the code, many functions immediately do "count-start" to get
back the true count. That's just silly.
If it is better for the loops to be 'for (j = start; j < (start +
count); j++)', GCC will do that transformation.
NOTE: There is some strange formatting left by this patch. That was
done to make it more obvious that the before and after code is
equivalent. These will be fixed in the next patch.
No piglit regressions on i915 (G33) or radeon (Radeon 7500).
v2: Fix a remaining (count-start) in render_quad_strip_verts.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com> [v1]
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit d7bf7969b90f66ee614f2d2225f3a821d5396a89)
commit be6c2706c1e3de60b08ece5362148a28cd4a0065
Author: Iago Toral Quiroga <itoral at igalia.com>
Date: Tue Feb 24 19:02:56 2015 +0100
mesa: Fix GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE for default framebuffer.
From section 9.2. Binding and Managing Framebuffer Objects:
"Upon successful return from Get*FramebufferAttachmentParameteriv, if
pname is FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, then params will contain
one of NONE, FRAMEBUFFER_DEFAULT, TEXTURE, or RENDERBUFFER, identifying
the type of object which contains the attached image."
And then it clarifies further:
"If the value of FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is NONE, then
either no framebuffer is bound to target; or the default framebuffer is
bound, attachment is DEPTH or STENCIL, and the number of depth or stencil
bits, respectively, is zero"
Currently, if the default framebuffer is bound, we always return
GL_FRAMEBUFFER_DEFAULT for FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, but
according to the spec, when GL_DEPTH or GL_STENCIL attachments are
the ones being queried, we should return GL_NONE if they don't exist.
Fixes the following dEQP test:
dEQP-GLES3.functional.state_query.fbo.framebuffer_attachment_x_size_initial
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit cf439951b791827677e96d29e209b5fc08d07a2e)
commit 78b0f48c3ba00c8841332b8359b5622cb6bb6021
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Sep 30 21:43:37 2015 +0100
cherry-ignore: add commit non applicable for 10.6
The nominated commit 7f8815bcb9af9b4b374ad7bd6e7cfa7529a6c980 (i965: fix
textureGrad for cubemaps) addresses issue, raised post 10.6 branchpoint.
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 15020937bdd93303bdda2ff31154a0f23a60a044
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Sat Aug 29 14:51:45 2015 -0700
configure.ac: Add support to enable read-only text segment on x86.
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.gentoo.org/240956
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 6dfc5e28f7d08094210d8cecd3ed4a5b393dafe9)
commit 69f2e709aa2deb18d12425bd4ddc80710327e38a
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Sep 30 21:18:04 2015 +0100
cherry-ignore: add commit non applicable for 10.6
The nominated commit afa1efdc8522d987e3af7c7a6272021caa33eb82 (mesa:
fix errors when reading depth with glReadPixels) addresses issue,
raised post 10.6 branchpoint.
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 02387926addc62198c9b684f4f51f7cbe06b3e25
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Sep 20 11:55:41 2015 +0100
docs: add sha256 checksums for 10.6.8
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 91c6302734574e91424a7ccb52b6368b712366cc
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Sep 20 11:05:07 2015 +0100
docs: add release notes for 10.6.8
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 9a4ebbe1ecee0cb1ee1062ba4b448a9c496c03fa
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Sep 20 11:05:23 2015 +0100
Update version to 10.6.8
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit eb06d2b6496159a505c8d290e51b14ed2ba36718
Author: Alejandro Piñeiro <apinheiro at igalia.com>
Date: Tue Sep 1 17:02:20 2015 +0200
i965/vec4: fill src_reg type using the constructor type parameter
The src_reg constructor that received the glsl_type was using it
only to build the swizzle, but not to fill this->type as dst_reg
is doing.
This caused some type mismatch between movs and alu operations
on the NIR path, so copy propagation optimization was not applied
to remove unneeded movs if negate modifier was involved. This was
first detected on minus (negate+add) operations.
Shader DB results (taking into account only vec4):
total instructions in shared programs: 20019 -> 19934 (-0.42%)
instructions in affected programs: 2918 -> 2833 (-2.91%)
helped: 79
HURT: 0
GAINED: 0
LOST: 0
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit 4de86e1371b0d59a5b9a787b726be3d373024647)
Nominated-by: Christoph Brill <egore911 at egore911.de>
commit 0fe894db48f96a4c8db72e83b30f6d4965ba5eeb
Author: Ulrich Weigand <uweigand at de.ibm.com>
Date: Tue Sep 15 15:23:26 2015 +0200
mesa: Fix texture compression on big-endian systems
Various pieces of code to create compressed textures will first
generate an uncompressed RGBA texture into a temporary buffer,
and then read from that buffer while creating the final compressed
texture in the requested format.
The code reading from the temporary buffer assumes the buffer is
formatted as an array of bytes in RGBA order. However, the buffer
is filled using a _mesa_texstore call with MESA_FORMAT_R8G8B8A8_UNORM
format -- this is defined as an array of *integers* holding the
RGBA values in packed format (least-significant to most-significant).
This means incorrect bytes are accessed on big-endian systems.
This patch fixes this by using the MESA_FORMAT_A8B8G8R8_UNORM format
instead on big-endian systems when filling the buffer. This fixes
about 100 piglit test case failures on s390x for me.
Signed-off-by: Ulrich Weigand <ulrich.weigand at de.ibm.com>
Tested-by: Oded Gabbay <oded.gabbay at gmail.com>
Cc: "10.6" "11.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied at gmail.com>
(cherry picked from commit bd016a2601a741799bc76734deae0cb9ebcb2b8f)
commit 7b583e05835b7c43fe94b580d2b6dcf1ec271cb6
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Tue Sep 15 19:39:25 2015 -0400
nv50, nvc0: fix max texture buffer size to 128M elements
This is what the hardware supports, there never was any sort of 64K
limit.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 7a275fcda8ffa3d69b7be6f356469f4af272a6ad)
commit 8fd7f10ae0583f8e01f0b9e8e1130113ca18945c
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Tue Sep 15 19:32:10 2015 -0400
st/mesa: avoid integer overflows with buffers >= 512MB
This fixes failures with the newly-submitted max-size texture buffer
piglit test for GPUs exposing >= 128M max texels.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Glenn Kennard <glenn.kennard at gmail.com>
(cherry picked from commit eb081681df248750727a8a76436760d617b4a6a9)
commit a9df9b1854081a933a86c74e173a82bfb29fbe92
Author: Ray Strode <rstrode at redhat.com>
Date: Fri Aug 28 14:50:21 2015 -0400
gbm: convert gbm bo format to fourcc format on dma-buf import
At the moment if a gbm buffer is imported and the gbm buffer
has an old-style GBM_BO_FORMAT format, the import will crash,
since it's passed directly to DRI functions that expect
a fourcc format (as provided by the newer GBM_FORMAT
definitions)
This commit addresses the problem in two ways:
1) it prevents invalid formats from leading to a crash by
returning EINVAL if the image couldn't be created
2) it translates GBM_BO_FORMAT formats into the comparable
GBM_FORMAT formats.
Reference: https://bugzilla.gnome.org/show_bug.cgi?id=753531
CC: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>
(cherry picked from commit 4bf151e66279da00655cec02aadb52c9c6583213)
commit a6714a9a0404e665f0efd15c48260267679c8c56
Author: Antia Puentes <apuentes at igalia.com>
Date: Wed Aug 5 15:57:33 2015 +0200
i965/vec4: Fix saturation errors when coalescing registers
If the register types do not match and the instruction
that contains the final destination is saturated, register
coalescing generated non-equivalent code.
This did not happen when using IR because types usually
matched, but it is visible in nir-vec4.
For example,
mov vgrf7:D vgrf2:D
mov.sat m4:F vgrf7:F
is coalesced to:
mov.sat m4:D vgrf2:D
The patch prevents coalescing in such scenario, unless the
instruction we want to coalesce into is a MOV (without type
conversion implied). In that case, the patch sets the register
types to the type of the final destination.
Shader-db results in HSW (only vec4 instructions shown):
total instructions in shared programs: 1754415 -> 1754416 (0.00%)
instructions in affected programs: 74 -> 75 (1.35%)
helped: 0
HURT: 1
GAINED: 0
LOST: 0
Only one extra instruction in one of the shaders, that comes from
eliminating a saturation error by preventing register coalesce.
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
(cherry picked from commit 79f1a7ae28c37f77e08e550cd077959a2a1f8341)
commit 022892323d78311e59325991207839e70549f515
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Thu Sep 10 16:19:42 2015 -0700
i965/vec4: Don't reswizzle hardware registers
Cc: "11.0 10.6" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91719
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 1037e0a84f61f4b1815093bcfd548d4b58ca106f)
commit 34bfebda14cc8474fa5d498d1ed03f9a3d4e733a
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Wed Sep 9 21:50:03 2015 -0400
nvc0: remove BGRA4 format support
Something is wrong with the support somewhere. I couldn't get the blob
driver to use it either, although it happily used RGB5_A1.
teximage-colors works, but WoW seems to fail in the menus for drawing
text.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91526
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 342e68dc60eebb20ac1be9f47800ee9e604354f0)
commit cb2209e9efa8f3fac4c27ff98fbaba19ec551191
Author: Hans de Goede <hdegoede at redhat.com>
Date: Wed Sep 9 15:52:09 2015 +0200
nv30: Disable msaa unless requested from the env by NV30_MAX_MSAA
Some modern apps try to use msaa without keeping in mind the
restrictions on videomem of older cards. Resulting in dmesg saying:
[ 1197.850642] nouveau E[soffice.bin[3785]] fail ttm_validate
[ 1197.850648] nouveau E[soffice.bin[3785]] validating bo list
[ 1197.850654] nouveau E[soffice.bin[3785]] validate: -12
Because we are running out of video memory, after which the program
using the msaa visual freezes, and eventually the entire system freezes.
To work around this we do not allow msaa visauls by default and allow
the user to override this via NV30_MAX_MSAA.
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
[imirkin: move env var lookup to screen so that it's only done once]
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 3e9df0e3af7a8a84147ae48f588e9c435bf65b98)
Signed-off-by: Emil Velikov <emil.velikov at collabora.co.uk>
Conflicts:
src/gallium/drivers/nouveau/nv30/nv30_screen.c
commit 2ecfc4e38d6804f28dce8a347205f793ab7ce149
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sun Sep 6 04:51:29 2015 -0400
nvc0: always emit a full shader colormask
Indications are that if the colormask indicates a single bit set on
fermi, that value will always be read from $r0 instead of a potentially
higher register (if e.g. green is set). Not to upset the counting logic,
always set the header up with a full color mask for each RT. Such a
situation can basically only ever happen with generated blit shaders.
Fixes the following piglit on Fermi (Kepler is unaffected):
fbo-stencil blit GL_DEPTH32F_STENCIL8
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 39df725f731f75f488c75a4910169beb352213fb)
commit 3fa83e99de2a135e3093cb5f60b7e4bbb906d049
Author: Hans de Goede <hdegoede at redhat.com>
Date: Mon Sep 7 21:50:48 2015 +0200
nv30: Fix max width / height checks in nv30 sifm code
The sifm object has a limit of 1024x1024 for its input size and 2048x2048
for its output. The code checking this was trying to be clever resulting
in it seeing a surface of e.g 1024x256 being outside of the input size
limit.
This commit fixes this.
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 87073c69f3e253044bc235f34917aaa89041a63c)
Signed-off-by: Emil Velikov <emil.velikov at collabora.co.uk>
Conflicts:
src/gallium/drivers/nouveau/nv30/nv30_transfer.c
commit 0869fefe1a83c4d8aef688be8c77ea3fd9026e26
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sun Sep 6 11:29:00 2015 -0400
st/mesa: don't fall back to 16F when 32F is requested
Nothing in the spec allows for the reduced precision, and this also
fixes st_QuerySamplesForFormat for nv50, which does not allow MS8 on
RGBA32F. Now this will be respected instead of reporting MS8 as
supported with an assumption that the format used will be RGBA16F.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit e40f32d5626c87d9e77bbc261df3648cd54bd066)
commit cefbc3f7c1847d1d816baf4666b35228c9f3bfcc
Author: Oded Gabbay <oded.gabbay at gmail.com>
Date: Thu Sep 3 19:00:26 2015 +0300
llvmpipe: convert double to long long instead of unsigned long long
round(val*dscale) produces a double result, as val and dscale are double.
However, LLVMConstInt receives unsigned long long, so there is an
implicit conversion from double to unsigned long long.
This is an undefined behavior. Therefore, we need to first explicitly
convert the round result to long long, and then let the compiler handle
conversion from that to unsigned long long.
This bug manifests itself in POWER, where all IMM values of -1 are being
converted to 0 implicitly, causing a wrong LLVM IR output.
Signed-off-by: Oded Gabbay <oded.gabbay at gmail.com>
CC: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
(cherry picked from commit 4f2290d1612569686284609059d29a85c9de67cf)
commit 3cbe492fb45b2fa1a06fba6a71fb50367e06ff8a
Author: Hans de Goede <hdegoede at redhat.com>
Date: Thu Sep 3 12:38:01 2015 +0200
nv30: Implement color resolve for msaa
Note this is not ideal. Since the sifm can only do source sizes upto
1024x1024 we end up using the blitter on nv4x, which is not that fast.
And on nv3x we end up using the cpu which is really slow.
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
(cherry picked from commit 3c6c4d4f298ec81fe57992790a68aaab2e573519)
commit 1f4ff00356897b120bee73d6a7cdbb5157163e92
Author: Hans de Goede <hdegoede at redhat.com>
Date: Wed Aug 12 13:39:42 2015 +0200
nv30: Fix creation of scanout buffers
Scanout buffers on nv30 must always be non-swizzled and have special
width alignment constraints.
These constrains have been taken from the xf86-video-nouveau
src/nv_accel_common.c: nouveau_allocate_surface() function.
nouveau_allocate_surface() applies these width constraints only when a
tiled attribute is set, which it sets for all surfaces allocated via
dri, and this "tiling" is not the same as swizzling, scanout surfaces
must be linear / have a uniform_pitch or only complete garbage is shown.
This commit fixes dri3 on nv30 showing a garbled display, with dri3 the
scanout buffers are allocated by mesa, rather then by the ddx, and the
wrong stride of these buffers was causing the garbled display.
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Hans de Goede <hdegoede at redhat.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
(cherry picked from commit 3329703eb116a7ad73bc694356b43e014532240b)
commit 39ececa38673935790c233cfac15b4da8d891658
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Aug 31 18:44:42 2015 -0700
mesa: Don't allow wrong type setters for matrix uniforms
Previously we would allow glUniformMatrix4fv on a dmat4 and
glUniformMatrix4dv on a mat4. Both are illegal. That later also
overwrites the storage for the mat4 and causes bad things to happen.
Should fix the (new) arb_gpu_shader_fp64-wrong-type-setter piglit test.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Timothy Arceri <t_arceri at yahoo.com.au>
Cc: Dave Airlie <airlied at redhat.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 7237c937af3b495191bee2f7240901e3a9daf1fb)
commit 0a8c727a9d22b9823c8c6a6b58f9b1c67d6dae17
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Aug 31 18:30:48 2015 -0700
mesa: Pass the type to _mesa_uniform_matrix as a glsl_base_type
This matches _mesa_uniform, and it enables the bug fix in the next
patch.
v2: s/type/basicType/ in the assert in _mesa_uniform_matrix.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Timothy Arceri <t_arceri at yahoo.com.au> [v1]
Cc: Dave Airlie <airlied at redhat.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit a6976f09727014730f45ec27c714c6a8140e074a)
commit 72785668ad580d38b4f11c9a889e703007767885
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Thu Sep 17 14:55:25 2015 +0100
cherry-ignore: add commit non applicable for 10.6
Signed-off-by: Emil Velikov <emil.velikov at collabora.co.uk>
commit d7cdb5be87af9112f036d6fc47034dfb00dbac80
Author: Jose Fonseca <jfonseca at vmware.com>
Date: Thu May 28 10:11:36 2015 +0100
gallivm: Workaround LLVM PR23628.
Temporarily undefine DEBUG macro while including LLVM C++ headers,
leveraging the push/pop_macro pragmas, which are supported both by GCC
and MSVC.
https://bugs.freedesktop.org/show_bug.cgi?id=90621
Trivial.
(cherry picked from commit 09d6243aed016eed4518435c9885275dbb6d2aa9)
Nominated-by: Sedat Dilek <sedat.dilek at gmail.com>
commit ff8f2402fd791fd0243d4e1bc4e1d18b4c04b9a7
Author: Vinson Lee <vlee at freedesktop.org>
Date: Tue May 26 22:18:28 2015 -0700
gallivm: Do not use NoFramePointerElim with LLVM 3.7.
TargetOptions::NoFramePointerElim was removed in llvm-3.7.0svn r238244
"Remove NoFramePointerElim and NoFramePointerElimOverride from
TargetOptions and remove ExecutionEngine's dependence on CodeGen. NFC."
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
(cherry picked from commit 147ffd48166d851341cadd12de98895f32ec25a2)
Nominated-by: Sedat Dilek <sedat.dilek at gmail.com>
commit c5016cc9cb06cc8f07d018cb8e61c7f6816492d2
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Tue Jun 9 14:33:47 2015 -0700
i965: Momentarily pretend to support ARB_texture_stencil8 for blits.
Broadwell's stencil blitting code attempts to bind a renderbuffer as a
texture, using dd->BindRenderbufferTexImage().
This calls _mesa_init_teximage_fields(), which then attempts to set
img->_BaseFormat = _mesa_base_tex_format(ctx, internalFormat), which
assert fails if internalFormat is GL_STENCIL_INDEX8 but
ARB_texture_stencil8 is unsupported.
To work around this, just pretend to support the extension momentarily,
during the blit. Meta has already munged a variety of other things in
the context (including the API!), so it's not that much worse than what
we're already doing.
Fixes regressions since commit f7aad9da20b13c98f77d6a690b327716f39c0a47
(mesa/teximage: use correct extension for accept stencil texture.).
v2: Add an XXX comment explaining the situation (requested by Jason
Ekstrand and Martin Peres), and an assert that we don't support
the extension so we remember to remove this hack (requested by
Neil Roberts).
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
(cherry picked from commit f83b9e58f6e8a748def367c7d523eb7285b1aeb7)
Nominated-by: Emil Velikov <emil.velikov at collabora.co.uk>
commit 8789dd627ce3411a8d9271abead240f3265bd4d2
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Thu Sep 10 19:02:21 2015 +0100
docs: add sha256 checksums for 10.6.7
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 32efdc87cbf89cfe08ad9571cd756e27c803caa8
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Thu Sep 10 18:45:17 2015 +0100
docs: add release notes for 10.6.7
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit c87643377dc682583164ebd2d301c334d731a2c9
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Thu Sep 10 18:41:07 2015 +0100
Update version to 10.6.7
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit a08cb25d8150d0f04146ca7e250e7ab07827ac21
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Wed Sep 2 10:42:57 2015 -0700
glsl: Handle attribute aliasing in attribute storage limit check.
In various versions of OpenGL and GLSL, it's possible to declare
multiple VS input variables with aliasing attribute locations.
So, when computing the storage requirements for vertex attributes,
we can't simply add up the sizes. Instead, we need to look at the
enabled slots.
This patch begins tracking which attributes are double types that
are larger than 128-bits (i.e. take up two vec4 slots). We then
count normal attributes once, and count the double-size attributes
a second time.
Fixes deQP functional.attribute_location.bind_aliasing.max_cond_* tests
on i965, which regressed with commit ad208d975a6d3aebe14f7c2c16039ee20.
No Piglit changes on llvmpipe (which actually supports dvecs).
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Tested-by: Mark Janes <mark.a.janes at intel.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Dave Airlie <airlied at redhat.com>
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit c3294ca5a13cf3f0eb3d9907a46ff8ce4bc2963b)
commit fc654a37ea422ecbcbca1727513dc3c298221112
Author: Dave Airlie <airlied at gmail.com>
Date: Sun Apr 5 16:48:47 2015 +1000
mesa/teximage: use correct extension for accept stencil texture.
This was using the wrong extension, ARB_stencil_texturing
doesn't mention any changes in this area.
Fixes "dEQP-GLES3.functional.fbo.completeness.renderable.texture.
stencil.stencil_index8."
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90751
Signed-off-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit f7aad9da20b13c98f77d6a690b327716f39c0a47)
Nominated-by: Mark Janes <mark.a.janes at intel.com>
commit 4f531da24b88661af8f49becb5296a78ec79ce54
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Thu Sep 10 14:02:04 2015 +0100
Revert "i965: Momentarily pretend to support ARB_texture_stencil8 for blits."
This reverts commit 6811df8d3510c35899e992bae82c063e20e62cc8.
Erroneous nomination. See mailing list for details.
commit e3e2a3e0e581da39dcd9268951edb52f68916940
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Fri Sep 4 23:05:47 2015 +0100
docs: add sha256 checksums for 10.6.6
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 4b05739e9d718a48415270b95c0a73b56666c364
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Fri Sep 4 22:16:07 2015 +0100
docs: add release notes for 10.6.6
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 67ba1b714ad220eec5fa28d32d9bcf262bc95303
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Fri Sep 4 22:35:55 2015 +0100
Update version to 10.6.6
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 6811df8d3510c35899e992bae82c063e20e62cc8
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Tue Jun 9 14:33:47 2015 -0700
i965: Momentarily pretend to support ARB_texture_stencil8 for blits.
Broadwell's stencil blitting code attempts to bind a renderbuffer as a
texture, using dd->BindRenderbufferTexImage().
This calls _mesa_init_teximage_fields(), which then attempts to set
img->_BaseFormat = _mesa_base_tex_format(ctx, internalFormat), which
assert fails if internalFormat is GL_STENCIL_INDEX8 but
ARB_texture_stencil8 is unsupported.
To work around this, just pretend to support the extension momentarily,
during the blit. Meta has already munged a variety of other things in
the context (including the API!), so it's not that much worse than what
we're already doing.
Fixes regressions since commit f7aad9da20b13c98f77d6a690b327716f39c0a47
(mesa/teximage: use correct extension for accept stencil texture.).
v2: Add an XXX comment explaining the situation (requested by Jason
Ekstrand and Martin Peres), and an assert that we don't support
the extension so we remember to remove this hack (requested by
Neil Roberts).
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
(cherry picked from commit f83b9e58f6e8a748def367c7d523eb7285b1aeb7)
Nominated-by: Mark Janes <mark.a.janes at intel.com>
commit cab11e0f73ad8e3ac42297621b1b49ea9724aabb
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Tue Jun 9 12:26:48 2015 +0300
mesa: add GL_RED, GL_RG support for floating point textures
Mesa supports EXT_texture_rg and OES_texture_float. This patch adds
support for using unsized enums GL_RED and GL_RG for floating point
targets and writes proper checks for internalformat when format is
GL_RED or GL_RG and type is of GL_FLOAT or GL_HALF_FLOAT.
Later, internalformat will get adjusted by adjust_for_oes_float_texture
after these checks.
v2: simplify to check vs supported enums
v3: follow the style and break out if internalFormat ok (Kenneth)
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90748
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 5b0d6f5c1bc3f7bd37c6efebf48f80ca6ff3ef87)
Nominated-by: Mark Janes <mark.a.janes at intel.com>
commit 0639ada6753ca23b33ee34dbc8fc92c8b68b605e
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Tue Jun 9 09:20:58 2015 -0700
Revert "i965: Advertise a line width of 40.0 on Cherryview and Skylake."
This reverts commit f3b709c0ac073cd0ec90a3a0d91d1ee94668e043.
The "dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_4.
interpolation.lines_wide" test appears to be broken on Cherryview when
we expose line widths greater than 12.0. I'm not sure why.
For now, just go back to the limits we used on older platforms.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90902
Acked-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit 16658f426dbd81fcbc317b21ae9a3f7c9b6448fb)
Nominated-by: Mark Janes <mark.a.janes at intel.com>
commit e5861dab85ca12286f707c54f07f572a6452a84d
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Wed Sep 2 16:39:27 2015 -0700
i965: Fix copy propagation type changes.
commit 472ef9a02f2e5c5d0caa2809cb736a0f4f0d4693 introduced code to
change the types of SEL and MOV instructions for moves that simply
"copy bits around". It didn't account for type conversion moves,
however. So it would happily turn this:
mov(8) vgrf6:D, -vgrf5:D
mov(8) vgrf7:F, vgrf6:UD
into this:
mov(8) vgrf6:D, -vgrf5:D
mov(8) vgrf7:D, -vgrf5:D
which erroneously drops the conversion to float.
Cc: "11.0 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit 2ace64fd598816fd1be9877962734242fc27b87b)
commit 34d34076ff9e2ed3aeb5d5df4685d44d5c7b4b8f
Author: Matt Turner <mattst88 at gmail.com>
Date: Wed Sep 2 12:49:08 2015 -0700
i965/fs: Handle MRF destinations in lower_integer_multiplication().
The lowered code reads from the destination, which isn't possible from
message registers.
Fixes the following dEQP tests on SNB:
dEQP-GLES3.functional.shaders.precision.int.highp_mul_fragment
dEQP-GLES3.functional.shaders.precision.int.mediump_mul_fragment
dEQP-GLES3.functional.shaders.precision.int.lowp_mul_fragment
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
Tested-by: Mark Janes <mark.a.janes at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
(cherry picked from commit 9390cb84593bda516e8c1521c87a08475574d1be)
commit b0bce4c7831ffb1706fbbc51dc23cefd51022692
Author: Marek Olšák <marek.olsak at 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-stable at lists.freedesktop.org>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Acked-by: Christian König <christian.koenig at amd.com>
(cherry picked from commit 9b510a9652297a63677f1d55b2bf444694fd94e1)
Conflicts:
src/gallium/drivers/radeonsi/si_shader.h
src/gallium/drivers/radeonsi/si_state_shaders.c
commit b2cdcc8b29f50ea89188cff877bec79ce1beee02
Author: Dave Airlie <airlied at 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-stable at lists.freedesktop.org>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 0de53ccc8cbee0f63ba25c9e72664b3cbd31be54)
commit bfc5ed5322f37e0673234e95eb2b6e6538441966
Author: Dave Airlie <airlied at 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.kennard at gmail.com>
Cc: "10.6" "11.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 3063913f77cd2db1a263cb824a5c8c3dcc1a51a0)
commit 3db7a7e814a7d9b75a13450fd51389987bac8f9e
Author: Daniel Scharrer <daniel at 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-stable at lists.freedesktop.org>
Reviewed-by: Fredrik Höglund <fredrik at kde.org>
Signed-off-by: Fredrik Höglund <fredrik at kde.org>
(cherry picked from commit 5aaaaebf22c920745d577c49e463d23b90ba5ea8)
Conflicts:
src/mesa/main/texparam.c
commit 6b968dde1eae5cb205851eb26980828f790f218d
Author: Ilia Mirkin <imirkin at 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 <imirkin at alum.mit.edu>
Reviewed-by: Brian Paul <brianp at vmware.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 2259b111003f2e8c55cae42677ec45345fb1b6e3)
commit a85a781dad23080c880d5514be2e8442f6de2463
Author: Jason Ekstrand <jason.ekstrand at 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-stable at lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit fee0c5af11dd0995de96e7053377d425a66d03a0)
commit c759491e8150810dba09fa446e1f5a8e66be2488
Author: Marek Olšák <marek.olsak at 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-stable at lists.freedesktop.org>
Reviewed-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit f432ae899fb81468778dbeb17ac7615da3ed5c0d)
commit d93f14ec8ec37410b265967876696508dffc9146
Author: Dave Airlie <airlied at 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 <imirkin at alum.mit.edu>
Cc: 10.6 11.0 <mesa-stable at lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 529acab22a3e21e0ed0c5243675aec6c0ee27e8f)
commit 6ed069d5bce5aaf21df97eec86b958e9c4bb7f97
Author: Chris Wilson <chris at 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.justen at 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. <tomaszc at o2.pl>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91254
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Jordan Justen <jordan.l.justen at intel.com>
Cc: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 4e5752e2b78243a71766538f62ca0a80488047a7)
commit f0c7866eb90c235e16c64c93e97c8ca0a5ee1fc4
Author: Tapani Pälli <tapani.palli at 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.palli at intel.com>
Reviewed-by: Martin Peres <martin.peres at linux.intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90925
(cherry picked from commit f045b8b2ff5ac75da3e092f482fd1717571d8462)
commit 792a07075b8613c5020ff26ae0ba31d57a5c822c
Author: Tapani Pälli <tapani.palli at 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.palli at intel.com>
Reviewed-by: Martin Peres <martin.peres at linux.intel.com>
(cherry picked from commit 73afa31f07fe4af605088f6590edc4227652c482)
commit 6b9ea26d7fe46b038adc05c6a93c077fbbaf17d4
Author: Tapani Pälli <tapani.palli at 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.palli at intel.com>
Reviewed-by: Martin Peres <martin.peres at linux.intel.com>
(cherry picked from commit ccaf37f4496eb836866c9daacf21f1f5ac8c6d66)
commit 90f74f1c0e6dbb1edb48941c3a5b427bce846584
Author: Dave Airlie <airlied at 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-stable at lists.freedesktop.org>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 32769ac016dee4ce5767a922f91de47df4ce984d)
commit a4aa31b22461a139537ed0658beb3ad383c0be44
Author: Dave Airlie <airlied at 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-stable at lists.freedesktop.org>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit b4a70401f52e5d7e08c94715b250ea1de8f63d15)
commit 65cc30d7281b831fc5baede4b7757e9a5257b27e
Author: Dave Airlie <airlied at 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-stable at lists.freedesktop.org>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 6a3e1fb958778e00e8fe2d860b6327fc4409c148)
commit 71fa292d4835c50343d4fab4ddf57f4c5b133b26
Author: Chris Wilson <chris at 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 <kenneth at 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: kaillasse91 at hotmail.fr
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90734
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Kenneth Graunke <kenneth at whitecape.org>
Cc: Ian Romanick <ian.d.romanick at intel.com>
Cc: Anuj Phogat <anuj.phogat at gmail.com>
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
(cherry picked from commit d38a5601068ae1d923efece8f28757777f4474e4)
[Emil Velikov: drop the extra INTEL_MIPTREE_TRMODE_NONE arguments]
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Conflicts:
src/mesa/drivers/dri/i965/intel_blit.c
commit 209394406e7b924178c4b192b67f4cc9fcb941ad
Author: Marek Olšák <marek.olsak at 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-stable at lists.freedesktop.org
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
(cherry picked from commit 437cb1e3f482570447501526927df4d80c845bf5)
commit 3f06559076fa0639222b2e3fa75ab906fc4cd85f
Author: Glenn Kennard <glenn.kennard at 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.kennard at gmail.com>
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 608c7b4a63d5818f7ae0b3d48496b02cf8458d9b)
commit 6f92f4dea9a1ff6879f38348ff377d4445e1ef0d
Author: Glenn Kennard <glenn.kennard at 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.kennard at gmail.com>
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit a830225adbb77073272961df409885cca6b861ee)
commit 1a9310b8b12a63eccc57a245a0c0db46b81f028e
Author: Glenn Kennard <glenn.kennard at 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.kennard at gmail.com>
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 36f1999a87258603b6720d55e6020d5d24c215c9)
commit 278346a7d6493685e29ae1ba7d9c2658fa323453
Author: Dave Airlie <airlied at 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.olsak at amd.com>
Cc: "11.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit c1452983b44cc8ee238b8c7e2cfca1105c707487)
[Emil Velikov: use glGetTex%sImage + suffix, instead of caller]
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 9a6b7e9dcd38c768dbcf19565b819889bcb20218
Author: Ilia Mirkin <imirkin at 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 <imirkin at alum.mit.edu>
Cc: "11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit e18c29b03105567cf20bc235ce23cf08986cc537)
commit 8427d56d96dd41bbc750a2aa019a9325ff14f55e
Author: Dave Airlie <airlied at 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_arceri at yahoo.com.au>
Cc: "11.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 45971fd0df1cbfc400f89f2e8df206625b40d65f)
commit e0b333a6a476d1085d53d062a00ac32919bcb7ff
Author: Ilia Mirkin <imirkin at 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 <imirkin at alum.mit.edu>
Cc: "11.0" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit abbf05cfc2bea0787bcf710ef984d73ee8ba8f9e)
commit b6dffbe9f3cec5d89ae5749bdd1746ae90dcbbe7
Author: Neil Roberts <neil at 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-stable at lists.freedesktop.org>
Reviewed-by: Ben Widawsky <ben at bwidawsk.net>
Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
Tested-by: Mark Janes <mark.a.janes at intel.com>
(cherry picked from commit 3a1ab2348050fd32f41553b9febfd9972b5761aa)
commit 56c9b963768c4b808aa05b08c8c062c6267e22fd
Author: Neil Roberts <neil at 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-stable at lists.freedesktop.org>
Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>
Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
Tested-by: Ben Widawsky <ben at bwidawsk.net>
Tested-by: Mark Janes <mark.a.janes at intel.com>
(cherry picked from commit fb02b4ec482762ccf2a9fedf24fe6f50787932a9)
commit b47e739f2fa721dfb2da5d70c37235cfb136d6d4
Author: Glenn Kennard <glenn.kennard at 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.kennard at gmail.com>
Cc: "11.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied at gmail.com>
(cherry picked from commit 50932268aad0cc21511f370793e77c76e038bd06)
commit bf1c7b46e552d3f5e9e1b589df975b0e78f16c80
Author: David Heidelberg <david at 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 <david at ixit.cz>
Cc: "10.4 10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 56717c0b069a20b0c4438ac1dc9280cd9026b36f)
commit 619163ca6a6e2f1693166b391610f28af1433432
Author: Ilia Mirkin <imirkin at 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 <imirkin at alum.mit.edu>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit 3525aa1dc9c27fb2394a37788a29c272b3a81d1b)
[Emil Velikov: s/emit_asm/emit/]
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit cc2226214db0550961989b616f5fb88db34e9afe
Author: Ilia Mirkin <imirkin at 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 <imirkin at alum.mit.edu>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit 681efdf7a18b73ce06989cb2d3299e3feabdb5f5)
[Emil Velikov: s/emit_asm/emit/]
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Conflicts:
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
commit 5ab8bd7d99a2f8e235b1a02b92847cba55a13054
Author: Tapani Pälli <tapani.palli at 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.palli at intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91673
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 7eda897bf05dc572dbe83f3a1075b773b0c65708)
commit 38457285b755a879a953779702262fafd813d2b8
Author: Emil Velikov <emil.l.velikov at 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.velikov at gmail.com>
commit fa34225167396008e75e93f23696666caba8a7bf
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sat Aug 22 11:00:47 2015 +0100
docs: add sha256 checksums for 10.6.5
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit a43b3dd99bd4c114d0f3e90f4fd4792164fe7539
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sat Aug 22 10:20:54 2015 +0100
docs: add release notes for 10.6.5
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit b9df15bef99c4c7a949070a8e065b0884645bc01
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sat Aug 22 10:15:00 2015 +0100
Update version to 10.6.5
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 76cc235e2b5605b9a9e93855c38e12cd19929acd
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sat Aug 22 10:12:52 2015 +0100
Revert "radeonsi: properly set the raster_config for KV"
This reverts commit 20bb0a771dded700ba1b213256bf47dfedbdfd77.
Requested-by: Alex Deucher <alexdeucher at gmail.com>
commit 4a2a49040e6891355a80b582932c5a3cffaa3c16
Author: Renaud Gaubert <renaud at lse.epita.fr>
Date: Sat Jul 11 19:38:10 2015 +0200
glsl: avoid compiler's segfault when processing operators with void arguments
This is done by returning an rvalue of type void in the
ast_function_expression::hir function instead of a void expression.
This produces (in the case of the ternary) an hir with a call
to the void returning function and an assignment of a void variable
which will be optimized out (the assignment) during the optimization
pass.
This fix results in having a valid subexpression in the many
different cases where the subexpressions are functions whose
return values are void.
Thus preventing to dereference NULL in the following cases:
* binary operator
* unary operators
* ternary operator
* comparison operators (except equal and nequal operator)
Equal and nequal had to be handled as a special case because
instead of segfaulting on a forbidden syntax it was now accepting
expressions with a void return value on either (or both) side of
the expression.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85252
Signed-off-by: Renaud Gaubert <renaud at lse.epita.fr>
Reviewed-by: Gabriel Laskar <gabriel at lse.epita.fr>
Reviewed-by: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
(cherry picked from commit 7b9ebf879b6f35038996805a641667f00d93c4b7)
Nominated-by: Mark Janes <mark.a.janes at intel.com>
commit e9ab083702fb6be6444224074632b0d36e6a16da
Author: Neil Roberts <neil at linux.intel.com>
Date: Mon Jul 13 18:01:13 2015 +0100
i965/bdw: Fix setting the instancing state for the SGVS element
When gl_VertexID or gl_InstanceID is used a 3DSTATE_VF_SGVS
instruction is sent to create a sort of element to store the generated
values. The last instruction in this chunk of code looks like it was
trying to set the instancing state for the element using the
3DSTATE_VF_INSTANCING instruction. However it was sending
brw->vb.nr_buffers instead of the element index. This instruction is
supposed to take an element index and that is how it is used further
down in the function so the previous code looks wrong. Perhaps
previously the number of buffers coincidentally matched the number of
enabled elements so the value was generally correct anyway. In a
subsequent patch I want to change a bit how it chooses the SGVS
element index so this needs to be fixed.
v2 [by Ben]
Remove stable 10.5 stable tag (it's too late now)
Commit update as follows:
The number of vertex buffers emitted is always <= the number of vertex elements.
To maximize reuse (actually, to minimize relocations - according to the code
comments), a vertex buffer is only emitted once, even when we setup multiple
components (3DSTATE_VERTEX_ELEMENT) from that buffer. This meant that the
previous code would use the wrong indexed element for these reuse cases. This
patch by itself prevents hangs on BSW in the linked bug. It doesn't make the
test pass, the remaining patches are needed for that.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91610
Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
Reviewed-by: Ben Widawsky <ben at bwidawsk.net>
Tested-by: Mark Janes <mark.a.janes at intel.com>
Cc: <mesa-stable at lists.freedesktop.org>
(cherry picked from commit c03247bae010dfd81a08572a32067e9ea8637f63)
commit e57c526b8705d06f305b3d758edd0312316650a1
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Jul 31 11:32:58 2015 -0400
glx: Fix __glXWireToEvent for BufferSwapComplete
In the DRI2 path this event is magically synthesized from the
corresponding DRI2 event, but with Present, the server sends us the
event itself. The DRI2 path fills in the serial number, send_event, and
display fields of the XEvent struct that the app sees, but the Present
path did not.
This is likely related to a class of crashes seen in gtk/clutter apps:
https://bugzilla.redhat.com/attachment.cgi?id=1032631
Note that the crashing instruction is looking up the lock_fns slot in
the Display *, and %rdi (holding the Display *) is 0x1.
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Adam Jackson <ajax at redhat.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit 8f7ebcb6fad53ea6d2f80fc5b7a046db07690032)
commit 69649ea637c0729b72969b1f466d86708b95bccc
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat Aug 15 22:05:15 2015 -0400
nv50,nvc0: take level into account when doing eng2d multi-layer blits
This fixes arb_get_texture_sub_image-get, and any situation where the 2d
engine was being used for multi-layer blits to a non-0 level.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 2514c78fba507ca8ab94d2e6de553b8b20d653d2)
commit 0a831196665f8a9c2c5001f9c1890e073bac9f14
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Fri Aug 14 14:10:36 2015 -0400
gm107/ir: indirect handle goes first on maxwell also
Fixes fs-simple-texture-size.shader_test
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit b346a84e270a50f0a8f1a6e474a51da04dd72f0e)
commit 20bb0a771dded700ba1b213256bf47dfedbdfd77
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Wed Jun 10 11:39:30 2015 -0400
radeonsi: properly set the raster_config for KV
This enables the second RB on asics that support it which
should boost performance.
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 649975e7162cc4ee0586ee76d24321cd7250581f)
commit 16c65ec37f5554041fa3dd8238d435041ac38526
Author: Frank Binns <frank.binns at imgtec.com>
Date: Tue Aug 4 14:32:45 2015 +0100
egl/x11: don't abort when creating a DRI2 drawable fails
When calling either eglCreateWindowSurface or eglCreatePixmapSurface it
was possible for an application to be aborted as a result of it failing
to create a DRI2 drawable on the server. This could happen due to an
application passing in an invalid native drawable handle, for example.
v2: Handle the case where an error has been set on the connection
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Frank Binns <frank.binns at imgtec.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 9a4eae61c24858d69d731d63b141d2acaed40d69)
commit 23bbe418fcce69447fb425012e9ac8d149fb5455
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue Aug 11 21:37:59 2015 +0200
r600g: allow setting geometry shader sampler states
We were ignoring them. This is both hilarious and sad.
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
(cherry picked from commit 8c0b943e87b48e7359230825cc06fbdd059a9e58)
commit f40be8799671e1195274ae846cd329d7a71c80bb
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue Aug 11 22:36:51 2015 +0200
r600g: fix polygon offset scale
The value was copied from r300g, which uses 1/12 subpixels, but this hw
uses 1/16 subpixels.
Should fix piglit: gl-1.4-polygon-offset (formerly a glean test)
(untested, ported from radeonsi)
Reviewed-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit d335aad11b208bcdcc75a99d4b6c5fc8b69ce368)
commit e7e38e11c3ec7ae03d46451ce45b7226a56ac25c
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue Aug 11 22:36:51 2015 +0200
radeonsi: fix polygon offset scale
The value was copied from r300g, which uses 1/12 subpixels, but this hw
uses 1/16 subpixels.
Fixes piglit: gl-1.4-polygon-offset (formerly a glean test)
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit bfac8ba9d32be351277c7ea814ac9848bdcb1f16)
commit b7a8003c588d928c1be224b595a1c43c76f67de6
Author: Oded Gabbay <oded.gabbay at gmail.com>
Date: Wed Aug 12 18:22:53 2015 +0300
mesa/formats: don't byteswap when building array formats
Because we build here an array format, we don't need to swap the
bytes for big endian.
If it isn't an array format, the bytes will be swapped in
_mesa_format_convert.
v2: remove temp variable
Signed-off-by: Oded Gabbay <oded.gabbay at gmail.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 5f1d5b1c7857f8680b47a7a450ee9e4530e22c6f)
commit d18593b4160d75d21e8e5849aeb021514bd77b35
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Mon Aug 10 01:32:23 2015 -0700
mesa/formats: Don't flip channels of null array formats
Before, if we encountered an array format of 0 on a BE system, we would
flip all the channels even though it's an invalid format. This would
result in a mostly invalid format with a swizzle of yyyy or wwww. Instead,
we should just return 0 if the array format stashed in the format info is
invalid.
Cc: "10.6 10.5" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit e3eb91af804f449005a2ff535c805eaa1d579d99)
commit 096282a662a303c24f5de5d8a0eeb16239f0c537
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Sun Aug 9 23:45:44 2015 -0700
mesa/formats: Fix swizzle flipping for big-endian targets
The swizzle defines where in the format you should look for any given
channel. When we flip the format around for BE targets, we need to change
the destinations of the swizzles, not the sources. For example, say the
format is an RGBX format with a swizzle of xyz1 on LE. Then it should be
wzy1 on BE; however, the code as it was before, would have made it 1zyx on
BE which is clearly wrong.
Reviewed-by: Iago Toral <itoral at igalia.com>
Reviewed-by: Oded Gabbay <oded.gabbay at gmail.com>
Cc: "10.6 10.5" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 28d1a506c8d09fa66170978c85566c34cbf1cc0a)
commit c364a00cf957f4e0b5e4d039f1736f54c57e7fde
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Sat Aug 8 09:00:21 2015 -0700
mesa/formats: Only do byteswapping for packed formats
Reviewed-by: Iago Toral <itoral at igalia.com>
Cc: "10.6 10.5" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 3941539179b72fe25b6dffd1aacc0722d198a5ca)
commit e5a198e4dd4771621e70f8a4c8f685e05a3cb22f
Author: Alex Deucher <alexander.deucher at amd.com>
Date: Mon Aug 10 15:35:21 2015 -0400
radeonsi: add new OLAND pci id
Reviewed-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 87cea61b9e2681e5365e989c7fa7a0298e4005fa)
commit 0a7202385d6c129164feb151deec99a0e43ed7bf
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Mon Aug 10 17:41:36 2015 -0400
nouveau: no need to do tnl wakeup, state updates are always hooked up
A TNL state update now requires a DrawBuffer to be set, which it isn't
early on in context creation. Since we init swtnl from context init,
this caused crashes.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91570
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 3fa1ca34cc0134bd16b3315a0695703c9f684bd4)
commit d706b00522e23704ea1cee91fd0d5e7dedccca9e
Author: Oded Gabbay <oded.gabbay at gmail.com>
Date: Tue Aug 4 21:39:32 2015 +0300
mesa: clear existing swizzle info before bitwise-OR
This patch fixes a bug in big-endian treatment, where the previous
swizzle info wasn't cleared before a new swizzle info was inserted into
the format field using a bitwise-OR operation.
v2: use MESA_ARRAY_FORMAT_SWIZZLE_*_MASK instead of numeric constants
v3: align according to coding style
Signed-off-by: Oded Gabbay <oded.gabbay at gmail.com>
CC: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
(cherry picked from commit 2ac171a7db4e4ad2fa902e62bf18bc1f67e91643)
commit d02bb82d52da5029ae2e2cb77f6d2568f5ed425b
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Fri Jul 17 12:52:27 2015 +0100
vc4: add missing nir include, to fix the build
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit 75ce7919d6496981013a21a7055c668e47e7bed2)
commit 3ebf4afbf704dd7f4b537694a6641de32f856669
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Thu Jul 23 17:26:56 2015 -0700
meta/copy_image: Stash off the scissor
The meta CopyImageSubData path uses BlitFramebuffers to do the actual copy.
The only thing that can affect BlitFramebuffers other than the currently
bound framebuffers is the scissor so we need to save that off and reset it.
If we don't do this, applications that use a scissor together with
CopyImageSubData will get accidentally scissored copies.
Tested-by: Markus Wick <markus at selfnet.de>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
(cherry picked from commit 736c6f3cfc2c69e3c29268d4ebb7110dd36ac97f)
commit 99793e2541510fe208d29e69fedf97a6fff006f8
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Tue Aug 11 18:54:18 2015 +0100
docs: add sha256 checksums for 10.6.4
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 6b2fcee64edadbd4db2293f5f4fc1a70e80c7251
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Tue Aug 11 16:39:10 2015 +0100
docs: add release notes for 10.6.4
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 95ecedf6d9af87b98aa07112048f495c964bd4cf
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Tue Aug 11 16:35:06 2015 +0100
Update version to 10.6.4
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 736f6e16d9989f01cc55dcba15ba978ba90b7748
Author: Francisco Jerez <currojerez at riseup.net>
Date: Wed Aug 5 16:29:30 2015 +0300
i965/fs: Fix fs_inst::regs_read() for sources in the ATTR file.
Otherwise it would crash on Gen8 with scalar VS. The issue can easily
be reproduced with the following patch, but I don't see any reason why
it wouldn't be possible to end up with an ATTR argument here even
without it.
CC: mesa-stable at lists.freedesktop.org
Reviewed-by: Connor Abbott <connor.w.abbott at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
(cherry picked from commit 42a18ca76057621ae7d8812b29ea2245d6ff282d)
commit f13ba8a5ab537e6dcdcc8b0c1a814012202d2497
Author: Eduardo Lima Mitev <elima at igalia.com>
Date: Wed Jul 29 16:01:28 2015 +0200
mesa: Fix error returned by glCopyTexImage2D() upon an invalid internal format
Page 161 of the OpenGL-ES 3.1 (PDF) spec, and page 207 of the OpenGL 4.5 (PDF),
both on section '8.6. ALTERNATE TEXTURE IMAGE SPECIFICATION COMMANDS', states:
"An INVALID_ENUM error is generated if an invalid value is specified for
internalformat".
It is currently returning INVALID_OPERATION error because
_mesa_get_read_renderbuffer_for_format() is called before the internalformat
argument has been validated. To fix this, we move this call down the validation
process, after _mesa_base_tex_format() has been called. _mesa_base_tex_format()
effectively serves as a validator for the internal format.
Fixes 1 dEQP test:
* dEQP-GLES3.functional.negative_api.texture.copyteximage2d_invalid_format
Fixes 1 piglit test:
* spec at oes_compressed_etc1_rgb8_texture@basic
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 4b07e9a033ddb6733eba206b5bd47a2373756f7d)
commit 791cf8a025ac0d610596cdfab17fc84b49df2288
Author: Eduardo Lima Mitev <elima at igalia.com>
Date: Wed Jul 29 16:01:26 2015 +0200
mesa: Validate target before resolving tex obj in glTex(ture)SubImageXD
Currently, glTexSubImageXD attempt to resolve the texture object
(by calling _mesa_get_current_tex_object()) before validating the given
target. However, that method explicitly states that target must have been
validated before calling it, so it never returns a user error.
The target validation occurs later when texsubimage_error_check() is called.
This patch reorganizes target validation, taking it out from the error check
function and into a point before the texture object is resolved.
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 5d64cae8427b090c42d6d38da7fb474b3ddd4eb0)
[Emil Velikov: s/_mesa_enum_to_string/_mesa_lookup_enum_by_nr/]
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Conflicts:
src/mesa/main/teximage.c
commit 58b2e95c1f09aafdfe5434f433ed7dc7a628e7a8
Author: Eduardo Lima Mitev <elima at igalia.com>
Date: Wed Jul 29 16:01:23 2015 +0200
mesa: Fix errors values returned by glShaderBinary()
Page 68, section 7.2 'Shader Binaries" of the of the OpenGL ES 3.1,
and page 88 of the OpenGL 4.5 specs state:
"An INVALID_VALUE error is generated if count or length is negative.
An INVALID_ENUM error is generated if binaryformat is not a supported
format returned in SHADER_BINARY_FORMATS."
Currently, an INVALID_OPERATION error is returned for all cases.
Fixes 1 dEQP test:
* dEQP-GLES3.functional.negative_api.shader.shader_binary
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
(cherry picked from commit b38a50f1e3edae6079c91f73a8d9c63a2dbf512a)
commit 1f6798a70a6d7e6db636decc6af752f9a7714906
Author: Frank Binns <frank.binns at imgtec.com>
Date: Fri Jul 31 09:11:45 2015 +0100
egl: Add eglQuerySurface surface type check for EGL_LARGEST_PBUFFER attrib
Calling eglQuerySurface on a window or pixmap with the EGL_LARGEST_PBUFFER
attribute resulted in the contents of the 'value' parameter being modified.
This is the wrong behaviour according to the EGL spec, which states:
"Querying EGL_LARGEST_PBUFFER for a pbuffer surface returns the
same attribute value specified when the surface was created with
eglCreatePbufferSurface. For a window or pixmap surface, the
contents of value are not modified."
Avoid this from happening by checking that the surface type is EGL_PBUFFER_BIT
before modifying the contents of the parameter.
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Frank Binns <frank.binns at imgtec.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit b2c5986ea1c8e66c4e0a05bcacbcf28c27f5b183)
commit 84ef345dffec02d790db13fd6257e2c08eb0d56a
Author: Frank Binns <frank.binns at imgtec.com>
Date: Fri Jul 31 09:11:46 2015 +0100
egl/dri: Add error info needed for EGL_EXT_image_dma_buf_import extension
Update the DRI image interface error codes to reflect the needs of the
EGL_EXT_image_dma_buf_import extension. This means updating the existing error
code documentation and adding a new __DRI_IMAGE_ERROR_BAD_ACCESS error code
so that drivers can correctly reject unsupported pitches and offsets. Hook
the new error code up in EGL to return EGL_BAD_ACCESS.
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Frank Binns <frank.binns at imgtec.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit cfc3200a35647026a0b5cf188f378ce33802044b)
commit 7722a24cab4b8880d45fb723205e2eedfada2055
Author: Marek Olšák <marek.olsak at amd.com>
Date: Sun Aug 2 15:18:36 2015 +0200
r600g: fix the CB_SHADER_MASK setup
This fixes the single-sample fast clear hang.
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>
Reviewed-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit d4ad4c20617f45f71152e292ee39f020ef352bfd)
commit 880a0ce2e973d5ed9ee28c3f48fc5332128f9652
Author: Marek Olšák <marek.olsak at amd.com>
Date: Sat Jul 25 00:53:16 2015 +0200
radeonsi: completely rework updating descriptors without CP DMA
For 10.6: This fixes graphical corruption occuring on most Southern Islands
Radeon GPUs. This will allow closing a lot of bugs in the bugzilla.
The patch has a better explanation. Just a summary here:
- The CPU always uploads a whole descriptor array to previously-unused memory.
- CP DMA isn't used.
- No caches need to be flushed.
- All descriptors are always up-to-date in memory even after a hang, because
CP DMA doesn't serve as a middle man to update them.
This should bring:
- better hang recovery (descriptors are always up-to-date)
- better GPU performance (no KCACHE and TC flushes)
- worse CPU performance for partial updates (only whole arrays are uploaded)
- less used IB space (no CP_DMA and WRITE_DATA packets)
- simpler code
- corruption issues are fixed on SI cards
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
(cherry picked from commit b0528118dfb1af00e7d08cdb637191b80c14c2ba)
commit 842a3af20b6d5dc12e2025be8005531d5da6285c
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Sep 15 23:34:28 2014 +0200
radeonsi: rework how shader pointers to descriptors are set
For 10.6: This is a prerequisite for the next fix. The below comment is from
the original commit.
This is mainly needed for tessellation where a VS can be bound as VS, ES,
or LS, and TES (tess. evaluationshader) can be bound as VS or ES or neither.
Therefore we need the ability to move pointers to descriptors between
shaders arbitrarily.
The idea is that the context has a mapping from PIPE_SHADER_x to
SPI_SHADER_USER_DATA_x. After a shader is enabled or disabled,
si_shader_change_notify should be called to update this mapping accordingly.
There is a dirty flag for each shader pointer, but only one emit function
for all pointers in the whole context, whose code and logic is separated
from descriptors.
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
(cherry picked from commit 3ce91c727f2a00a05f414351266b0b45d677611e)
commit bc29f8f6b7b4a9bf575e401bd08bebe87d7dc863
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Tue Jul 7 13:05:04 2015 +0300
opencl: use versioned .so in mesa.icd
We must have versioned library in mesa.icd, because ICD loader would
fail if the mesa-devel package wasn't installed.
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Reported-by: Fabian Deutsch <fabian.deutsch at gmx.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73512
Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Acked-by: Michel Dänzer <michel.daenzer at amd.com>
(cherry picked from commit 4d7e0fa8c731776ad5d630f37b36c535f1907371)
commit f2f62059dc5c9b548127c31bc7875c6836716944
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Mon Jul 13 20:01:39 2015 +0100
bugzilla_mesa.sh: sort the bugs list by number
v2: Use change sed/sort based on Ilia's suggestion.
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit c505064b2cea14c9da115a26e9326b9c0c7dca3b)
commit 2a72e18abbe9286d16e388eb1a004147f0b6e54b
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Mon Jul 6 23:34:23 2015 +0200
nv50: avoid segfault with enabled but unbound vertex attrib
Before validating vertex arrays we need to check if a VBO is present.
Checking if vb->buffer is not NULL fixes the issue.
Fixes the following piglit test:
gl-3.1-vao-broken-attrib
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
(cherry picked from commit adc816a1e41812e6489a5bc388f80de65504be5b)
commit b70176d96b1b5033d4bc1414fd63758ebd144787
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Jul 29 15:44:32 2015 +0100
winsys/radeon: don't leak the fd when it is 0
Earlier commit added an extra dup(fd) to fix a ZaphodHeads issue.
Although it did not consider the (very unlikely) case where we might end
up with the valid fd == 0.
Fixes: 28dda47ae4d(winsys/radeon: Use dup fd as key in drm-winsys hash
table to fix ZaphodHeads.)
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Mario Kleiner <mario.kleiner.de at gmail.com>
(cherry picked from commit 1307be519b8785249ee863a22115930299ff642a)
commit d8116f8ec531980d287e5fcb1091acfe2fcffb8d
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Fri Jul 10 11:01:55 2015 +0100
egl/wayland: libdrm is a hard requirement, treat it as such
Prompt at configure time if it's missing otherwise we'll fail later on
in the build. Remove ambiguous HAVE_LIBDRM guard.
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit fa109d02dda118f756903b663879375c06353ae7)
commit 8f8c842338b11185e8432e4b44e31a85abcbf9c6
Author: Ben Widawsky <benjamin.widawsky at intel.com>
Date: Wed Jul 29 12:35:24 2015 -0700
i965/skl: Add production thread counts and URB size
This patch adjusts the SKL values to the best known values we have.
v2: Remove HS/DS/CS fields. Adding this makes most sense to add to the
GEN9_FEATURES macro, however, doing that would require updating BXT values, and
Jordan requested I not do that. Conveniently, this request makes a lot of sense
wrt to stable backport as HS, and DS do not even exist there.
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
(cherry picked from commit 7eaacc1678195738fab3bb98870828611cae066d)
[Emil Velikov: .supports_simd16_3src is missing in 10.6]
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Conflicts:
src/mesa/drivers/dri/i965/brw_device_info.c
commit eddea78fb36039e03478e11780c8a32c06c1c435
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Wed Jul 22 20:08:23 2015 -0700
glsl: Fix a bug where LHS swizzles of swizzles were too small.
A simple shader such as
vec4 color;
color.xy.x = 1.0;
would cause ir_assignment::set_lhs() to generate bogus IR:
(swiz xy (swiz x (constant float (1.0))))
We were setting the number of components of each new RHS swizzle based
on the highest channel used in the LHS swizzle. So, .xy.y would
generate (swiz xy (swiz xx ...)), while .xy.x would break.
Our existing Piglit test happened to use .xzy.z, which worked, since
'z' is the third component, resulting in an xxx swizzle.
This patch sets the number of swizzle components based on the size of
the LHS swizzle's inner value, so we always have the correct number
at each step.
Fixes new Piglit tests glsl-vs-swizzle-swizzle-lhs-[23].
Fixes ir_validate assertions in in Metro 2033 Redux.
v2: Move num_components updating completely out of update_rhs_swizzle
(suggested by Timothy Arceri). Simplify.
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Timothy Arceri <t_arceri at yahoo.com.au>
(cherry picked from commit e235ca159f5f6de2bd29616fdda5c02dc69b0d7f)
commit 080c4713bcd4c0c3643b3fb3ede1aa09f891aecf
Author: Marek Olšák <marek.olsak at amd.com>
Date: Fri Jul 24 19:47:06 2015 +0200
st/mesa: don't ignore texture buffer state changes
Fixes piglit:
spec at arb_texture_buffer_range@ranges-2
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit e39ece0d7856d0532a0f011cd5cb17bc85ee82e2)
[Emil Velikov: resolve tess related conflicts.]
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Conflicts:
src/mesa/state_tracker/st_atom_texture.c
src/mesa/state_tracker/st_context.c
src/mesa/state_tracker/st_context.h
commit ba10c9ff5088b99591c13cad0b70929b49e6319c
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat Jul 11 12:47:03 2015 -0400
nvc0: fix geometry program revalidation of clipping params
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit a818faa6ddcfa6cd90a24b70c49ec76573954111)
commit f167d9b46cd41e8c750bdfd65a05c04545546236
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Tue May 12 05:46:04 2015 -0700
meta: Fix reading luminance texture as rgba in _mesa_meta_pbo_GetTexSubImage()
After recent addition of pbo testing in piglit test getteximage-luminance,
it fails on i965. This patch makes a sub test pass.
This patch adds a clear color operation to meta pbo path, which I think is
better than falling back to software path.
V2: Fix color mask for GL_LUMINANCE_ALPHA
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
(cherry picked from commit aa40546b2de4cd572af02d31fd5c7d4045505ea2)
commit def2d2e018abbab381ea329a8472bded18b45659
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Thu Jun 11 16:48:26 2015 -0700
mesa: Add a helper function _mesa_need_luminance_to_rgb_conversion()
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
(cherry picked from commit c59c0f8a42652603da7f89e3270897cb685fe76b)
commit 831bf63e6b55c4f1f610a2fb988906550157172a
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Wed May 6 05:43:08 2015 -0700
meta: Don't do fragment color clamping in _mesa_meta_pbo_GetTexSubImage
_mesa_meta_pbo_GetTexSubImage() uses _mesa_meta_BlitFrameBuffer(),
which will do fragment clamping if enabled. But fragment clamping
doesn't affect ReadPixels and GetTexImage.
Without this patch, piglit test arb_color_buffer_float-clear fails,
when forced to use the meta pbo path.
v2: Apply this fix to both glReadPixels and glGetTexImage.
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
(cherry picked from commit ca4e17e03e9aeaa04fe6bb04bfe2d6f97991005b)
commit 6321bf72be877fe3efc81bd9e3c6d645d6b6ed9a
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Wed May 20 10:22:45 2015 -0700
meta: Abort meta pbo path if readpixels need signed-unsigned conversion
Meta pbo path for ReadPixels rely on BlitFramebuffer which doesn't support
signed to unsigned integer conversions and vice versa.
Without this patch, piglit test fbo_integer_readpixels_sint_uint fails, when
forced to use the meta pbo path.
v2: Make need_signed_unsigned_int_conversion() a static function. (Iago)
Bump up the comment and the commit message. (Jason)
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
Reviewed-by: Iago Toral <itoral at igalia.com>
(cherry picked from commit 0d207905e675b778739236072e7a4dfba7cd7959)
commit acaac69ccd3d8d70044aab98dbadc5b177510eb5
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Wed May 20 10:21:39 2015 -0700
meta: Fix transfer operations check in meta pbo path for readpixels
Currently used ctx->_ImageTransferState check is not sufficient
because it doesn't include the read color clamping enabled with
GL_CLAMP_READ_COLOR. So, use the helper function
_mesa_get_readpixels_transfer_ops().
Also, transfer operations don't affect glGetTexImage(). So, do
the check only for glReadPixles.
Without this patch, arb_color_buffer_float-readpixels test fails, when
forced to use meta pbo path.
V2: Add a comment and bump up the commit message.
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
(cherry picked from commit 1252d53c19ec005c17ca666cecb7db072d77e5ce)
commit fbc464803a777bea4f9b7b11eeba192122adf8cb
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Tue May 19 17:44:52 2015 -0700
mesa: Turn get_readpixels_transfer_ops() in to a global function
This utility function is utilized in a later patch.
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
(cherry picked from commit 7974e23be9ff7586e5250cff321b6ec7749ecc44)
commit 56e4cc67fec63d86d76f5b4de55678890cf06648
Author: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Date: Thu Jul 23 10:38:36 2015 +0200
glsl/glcpp: fix SIGSEGV when checking error condition for macro redefinition
Commit a6e9cd14c does not take into account than node_{a,b}->next could be NULL
in some circumstances, such as in a shader containing this code:
#define A 1 /* comment */
#define A 1 /* comment */
This patch fixes the segmentation fault for cases like that.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91290
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 30f97b5e52b324d501c56df8902d294fb755a5b7)
commit a31dfd91b500735c44bb89e194f02b718299bf2e
Author: Marek Olšák <marek.olsak at amd.com>
Date: Fri Jul 10 23:35:55 2015 +0200
radeonsi: upload shader rodata after updating scratch relocations
Cc: 10.5 10.6 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
(cherry picked from commit 50a957c5de842b18e10c361f7b0310aa46bb483f)
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Conflicts:
src/gallium/drivers/radeonsi/si_shader.c
src/gallium/drivers/radeonsi/si_shader.h
commit 504903b827604f1a630a335d14231f88c2cf36be
Author: Marek Olšák <marek.olsak at amd.com>
Date: Thu Jul 16 17:14:07 2015 +0200
st/mesa: don't call st_validate_state in BlitFramebuffer
None of the draw states are used here.
This fixes a crash in piglit: ext_framebuffer_blit/blit-early
Calling st_manager_validate_framebuffers is the minimum requirement here.
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit d082c5324914212f76e45be497229c7a0681f706)
commit c33ca1696a0a967091937805fa198ffc3317a03f
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Thu Jul 9 21:19:15 2015 +0100
configure.ac: do not set HAVE_DRI(23) when libdrm is missing
These conditionals are used to guard both dri modules and loader(s).
Currently if we try to build the gallium swrast dri module (without glx)
on a system that's missing libdrm the build will fail.
v2: Make sure we assign prior to checking the have_libdrm variable.
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 16f6d432de07dcb537dafd0c9f3ef7614891ed6b)
Conflicts:
configure.ac
commit ccef8901de421eae5dcc8affa14218d46cc06593
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Jul 26 15:18:24 2015 +0100
docs: Add checksums for mesa 10.6.3 tarballs
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit ddc976368fef367e464472ebcc2ac4fd89eb9fd8
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Jul 26 14:38:58 2015 +0100
Add release notes for 10.6.3
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 2eef0b7d8608faeecd7cf71b386d64edd7a08e24
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Jul 26 14:33:29 2015 +0100
Update version to 10.6.3
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 954c18fb5c95c125ef43a88b55af620dca32e829
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Mon Jul 20 00:19:56 2015 -0400
nv50: fix max level clamping on G80
It appears that the G80 did not have support for the sampler view
first/last clamping. Put the view's last level in the place of the
texture's so that it doesn't go past what the sampler view allows.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 801d41fa43eba996c6bd7c071282ad15e51609d3)
commit 2a77b82a92494d91e90b516ad5fed8e6e0a10a6b
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat Jul 18 19:02:29 2015 -0400
gm107/ir: fix indirect txq emission
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 8c8a71f0d125bb655b17a32914ffecf8d159593b)
commit 7efc693ef26c91c545c78f4b751432e43011b541
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat Jul 18 18:38:42 2015 -0400
nvc0/ir: don't worry about sampler in txq handling
There's no need to deal with samplers for texture size queries. That
code also was accidentally setting an invalid sIndirectSrc position, but
it can now just be removed.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 346ce0b98832e33d5411200002571b3edea9e2bb)
commit 440f465f5f38c0f522eea3a79d94663954b63864
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat Jul 18 16:43:17 2015 -0400
nvc0/ir: fix txq on indirect samplers
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 20e484afa4874e87cd18daffd66286bb893cf3fb)
commit 9656b34faef3a262ad0354a3194ed1ee1edd1e16
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sat Jul 4 19:15:16 2015 -0700
program: Allow redundant OPTION ARB_fog_* directives.
A fragment program from "Pixel Piracy" contains redundant OPTION
directives:
!!ARBfp1.0
OPTION ARB_precision_hint_fastest;
OPTION ARB_fog_exp2;
OPTION ARB_precision_hint_fastest;
OPTION ARB_fog_exp2;
...
We already allow redundant ARB_precision_hint_fastest directives, but
disallow the redundant (yet consistent) ARB_fog_exp2 directives, failing
to compile the program.
The specification seems to contradict itself - the main text says that
only one fog application option may be specified, but then backpedals,
indicating the intent is to disallow /contradictory/ flags. One of the
issues suggests that specifying contradictory ones is stupid, but
allowed, and only the last one should take effect.
Accepting multiple redundant (but consistent) directives seems harmless,
and like a reasonable interpretation of the specification. It also
fixes a fragment program found in the wild.
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 4b17f0d9f58637300b0748d1fb702a7e4d51979f)
commit 329763791b2a869f30a39b8d1f94b95dcb2c9e8e
Author: Francisco Jerez <currojerez at riseup.net>
Date: Wed Jul 1 16:32:24 2015 +0300
i965/gen9: Use custom MOCS entries set up by the kernel.
Instead of relying on hardware defaults the i915 kernel driver is
going program custom MOCS tables system-wide on Gen9 hardware. The
"WT" entry previously used for renderbuffers had a number of problems:
It disabled caching on eLLC, it used a reserved L3 cacheability
setting, and it used to override the PTE controls making renderbuffers
always WT on LLC regardless of the kernel's setting. Instead use an
entry from the new MOCS tables with parameters: TC=LLC/eLLC, LeCC=PTE,
L3CC=WB.
The "WB" entry previously used for anything other than renderbuffers
has moved to a different index in the new MOCS tables but it should
have the same caching semantics as the old entry.
Even though the corresponding kernel change ("drm/i915: Added
Programming of the MOCS") is in a way an ABI break it doesn't seem
necessary to check that the kernel is recent enough because the change
should only affect Gen9 which is still unreleased hardware.
v2: Update MOCS values for the new Android-incompatible tables
introduced in v7 of the kernel patch.
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Reference: http://lists.freedesktop.org/archives/intel-gfx/2015-July/071080.html
Reviewed-by: Ben Widawsky <ben at bwidawsk.net>
(cherry picked from commit af768922cafa3eb3e78a2fdfee90380a74c79460)
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Conflicts:
src/mesa/drivers/dri/i965/brw_defines.h
commit 8132c7ac41f07857368aef25cbc4a26979784ba4
Author: Brian Paul <brianp at vmware.com>
Date: Wed Jul 15 06:15:06 2015 -0600
osmesa: fix OSMesaPixelsStore typo
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91337
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 141e1eb29fe80ad341e718147a1277cc3b1b9c11)
commit da8bc1673936b9c9ba83c3d60fd03ce383bc8e85
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Fri Jul 10 21:27:13 2015 +0100
auxiliary/vl: use the correct screen index
Inspired (copied) from Marek's commit for egl/x11
commit 0b56e23e7f3(egl/dri2: use the correct screen index)
v2: Fix copy/pasta errors.
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit 7a50bf6c7f7729f5eee3ddf7aa9b38a81873f2c6)
commit 6012eeca0b44240b5ddc40650266eeaeb076d6fa
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Fri Jul 10 16:42:18 2015 -0400
nv50, nvc0: enable at least one color RT if alphatest is enabled
Fixes the following piglits:
fbo-alphatest-nocolor
fbo-alphatest-nocolor-ff
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 1bfa25e88d21f95b9e176232bb091af77c294578)
commit 9c7f5947058b17d2fd117e475a0395a6a1f745af
Author: Chad Versace <chad.versace at intel.com>
Date: Thu Jul 9 18:46:21 2015 -0700
mesa: Fix generation of git_sha1.h.tmp for gitlinks
Don't assume that $(top_srcdir)/.git is a directory. It may be a
gitlink file [1] if $(top_srcdir) is a submodule checkout or a linked
worktree [2].
[1] A "gitlink" is a text file that specifies the real location of
the gitdir.
[2] Linked worktrees are a new feature in Git 2.5.
Cc: "10.6, 10.5" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
(cherry picked from commit 75784243df1f5bb0652fb243b37d69f36d493a86)
commit 9e62e1a1d3023fa2834c6715c6bed72c3f11dac6
Author: Rob Clark <robclark at freedesktop.org>
Date: Wed Jul 8 13:30:22 2015 -0400
xa: don't leak fences
XA was never unref'ing last_fence in the various call paths to
pipe->flush(). Add this to xa_context_flush() and update the other
open-coded calls to pipe->flush() to use xa_context_flush() instead.
This fixes a memory leak reported with xf86-video-freedreno.
Reported-by: Nicolas Dechesne <nicolas.dechesne at linaro.org>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Rob Clark <robclark at freedesktop.org>
(cherry picked from commit 0a8af6361eecaba0f34a668328746924b61caa6a)
commit 4a3d6d04e10db6e756ecc8f09e737958fab7246b
Author: Christian König <christian.koenig at amd.com>
Date: Mon Jun 29 10:19:36 2015 +0200
st/vdpau: fix mixer size checks
We need to check what the 3D pipe is able to handle for the mixer, not what
the decoder is able to decode. This fixes output of resolutions like 720x1280.
Signed-off-by: Christian König <christian.koenig at amd.com>
CC: mesa-stable at lists.freedesktop.org
(cherry picked from commit 2cfa64e159a68998b76bdbcd20f8c7810379fce0)
commit 9850b9ca73056dc4e606b8cdfcd0d97659d25861
Author: Christian König <christian.koenig at amd.com>
Date: Fri May 29 15:10:31 2015 +0200
vl: cleanup video buffer private when the decoder is destroyed
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=90728
Signed-off-by: Christian König <christian.koenig at amd.com>
CC: mesa-stable at lists.freedesktop.org
(cherry picked from commit bbfdf5c17b695c31915e293e1ec858cbcb340894)
commit 89cbd91b17989ec7eb1cb93ac427a84dca56cd79
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sat Jul 11 20:33:16 2015 +0100
docs: Add sha256 checksums for the 10.6.2 release
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 9643cce94c8a1938e3342fb83d025a1e5c2aa79b
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sat Jul 11 19:46:49 2015 +0100
Add release notes for the 10.6.2 release
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 187f919c9004274cee95f7a4940b909c54923a1d
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sat Jul 11 19:42:36 2015 +0100
Update version to 10.6.2
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 5e9254194594b863f55f4efcafca7fbb5b21ec8f
Author: Neil Roberts <neil at linux.intel.com>
Date: Fri Jun 26 17:54:15 2015 +0100
i965: Don't try to print the GLSL IR if it has been freed
Since commit 104c8fc2c2aa5621261f8 the GLSL IR will be freed if NIR is
being used. This was causing it to segfault if INTEL_DEBUG=wm is set.
This patch just makes it avoid dumping the GLSL IR in that case.
Reviewed-by: Ben Widawsky <ben at bwidawsk.net>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
(cherry picked from commit c0ca6c30eaf7f488f154c462a01a8945cb4a3103)
commit 6b6e14ac35750e0a7f8194923877a842f9a43e3f
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sun Jun 28 22:17:09 2015 -0700
Revert "i965: Delete linked GLSL IR when using NIR."
This reverts commit 104c8fc2c2aa5621261f80aa6b4f76c3163078f1.
(cherry picked from commit cae701fc8ed0faeaaaafd1cf57f6143031edcab2)
commit 25daf2592c21881eed3cbe1e8439f32878b3eb2f
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sun Jun 28 22:17:16 2015 -0700
Revert "glsl: clone inputs and outputs during linking"
This reverts commit c2ff3485b3d48749ea9dcad07bc1a691627dc3e5.
Ilia and I noticed a memory leak caused by this patch: at least with
fixed-function programs, we clone things using ProgramResourceList as
the context before reralloc makes it non-NULL.
I believe Tapani found other bugs with these patches, so I'm just going
to revert them for now and let him pursue them further.
(cherry picked from commit 6218c68bece0cea671f2940a651119a87ab8b24e)
commit b85e389d6caebdad3eb1e080146a3ef113aec8a5
Author: Mike Stroyan <mike at lunarg.com>
Date: Wed Jul 1 10:16:28 2015 -0600
i965: allocate at least 1 BLEND_STATE element
When there are no color buffer render targets, gen6 and gen7 still
use the first BLEND_STATE element to determine alpha test.
gen6_upload_blend_state was allocating zero elements when
ctx->Color.AlphaEnabled was false.
That left _3DSTATE_CC_STATE_POINTERS or _3DSTATE_BLEND_STATE_POINTERS
pointing to random data from some previous brw_state_batch().
That sometimes suppressed depth rendering when those bits
happened to mean COMPAREFUNC_NEVER.
This produced flickering shadows for dota2 reborn.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=80500
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit fe2b748a39ff676949fcefccf739aff967fc38c5)
Nominated-by: Kenneth Graunke <kenneth at whitecape.org>
commit 57a6f5208d2affe33bfef4bc1d632e4c63af7b1e
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue Jul 7 18:28:31 2015 +0200
st/dri: don't set PIPE_BIND_SCANOUT for MSAA surfaces
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91231
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 6611f65047575054a38ce83ebfe0331e39e1774f)
Nominated-by: Ilia Mirkin <imirkin at alum.mit.edu>
commit f3abea1577f8d5c17dacab17aeafb0c1fc1092cc
Author: Matt Turner <mattst88 at gmail.com>
Date: Sat Feb 28 12:12:22 2015 -0800
Revert SHA1 additions.
The shader-cache isn't finished, so the configure checks are a bit
premature and will only stand to confuse users of Mesa 10.6.
This is a squash of the follow four reverts:
Revert "Rename sha1.c and sha1.h to mesa-sha1.c and mesa-sha1.h"
Revert "configure: Add machinery for --enable-shader-cache (and --disable-shader-cache)"
Revert "sha1: Fix gcry_md_hd_t typo."
Revert "mesa: Add mesa SHA-1 functions"
Reviewed-by: Carl Worth <cworth at cworth.org>
commit 6fbe4bf790c3ee20044928058ba64b17589df3cd
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Jun 10 08:28:13 2015 +0100
loader: Look for any version of currently linked libudev.so
Since there was an ABI break and linking twice against libudev.so.0 and
libudev.so.1 causes the application to quickly crash, we first check if
the application is currently linked against libudev before dlopening a
local handle. However for backwards/forwards compatability, we need to
inspect the application for current linkage against all known versions
first. Not doing so causes a crash when both libraries are present and
so mesa chooses libudev.so.1 but the application was linked against
libudev.so.0.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Emil Velikov:
I'm ever so slightly conserned that RTLD_NOLOAD is not part of the POSIX
standard, thus it's missing on some platforms (*BSD seems ok, while
Solaris, MacOS are not).
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit f2413457937f8f4a92e11379569be69e508d7477)
commit 4c3a4ac6da7820226ecad5fd654899ae727e11e0
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Tue Jul 7 23:05:45 2015 -0400
nvc0: turn sample counts off during blit
Fixes the following piglits:
occlusion_query_meta_fragments
occlusion_query_meta_no_fragments
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 38c2ec5ff0bf626578db7b84387279342aa48844)
commit 2ca2f3701b9928374911c603178cf92da1e5167b
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Wed Jul 1 20:13:00 2015 -0700
i965/vs: Fix matNxM vertex attributes where M != 4.
Matrix vertex attributes have their columns padded out to vec4s, which
I was failing to account for. Scalar NIR expects them to be packed,
however.
Fixes 1256 dEQP tests on Broadwell.
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Tested-by: Mark Janes <mark.a.janes at intel.com>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
(cherry picked from commit 73d0e7f3451eaeb62ac039d2dcee1e1c6787e3db)
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Conflicts:
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
commit fcc9f9e06e770c709bba619836da8b3ee525cd7a
Author: Neil Roberts <neil at linux.intel.com>
Date: Sat Jul 4 22:40:59 2015 +0100
glsl: Make sure not to dereference NULL
In this bit of code point_five can be NULL if the expression is not a
constant. This fixes it to match the pattern of the rest of the chunk
of code so that it checks for NULLs.
Cc: Matt Turner <mattst88 at gmail.com>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit 86a3557d7c95ac945eedf42ab095639b255c1bed)
commit 5de0e9f982de9cbb6823b7a3d130bb632a16b2ae
Author: Neil Roberts <neil at linux.intel.com>
Date: Sat Jul 4 22:40:58 2015 +0100
glsl: Add missing check for whether an expression is an add operation
There is a piece of code that is trying to match expressions of the
form (mul (floor (add (abs x) 0.5) (sign x))). However the check for
the add expression wasn't checking whether it had the expected
operation. It looks like this was just an oversight because it doesn't
match the pattern for the rest of the code snippet. The existing line
to check whether add_expr!=NULL was added as part of a coverity fix in
3384179f.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91226
Cc: Matt Turner <mattst88 at gmail.com>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit 18039078e0254c7cb5e15b7186be05e2e4c10f38)
commit 083840d365e079ec4b63911dc4b4fb8dda5b98d2
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Wed Mar 4 15:46:57 2015 -0800
i965: Reserve more batch space to accomodate Gen6 perfmonitors.
Ben noticed that I said each PIPE_CONTROL was 4 DWords, but it's
actually 5 DWords on Gen6-7. We've been reserving insufficient space
for performance monitoring on Sandybridge, which means it would likely
break if you used that functionality. (Thankfully, no one does...)
Also, the existing number of 146 was the result of me flubbing up the
arithmetic: it should have actually been 140.
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Ben Widawsky <ben at bwidawsk.net>
(cherry picked from commit d9ab95b365f058a46bc43a8cb96b6fff10a13faf)
commit afa43fa696e7dd65ebce4c1e95892a4886d6049e
Author: Neil Roberts <neil at linux.intel.com>
Date: Fri Jul 3 13:15:21 2015 +0100
i965/skl: Set the pulls bary bit in 3DSTATE_PS_EXTRA
On Gen9+ there is a new bit in 3DSTATE_PS_EXTRA that must be set if
the shader sends a message to the pixel interpolator. This fixes the
interpolateAt* tests on SKL, apart from interpolateatsample-nonconst
but that is not implemented anywhere so it's not a regression.
Reviewed-by: Ben Widawsky <ben at bwidawsk.net>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Cc: "10.6 10.5" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 493af150fb3b1c007d791b24dcd5ea8a92ad763c)
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Conflicts:
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
src/mesa/drivers/dri/i965/gen8_ps_state.c
commit 03cf14a71378eec10d8c496916c0bc0ff212ef7d
Author: Marek Olšák <marek.olsak at amd.com>
Date: Wed Jun 24 11:58:50 2015 +0200
radeonsi: fix a hang with DrawTransformFeedback on 4 SE chips
Cc: 10.6 10.5 <mesa-stable at lists.freedesktop.org>
Acked-by: Christian König <christain.koenig at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
(cherry picked from commit d3f4f6b2e9380a91ab61b93c55ab36106345e7b2)
commit e529d5ffb4c0b951005948d06e8ce868f5659c24
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Fri Jul 3 19:09:09 2015 -0400
nv50/ir: UCMP arguments are float, so make sure modifiers are applied
The first argument to UCMP needs to be compared against 0, but the
latter arguments are treated as float and need to be able to properly
apply neg/abs arguments. Adjust the inferSrcType function accordingly.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit f70719cc4b64e12310dfe8825a8e2d4bce970673)
commit 4d8c6edab419375b0b9e25d7e53af394258c1ab8
Author: Mario Kleiner <mario.kleiner.de at gmail.com>
Date: Sun Jun 28 03:02:31 2015 +0200
winsys/radeon: Use dup fd as key in drm-winsys hash table to fix ZaphodHeads.
Same problem and fix as for nouveau's ZaphodHeads trouble.
See patch ...
"nouveau: Use dup fd as key in drm-winsys hash table to fix ZaphodHeads."
... for reference.
Cc: "10.3 10.4 10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Mario Kleiner <mario.kleiner.de at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit 28dda47ae4d974e3e032d60e8e0965c8c068c6d8)
commit 8ef284366c4a0daf4bd0953dc8369362efb49055
Author: Marek Olšák <marek.olsak at amd.com>
Date: Fri Jul 3 16:20:32 2015 +0200
r600g: disable single-sample fast color clear due to hangs
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73528
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82186
Cc: 10.4 10.5 10.6 <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 97ec2c694fe568e375ec7a2b85c1acb1e4666b54)
commit 0b5a9660dc1210558e093d8690516c833a87a330
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Wed Jul 1 18:22:23 2015 -0400
mesa/prog: relative offsets into constbufs are not constant
The optimization logic relies on being able to read out constbuf values
from program parameters. However that only works if there's no relative
addressing involved.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91173
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
(cherry picked from commit 197a19f9ed0ba12cc431542ac09f2af0a8bd0bce)
commit 1e8c43f4d0f6dd6699d5d72efbc02538733a38ec
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Thu Jul 2 00:13:36 2015 -0400
nv50/ir: don't emit src2 in immediate form
In the immediate form, src2 == dst, so it does not need to be emitted.
Otherwise it overlaps with the immediate value's low bits.
Fixes: 09ee907266 (nv50/ir: Fold IMM into MAD)
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
(cherry picked from commit c3215ef204c0fdfc44230adbd423720169d44dcb)
commit 6902a36d2239a774fd07c0d7dce4f18bc649d9bf
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Wed Jul 1 15:18:47 2015 -0400
mesa: reset the source packing when creating temp transfer image
Commit 4b249d2ee (mesa: Handle transferOps in texstore_rgba) introduced
proper transferops handling, but in updating the source to the newly
allocated temporary image neglected to reset the source packing. Set it
to the default which should be appropriate for the floats used.
Fixes: 4b249d2ee (mesa: Handle transferOps in texstore_rgba)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91173
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
(cherry picked from commit 4f57cdba2767b56eb4752f14ba9853ba6bc06d0e)
commit 96bed9fea8d2ef68e43ba445b18570cbe52143ec
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Wed Jul 1 02:11:39 2015 -0400
nv50/ir: copy joinAt when splitting both before and after
The current implementation only moves the joinAt when splitting after
the given instruction, not before it. So if you have a BB with
foo
instr
bar
joinat
and thus with joinAt set, we end up first splitting before instr, at
which point the instr's bb is updated to the new bb. Since that bb
doesn't have a joinAt set (despite containing one), when splitting after
the instr, there is nothing to copy over. Since the joinat will be in
the "split" bb irrespective of whether we're splitting before or after
the instruction, move it over in either case.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91124
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 5dcb28c3d26828ed1b0e2bd5a0589c5baab04b85)
commit 3fe9fe9cb90785244d4a464e0d9cd244b75a080d
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Tue May 19 15:01:49 2015 +0300
glsl: validate sampler array indexing for 'constant-index-expression'
Desktop GLSL < 130 and GLSL ES < 300 allow sampler array indexing where
index can contain a loop induction variable. This extra check will warn
during linking if some of the indexes could not be turned in to constant
expressions.
v2: warning instead of error for backends that did not enable
EmitNoIndirectSampler option (have dynamic indexing)
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Cc: "10.5" and "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 9350ea6979c48772e1fb55d4f1c7c5a3cfa987b0)
commit 1beb6738a784e69981208273e2cc4a6c8c6675f3
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Mon Jun 29 09:48:52 2015 +0300
mesa/st: use EmitNoIndirectSampler if !ARB_gpu_shader5
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Cc: "10.5" and "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit f17c8c287f3581fccb52714fbd4b2ea09a58e3d3)
commit f3e514a41d0c3f532e5633c20df91405e52a4a2a
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Mon Jun 29 09:53:45 2015 +0300
i915: use EmitNoIndirectSampler
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Cc: "10.5" and "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 2dc2b12ed15abb84c7e2b3c2726dcc1b735abcda)
commit b150817c197a8e0772114641fed3eb19284f4540
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Wed Jun 24 13:22:43 2015 +0300
i965: use EmitNoIndirectSampler for gen < 7
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Cc: "10.5" and "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 8852e26e93af1fc4b72bf9d57e847f53e1a1371b)
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Conflicts:
src/mesa/drivers/dri/i965/brw_shader.cpp
commit 619b9e84bf828e716a7a5b8391fe15efab441828
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Tue Jun 9 13:33:39 2015 +0300
mesa/glsl: new compiler option EmitNoIndirectSampler
Patch provides new compiler option for backend to force unroll loops
that have non-constant expression indexing on sampler arrays.
This makes sure that we can never end up with a shader that uses loop
induction variable as sampler array index but does not unroll because
of having too much instructions. This would not work without dynamic
indexing support.
v2: change option name as EmitNoIndirectSampler
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Cc: "10.5" and "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit e4512e1581cf90f56d13cfa6a809832ef3517283)
commit cc7caf9239903ca3604e90613c4696e7c0f7b0e1
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Tue Jun 9 13:28:44 2015 +0300
glsl: Allow dynamic sampler array indexing with GLSL ES < 3.00
Dynamic indexing of sampler arrays is prohibited by GLSL ES 3.00.
Earlier versions allow 'constant-index-expression' indexing, where
index can contain a loop induction variable.
Patch allows dynamic indexing for sampler arrays when GLSL ES < 3.00.
This change makes 'sampler-array-index.frag' parser test in Piglit
pass + fishgl.com works when running Chrome on OpenGL ES 2.0 backend
v2: small change and some more commit message (Tapani)
v3: refactor checks to make it more readable (Ian Romanick)
v4: change warning comment in GLSL ES case (Curro)
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Signed-off-by: Kalyan Kondapally <kalyan.kondapally at intel.com>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Cc: "10.5" and "10.6" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84225
(cherry picked from commit edb8383c98ee23385731d0fc23a6b6673528a8ec)
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Conflicts:
src/glsl/ast_array_index.cpp
commit a70904bc78e3dd0ea369a6dd03e4c54fbf5ff808
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Tue Jun 30 02:46:26 2015 -0400
nv50/ir: fix emission of address reg in 3rd source
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91056
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit d5f1253b0c4637ad996fd0da45095165006d61d3)
commit e00aab165416b3281f729053ce003b2f298f543c
Author: Mario Kleiner <mario.kleiner.de at gmail.com>
Date: Fri Jun 5 15:36:52 2015 +0200
nouveau: Use dup fd as key in drm-winsys hash table to fix ZaphodHeads.
The dup'ed fd owned by the nouveau_screen for a device node
must also be used as key for the winsys hash table, instead
of using the original fd passed in for a screen, to make
multi-x-screen ZaphodHeads configurations work on nouveau.
The original fd's lifetime differs from that of the nouveau_screen stored
in the hash. The hash key is the fd, and in order to compare hash entries
we fstat them, so the fd must be around for as long as the screen is.
This is an extension of the fix in commit a59f2bb1 (nouveau: dup fd
before passing it to device).
Cc: "10.3 10.4 10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Mario Kleiner <mario.kleiner.de at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
(cherry picked from commit a98600b0ebdfc8481c168aae6c5670071e22fc29)
commit 887a18018d1e4a532c671e642265a0853960d3b0
Author: Mike Stroyan <mike at lunarg.com>
Date: Fri Jun 26 15:15:46 2015 -0600
meta: Only change and restore viewport 0 in mesa meta mode
The meta code was setting a default depth range for all viewports
and 'restoring' all viewports to depth range values saved from viewport 0.
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 2a210b797eacd27a556af9c5e0edca940f9486c5)
commit a09b91792c0841e67b2dedebc97293a1007c5586
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Thu Jun 18 13:55:52 2015 -0700
i965/fs: Fix ir_txs in emit_texture_gen4_simd16().
We were not emitting the LOD, which led to message lengths of 1 instead
of 3. Setting has_lod makes us emit the LOD, but I had to make changes
to avoid emitting the non-existent coordinate as well.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91022
Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
(cherry picked from commit 35d83793047b3de31a706fa2a62a233090ea7cfc)
commit 0eaf0e16ddea0d9369991d8ca0829fe38dca819c
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Fri Jun 26 15:01:22 2015 -0400
nv50/ir: propagate modifier to right arg when const-folding mad
An immediate has to be the second arg of an ADD operation. However we
were mistakenly propagating the modifier of the non-folded value to the
folded immediate argument.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91117
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit ad62ec8316a926682958e7ab52639992867c3755)
commit 542299185b4fa7c662839bf560b41a7796440ca3
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Thu Jun 11 10:41:53 2015 +0300
i965: Delete linked GLSL IR when using NIR.
This is based on Kenneth's patch to delete 'most of the IR'. Due to
linker changes to clone variables, we can now free all of IR.
Saves 58MB of memory when replaying a Dota 2 trace on Broadwell.
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 104c8fc2c2aa5621261f80aa6b4f76c3163078f1)
commit 16d35dbd56b8d4687981c0dda0eeab2de8b0dc4a
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Thu Jun 11 10:41:52 2015 +0300
glsl: clone inputs and outputs during linking
This increases memory pressure during linking but makes it easier
for backend to free IR after it is not needed anymore.
v2: use resource list as ralloc context in case of relink (Kenneth)
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit c2ff3485b3d48749ea9dcad07bc1a691627dc3e5)
commit e77d8eb4b67db51d2b31159189edbcf74022bf78
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Thu May 21 10:49:05 2015 +0900
winsys/radeon: Unmap GPU VM address range when destroying BO
But only when doing so is safe according to the
RADEON_INFO_VA_UNMAP_WORKING kernel query.
This avoids kernel GPU VM address range conflicts when the BO has other
references than the GEM handle being closed, e.g. when the BO is shared.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90537
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90873
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Christian König <christian.koenig at amd.com>
(cherry picked from commit 7796e8889a9a2cc1b454dc32d8da3d756404339a)
commit 1e84989ffc37d917b737b2537b75e5e390a01c39
Author: Matt Turner <mattst88 at gmail.com>
Date: Mon Jun 22 10:59:33 2015 -0700
i965/fs: Don't mess up stride for uniform integer multiplication.
If the stride is 0, the source is a uniform and we should not modify the
stride.
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91047
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit a49328d58d1e3e143f9434976d9f3574acefc4ea)
commit 6ff3ae8deb1d99037f2f8e5890b09bd984059cf0
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Mon Jun 29 09:00:24 2015 +0100
docs: Add sha256 checksums for the 10.6.1 release
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit a871e80fc6237fa029d6970f7e9b414fd097bd98
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Mon Jun 29 08:23:14 2015 +0100
Add release notes for the 10.6.1 release
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit f513cc8836552ac3e8f8058b4f3f5a681c0d3215
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Mon Jun 29 08:17:10 2015 +0100
Update version to 10.6.1
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit da588875ce25e339d72b45b5cd60b39c96a5bd62
Author: Boyan Ding <boyan.j.ding at gmail.com>
Date: Sat Jun 13 15:33:20 2015 +0800
egl/x11: Remove duplicate call to dri2_x11_add_configs_for_visuals
The call to dri2_x11_add_configs_for_visuals (previously
dri2_add_configs_for_visuals) was moved downwards in commit f8c5b8a1,
but appeared again in its original position after its rename in
d019cd81. Remove it.
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Boyan Ding <boyan.j.ding at gmail.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Chad Versace <chad.versace at intel.com>
(cherry picked from commit 3fa9bb81ec8b21f472de32e08d0caf917239da08)
commit 684c81a75fba70cafef8583a031e3d2af55bb429
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sun Jun 21 19:03:35 2015 -0400
nv50,nvc0: make sure to pushbuf_refn before putting bo into pushbuf_data
Without first running the bo through pushbuf_refn, the nouveau drm
library will have uninitialized structures regarding this bo, and will
insert incorrect data.
This fixes supertuxkart 0.9 crash on start (where it ends up doing a lot
of indirect draws).
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 78d58e642549fbf340fdb4fca06720d2891216a8)
commit 9ffa1f7a1b938d6103f97d064a7443ae03d9a9d9
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sun Jun 21 15:00:16 2015 -0400
nvc0: always put all tfb bufs into bufctx
Since we clear the TFB bufctx binding point above, we need to put all of
the active tfb's back in, even if they haven't changed since last time.
Otherwise the tfb may get moved into sysmem and the underlying mapping
will generate write errors.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 9fcbf515b431a92e0289f234ab77a796cf2a5612)
commit c4dc2a5e2c0ccbd0cc30c9cdf205775b2cb690a8
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Tue Jun 23 00:16:59 2015 -0400
glsl: binding point is a texture unit, which is a combined space
This fixes compilation failures in Dota 2 Reborn where a texture unit
binding point was used that was numerically higher than the max
per stage.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Timothy Arceri <t_arceri at yahoo.com.au>
Tested-by: Nick Sarnie <commendsarnex at gmail.com>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit fccf012adc0d3aad877de095244324aa1d2d046a)
commit d93677eb48d5205fb495399291a2a0defb22a804
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Fri Jun 19 19:22:38 2015 +0100
gbm: do not (over)link against libglapi.so
The whole of GBM does not rely on even a single symbol from the GL
dispatch library, unsuprisingly. The only need for it comes from the
unresolved symbols in the DRI modules, which are now correctly handled
with Frank's commit.
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit a0dc6b7824d3b9095919e29393a379ea7f9c1318)
commit 0db9835d3ba3f84f601e7a60e1f1590400788b36
Author: Frank Henigman <fjhenigman at chromium.org>
Date: Thu Nov 6 16:29:26 2014 -0500
gbm: dlopen libglapi so gbm_create_device works
Dri driver libs are not linked to pull in libglapi so gbm_create_device()
fails when it tries to dlopen them (unless the application is linked
with something that does pull in libglapi, like libGL).
Until dri drivers can be fixed properly, dlopen libglapi before trying
to dlopen them.
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Frank Henigman <fjhenigman at google.com>
[Emil Velikov: Drop misleading bugzilla link, mention that libname differs]
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 828f13330c9384f2b55c8b0f962d93a74ecd0601)
commit ca079a77f92b8d60aa17a611ad93c92e840ed09f
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Fri Jun 19 17:46:41 2015 +0100
configure: error out when building libEGL without shared-glapi
The latter is a hard requirement and without it we'll error out later
on in the build.
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit 994be5143a097ae2cf504ba344362edfee388ac3)
commit 9ba9c030ad4d7264a160412a422f7b2cade331e0
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Fri Jun 19 17:44:02 2015 +0100
configure: error out when building backend-less libEGL
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit ddc886b5bfe5976fa2e5f49eeefa918736f1aa97)
commit c96d9c23717564d5a898c7c17a42514507a28b8c
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Fri Jun 19 17:19:46 2015 +0100
configure: warn about shared_glapi & xlib-glx only when both are set
Printing out the message when shared_glapi is disabled only leads to
confusion.
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit 6d744aaf4e427b6b0b3d8d35d756592a50abbb97)
commit f036512122428b65fdfa4ba3aacf8baefa675104
Author: Ben Widawsky <benjamin.widawsky at intel.com>
Date: Wed Jun 3 21:35:51 2015 -0700
i965/gen9: Implement Push Constant Buffer workaround
This implements a workaround (exact excerpt as a comment in the code). The docs
specify [clearly, after you struggle for a while] that the offset isn't relative
to state base. This actually makes sense. This fixes hangs on SKL.
Buffer #0 is meant to be used for normal uniforms.
Buffer #1 is typically used for gather constants when using RS.
Buffer #1-#3 could be used to push a bunch of UBO data which would just be
somewhere in memory, and not relative to the dynamic state.
NOTE: I've moved away from the ternary operator for the new gen9 conditions.
Admittedly it's probably not great to do this, but I really want to fix this all
up in the subsequent patch and doing it here makes that diff a lot nicer. I want
to split out the gen8/9 code to make the function a bit more readable, but to
keep this easily cherry-pickable I am doing this fix first. If we decide not to
merge the cleanup patch then I can revisit this.
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
Tested-by: Valtteri Rantala <Valtteri.rantala at intel.com>
(cherry picked from commit 90754d2df05eafe1a3ee3cd9bb1611a19099fc49)
commit 0c46196e1d172beac95dd0cb6ab43bcb4d1e2919
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Wed Jun 17 23:00:44 2015 -0400
mesa: add GL_PROGRAM_PIPELINE support in KHR_debug calls
This was apparently missed when ARB_sso support was added.
Add label support to pipeline objects just like all the other
debug-related objects.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Timothy Arceri <t_arceri at yahoo.com.au>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 770f141866654dab969302f720228497f0fb35fd)
commit 74f2c1c282ba3776c21647bf523081bdab7bedef
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Wed Jun 17 15:09:26 2015 -0400
glsl: add version checks to conditionals for builtin variable enablement
A number of builtin variables have checks based on the extension being
enabled, but were missing enablement via a higher GLSL version.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Timothy Arceri <t_arceri at yahoo.com.au>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit b6e238023c4f8af2328dc3bcab1d73a3e19f4fbb)
commit 8ed4c7acc2786758410ac257296cd058709030b1
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Wed Jun 17 15:07:14 2015 -0400
glsl: handle conversions to double when comparing param matches
This allows mod(int, int) to become selected as float mod when doubles
are supported.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit c40e7ee7c47cb24264fd77ef37fab99dea4c299a)
commit fc3af254b11baddc14f59c4d5b691430ece1975b
Author: Boyan Ding <boyan.j.ding at gmail.com>
Date: Tue Jun 16 11:08:33 2015 +0800
egl/x11: Set version of swrastLoader to 2
which it actually implements instead of the newest version defined in
dri_interface.h
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Boyan Ding <boyan.j.ding at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 997fc807b2f71ef65b4601d6db33d0f912c18d3f)
commit 9d2b9e7724689ce7a74e16b9691a704b65ec6cfb
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Wed Jun 17 22:18:09 2015 -0400
nvc0/ir: can't have a join on a load with an indirect source
Triggers an INVALID_OPCODE warning on GK208. Seems rare enough to not
warrant verification on other chips. Fixes the new piglits:
ubo_array_indexing/fs-nonuniform-control-flow.shader_test
ubo_array_indexing/vs-nonuniform-control-flow.shader_test
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 36e3eb6a957f8f20ed187ec88a067fc65cb81432)
commit acfaacb18b8ec3333fd8786a62b6abb0741f2928
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Mon Jun 15 15:48:58 2015 -0400
nv50,nvc0: clamp uniform size to 64k
The state tracker will pass through requests from buggy applications
which will have the buffer size larger than the max allowed (64k). Clamp
the size to 64k so that we don't get errors when uploading the constbuf
data.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 8b24388647f626a5cad10fd48e61335ed26a8560)
commit 0736a2aa795bab3856abea308ca99b708449e169
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Fri Jun 12 16:09:05 2015 +0200
nvc0/ir: fix collection of first uses for texture barrier insertion
One of the places we have to insert texbars is in situations where the
result of the tex gets overwritten by a different instruction (e.g. in a
conditional statement). However in some situations it can actually
appear as though the original tex itself is an overwriting instruction.
This can naturally never really happen, so just ignore the tex
instruction when it comes up.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90347
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit a2af42c1d2dc91f4c31e25ff9fff15a89a9b6ead)
commit 1a153e1fd341c565245096fab939d41a83aecfd8
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Tue May 12 04:17:04 2015 -0700
meta: Abort meta path if ReadPixels need rgb to luminance conversion
After recent addition of pbo testing in piglit test getteximage-luminance,
it fails on i965. This patch makes a sub test pass.
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
(cherry picked from commit a4ff47ade9d95a27c9c55afbf6dd77d3f3b10562)
commit 1f3ec929761d9aee986362ef90a4a150f4481496
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Fri May 1 00:05:18 2015 -0700
mesa: Turn need_rgb_to_luminance_conversion() in to a global function
This will be used by _mesa_meta_pbo_GetTexSubImage() in a later patch.
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
(cherry picked from commit ba2b1f8668811eade97a4f134f6df900ff36c8aa)
commit 2040c18ecc32262426541f5781daa783e3e4bf6b
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Thu Apr 30 23:36:18 2015 -0700
mesa: Use helper function need_rgb_to_luminance_conversion()
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
(cherry picked from commit 0b13adcd0802d1ad60f625e7e557d2090a7c143e)
commit b590ee6d45a3c91dce3309739226b5f9d062637a
Author: Anuj Phogat <anuj.phogat at gmail.com>
Date: Thu Apr 30 23:35:20 2015 -0700
mesa: Handle integer formats in need_rgb_to_luminance_conversion()
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Cc: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
(cherry picked from commit 82abdf209a2fb5b95b2bae80045aecc61202b13c)
commit 5d327b373531861f86a726db669b3d656f1b5f8d
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Jun 14 16:40:00 2015 +0100
docs: Add sha256sums for the 10.6.0 release
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 3b9cde5c8138fb5cc45c652f2a5c15c5fa222bd7
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Jun 14 16:26:40 2015 +0100
docs: Update 10.6.0 release notes
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 9719f26cc603f9eface0802a917f7b2167810b04
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Sun Jun 14 16:18:43 2015 +0100
Bump version to 10.6.0(final)
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 81027ea1e2dba8541877255e969fb6c1a8d93904
Author: Erik Faye-Lund <kusmabite at gmail.com>
Date: Wed Jun 10 23:35:04 2015 +0100
mesa: build xmlconfig to a separate static library
As we use the file from both the dri modules and loader, we end up with
multiple definition of the symbols provided in our gallium dri modules.
Additionally we compile the file twice.
Resolve both issues, effectively enabling the build on toolchains which
don't support -Wl,--allow-multiple-definition.
v2: [Emil Velikov]
- Fix the Scons/Android build.
- Resolve libgbm build issues (bring back the missing -lm)
Cc: Julien Isorce <j.isorce at samsung.com>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90310
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90905
Acked-by: Matt Turner <mattst88 at gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 634f2002563b4fca68490c0a39518ea838f28fb1)
commit a439cafc7cdc93e2f9f45ed8a809cd34a04207a9
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Apr 15 14:34:00 2015 +0100
targets/nine: link against libnir/libglsl_util
Based on commit 101142c4010(xa: support for drivers which use NIR)
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90466
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 83b5648a1e0b7c21536af18c0d29da2f2a31215e)
commit 1c2a462125acf644a17c07067c487dc3f07a32ca
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Apr 15 12:46:30 2015 +0100
pipe-loader: add libnir and libglsl_util to the link
Based on commit 101142c4010(xa: support for drivers which use NIR)
Cc: Rob Clark <robclark at freedesktop.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90466
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit ba512cc7fa5db0aeeb2fc0708920914cd3a5bf95)
commit 279b1d85cc93cb6eda8eff92d1f3a1ce4415884b
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Apr 15 13:40:55 2015 +0100
mesa; add a dummy _mesa_error_no_memory() symbol to libglsl_util
Rather than forcing everyone to provide their own definition of the symbol
provide a common (dummy) one.
This helps us resolve the build of the standalone pipe-drivers (amongst
others), which are missing the symbol.
Cc: Rob Clark <robclark at freedesktop.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 1df5a6c71ee4a3c08b5da3f8bae24880af16b74c)
commit 28b3e4f9257d1deaa8b860de4ae03dd7f6456d75
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Apr 15 11:28:38 2015 +0100
freedreno: use CXX linker rather than explicit link against libstdc++
Cc: Rob Clark <robclark at freedesktop.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 3f5dc9b94fc47f25821cec0a052df3d8f4cb5a1f)
commit ea3d26eeb4db1a8510e5a99c702d5b9db828973d
Author: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Date: Wed May 13 12:18:31 2015 +0200
mesa/main: validate name syntax for array variables only
From ARB_program_interface_query:
"Note that if an interface enumerates a single active resource list
entry for an array variable (e.g., "a[0]"), a <name> identifying
any array element other than the first (e.g., "a[1]") is not
considered to match."
It doesn't apply to arrays of interface blocks but just to array
variables.
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
(cherry picked from commit 4ee69a97bb0af0cc216539c48b246ea2abf8f208)
commit 39aa6b8bea1383c7fe1ff04a3637248a3bbe4fc5
Author: Dave Airlie <airlied at gmail.com>
Date: Wed Jun 10 13:51:59 2015 +1000
st/dri: check pscreen is valid before querying param
we don't check the validity of pscreen until dri_init_screen_helper
hit this trying to init glamor on a device with no driver (udl).
Acked-by: Michel Dänzer <michel.daenzer at amd.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 563706c14641fde2ab604d590b5425680354f280)
commit 1a47d37c994c51479d9c24a59b9d4944dd2db26c
Author: Matt Turner <mattst88 at gmail.com>
Date: Tue Jun 2 17:46:38 2015 -0700
i965: Use UW-typed immediate in multiply inst.
Some hardware reads only the low 16-bits even if the type is UD, but
other hardware like Cherryview can't handle this.
Fixes spec at arb_gpu_shader5@execution at sampler_array_indexing@fs-simple on
Cherryview.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90830
Reviewed-by: Neil Roberts <neil at linux.intel.com>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
(cherry picked from commit d46d04529b9c1e55b4c3b65a7078bbbd7ab1a810)
commit a2f216b329b97c5e033615e269a11228007d5e32
Author: Neil Roberts <neil at linux.intel.com>
Date: Fri May 29 13:41:48 2015 +0100
i965: Don't add base_binding_table_index if it's zero
When calculating the binding table index for non-constant sampler
array indexing it needs to add the base binding table index which is a
constant within the generated code. Often this base is zero so we can
avoid a redundant instruction in that case.
It looks like nothing in shader-db is doing non-constant sampler array
indexing so this patch doesn't make any difference but it might be
worth having anyway.
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Acked-by: Ben Widawsky <ben at bwidawsk.net>
(cherry picked from commit 7f62fdae1629d75dd581d1c57b28c2f099c5ef6b)
commit 9b8d49278183abb05861490f99a91fe6e433932b
Author: Neil Roberts <neil at linux.intel.com>
Date: Thu May 28 15:27:31 2015 +0100
i965: Don't use a temporary when generating an indirect sample
Previously when generating the send instruction for a sample
instruction with an indirect sampler it would use the destination
register as a temporary store. This breaks when used in combination
with the opt_sampler_eot optimisation because that forces the
destination to be null. This patch fixes that by avoiding the temp
register altogether.
The reason the temporary register was needed was because it was trying
to ensure the binding table index doesn't overflow a byte by and'ing
it with 0xff. The result is then or'd with samper_index<<8. This patch
instead just and's the whole thing by 0xfff. This will ensure that a
bogus sampler index won't overflow into the rest of the message
descriptor but unlike the previous code it won't ensure that the
binding table index doesn't overflow into the sampler index. It
doesn't seem like that should matter very much though because if the
shader is generating a bogus sampler index then it's going to just get
garbage out either way.
Instead of doing sampler_index<<8|(sampler_index+base_table_index) the
new code avoids one operation by doing
sampler_index*0x101+base_table_index which should be equivalent.
However if we wanted to avoid the multiply for some reason we could do
this by adding an extra or instruction still without needing the
temporary register.
This fixes a number of Piglit tests on Skylake that were using
indirect samplers such as:
spec at arb_gpu_shader5@execution at sampler_array_indexing@fs-simple
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Acked-by: Ben Widawsky <ben at bwidawsk.net>
Tested-by: Anuj Phogat <anuj.phogat at gmail.com>
(cherry picked from commit 6c846dc57b1d6f3e015a604dba1976f96c4be9e9)
commit ef9020570448b520ecdf7d088003130e36211589
Author: Ben Widawsky <benjamin.widawsky at intel.com>
Date: Wed May 27 17:55:02 2015 -0700
i965: Disable compaction for EOT send messages
AFAICT, there is no real way to make sure a send message with EOT is properly
ignored from compact, nor can I see a way to actually encode EOT while
compacting. Before the single send optimization we'd always bail because we hit
the is_immediate && !is_compactable_immediate case. However, with single send,
is_immediate is not true, and so we end up trying to compact the un-compactible.
Without this, any compacting single send instruction will hang because the EOT
isn't there. I am not sure how I didn't hit this when I originally enabled the
optimization. I didn't check if some surrounding code changed.
I know Neil and Matt were both looking into this. I did a quick search and
didn't see any patches out there to handle this. Please ignore if this has
already been sent by someone. (Direct me to it and I will review it).
Reported-by: Neil Roberts <neil at linux.intel.com>
Reported-by: Mark Janes <mark.a.janes at intel.com>
Tested-by: Mark Janes <mark.a.janes at intel.com>
Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit b307921c3ff3b36607752f881a180272366a79cf)
commit c6184b2b5c61b306e29b1a746b2b577520c9b691
Author: Alexander Monakov <amonakov at gmail.com>
Date: Tue Jun 9 20:58:22 2015 +0300
i965: do_blit_drawpixels: decode array formats
Correct a regression introduced by commit 922c0c9fd526 by converting "array
format", if received from _mesa_format_from_format_and_type, to mesa_format.
References: https://bugs.freedesktop.org/show_bug.cgi?id=90839
Signed-off-by: Alexander Monakov <amonakov at gmail.com>
Tested-by: AnAkkk <anakin.cs at gmail.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit bd38f91f8d80897ca91979962d80d4bc0acef586)
commit bf538839ed48b29b81e00181f7dee6859c87cdee
Author: Iago Toral Quiroga <itoral at igalia.com>
Date: Wed Jun 10 09:07:32 2015 +0200
i965: do not round line width when multisampling or antialiaing are enabled
In commit fe74fee8fa721a we rounded the line width to the nearest integer to
match the GLES3 spec requirements stated in section 13.4.2.1, but that seems
to break a dEQP test that renders wide lines in some multisampling scenarios.
Ian noted that the Open 4.4 spec has the following similar text:
"The actual width of non-antialiased lines is determined by rounding the
supplied width to the nearest integer, then clamping it to the
implementation-dependent maximum non-antialiased line width."
and suggested that when ES removed antialiased lines, they removed
"non-antialised" from that paragraph but probably should not have.
Going by that note, this patch restricts the quantization implemented in
fe74fee8fa721a only to regular aliased lines. This seems to keep the
tests fixed with that commit passing while fixing the broken test.
v2:
- Drop one of the clamps (Ken, Marius)
- Add a rule to prevent advertising line widths that when rounded go beyond
the limits allowed by the hardware (Ken)
- Update comments in the code accordingly (Ian)
- Put the code in a utility function (Ian)
Fixes:
dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines_wide
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90749
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit f9a18acb56c69b24c1e47cd326dc98e14fadcf94)
commit 7abb5e3f1307f21738f0233a27410ce49a4274e1
Author: Dave Airlie <airlied at gmail.com>
Date: Wed Jun 10 13:26:56 2015 +1000
nouveau: set imported buffers to what the kernel gives us
When we import a dma-buf fd from another driver the kernel
gives us the right info, and this trashes it.
Convert the kernel bo flags into the domain flags.
This helps getting reverse prime and glamor working.
Cc: mesa-stable at lists.freedesktop.org
Acked-by: Ben Skeggs <bskeggs at redhat.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit c6877c9e5983287a0741b26a358b7d744aebe232)
commit 2353b2197c409ed028d89bfa90ba489c576f32c3
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Sat Jun 6 12:15:30 2015 -0700
i965/fs: Don't let the EOT send message interfere with the MRF hack
Previously, we just put the message for the EOT send as high in the file as
it would go. This is because the register pre-filling hardware will stop
all over the early registers in the file in preparation for the next thread
while you're still sending the last message. However, if something happens
to spill, then the MRF hack interferes with the EOT send message and, if
things aren't scheduled nicely, will stomp on it.
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90520
Reviewed-by: Neil Roberts <neil at linux.intel.com>
(cherry picked from commit 86e5afbfee5492235cab1a7be4ea49ac02be1644)
commit 10b7dba331dfeb9c8476e5e28709ca965a821be1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Jun 5 14:45:18 2015 +0100
i965: Export format comparison for blitting between miptrees
Since the introduction of
commit 536003c11e4cb1172c540932ce3cce06f03bf44e
Author: Boyan Ding <boyan.j.ding at gmail.com>
Date: Wed Mar 25 19:36:54 2015 +0800
i965: Add XRGB8888 format to intel_screen_make_configs
winsys buffers no longer have an alpha channel. This causes
_mesa_format_matches_format_and_type() to reject previously working BGRA
uploads from using the BLT fast path. Instead of using the generic
routine for matching formats exactly, export the slightly more relaxed
check from intel_miptree_blit() which importantly allows the blitter
routine to apply a small number of format conversions.
References: https://bugs.freedesktop.org/show_bug.cgi?id=90839
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Jason Ekstrand <jason at jlekstrand.net>
Cc: Alexander Monakov <amonakov at gmail.com>
Cc: Kristian Høgsberg <krh at bitplanet.net>
Cc: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 922c0c9fd526ce19b87bc74a3159dec7705c1de1)
commit 55104870a14d03c803b100b66cf5886478d52de1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Jun 5 14:33:36 2015 +0100
i915: Blit RGBX<->RGBA drawpixels
The blitter already has code to accommodate filling in the alpha channel
for BGRX destination formats, so expand this to also allow filling the
alpha channgel in RGBX formats.
More importantly for the next patch is moving the test into its own
function for the purpose of exporting the check to the callers.
v2: Fix alpha expansion as spotted by Alexander with the fix suggested by
Kenneth
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Jason Ekstrand <jason at jlekstrand.net>
Cc: Alexander Monakov <amonakov at gmail.com>
Cc: Kristian Høgsberg <krh at bitplanet.net>
Cc: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by Kenneth Graunke <kenneth at whitecape.org>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit c2d0606827412b710dcaed80268fc665de8c9c5d)
commit fbc04dcddb9e24dec1e878050d4161c1f4da4093
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Fri Jun 5 13:49:08 2015 +0100
i965: Fix HW blitter pitch limits
The BLT pitch is specified in bytes for linear surfaces and in dwords
for tiled surfaces. In both cases the programmable limit is 32,767, so
adjust the check to compensate for the effect of tiling.
v2: Tweak whitespace for functions (Kenneth)
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Kristian Høgsberg <krh at bitplanet.net>
Cc: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by Kenneth Graunke <kenneth at whitecape.org>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 8da79b8378ae87474d8c47ad955e4833edf98359)
commit 8631c00acbf17b078d5572b7f8f6ec4a91fac7e9
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Thu Jun 4 17:00:17 2015 -0700
prog_to_nir: Fix fragment depth writes.
In the ARB_fragment_program specification, the result.depth output
variable is treated as a vec4, where the fragment depth is stored in the
.z component, and the other three components are undefined.
This is different than GLSL, which uses a scalar value (gl_FragDepth).
To make this consistent for driver backends, this patch makes
prog_to_nir use a scalar output variable for FRAG_RESULT_DEPTH,
moving result.depth.z into the first component.
Fixes Glean's fragProg1 "Z-write test" subtest.
Cc: mesa-stable at lists.freedesktop.org
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90000
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit 7b8f20ec5505a25958bcd98aabe73a7ca2b6cbba)
commit add82b672d05b9a6c47b7929cdcdddf25e227b01
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue May 12 22:53:00 2015 +0200
clover: clarify and fix the EGL interop error case
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 6acb61fc9c2c5f81569d17d90a480abc48ec6055)
commit 3514680b918c2605e082990a411d972b65d41602
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue May 12 00:44:20 2015 +0200
egl: fix setting context flags
Cc: 10.6 10.5 10.4 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Chad Versace <chad.versace at intel.com>
(cherry picked from commit f9f894447e4e7442d5dfa489bb43f2823e2fc71d)
commit 4f68af254e55967d7b14f9cf8ced5f2509f0706b
Author: Roland Scheidegger <sroland at vmware.com>
Date: Thu Jun 4 14:35:59 2015 +0200
draw: (trivial) fix NULL pointer dereference
This probably got broken when the samplers were converted to be indexed
by shader type.
Seen when looking at bug 89819 though I'm not sure if that really was what
the bug was about...
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 6e5970ffee0129fb94d8b7f0ebd4fac3992e7dce)
commit 70ac6a2655334b3e4f662ca228c2f3681305e52d
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Thu Jun 4 01:24:07 2015 -0700
prog_to_nir: Make RSQ properly take the absolute value of its argument.
I just botched this when writing the original code.
From the ARB_vertex_program specification:
"The RSQ instruction approximates the reciprocal of the square root of
the absolute value of the scalar operand and replicates it to all four
components of the result vector."
Fixes a Glean vertProg1 subtest:
RSQ test 2 (reciprocal square root of negative value)
Cc: mesa-stable at lists.freedesktop.org
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90547
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
(cherry picked from commit 15a12795c6f3edef0e1cbab39b6da3d5b8f64fc3)
commit 9dc43dc361434e7f88fa42e8b6e12f990afd29ce
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Jun 3 18:12:31 2015 +0100
Increment version to 10.6.0-rc3
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 038fc5a7f74b7a034c04d7b066b08f07886f2f92
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Thu Mar 5 12:10:15 2015 -0500
nv30: avoid doing extra work on clear and hitting unexpected states
Clearing can happen at a time when various state objects are incoherent
and not ready for a draw. Some of the validation functions don't handle
this well, so only flush the framebuffer state. This has the advantage
of also not doing extra work.
This works around some crashes that can happen when clearing.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
(cherry picked from commit aba3392541f38f82e3ebde251fdcca78e90adbf3)
commit 66e1ee52ad698db60a2c1b4033054245523f6063
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue May 26 19:32:36 2015 +0200
st/dri: fix postprocessing crash when there's no depth buffer
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89131
Cc: 10.6 10.5 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 25e9ae2b79f32631e7255807a242e5fc4e39984c)
commit bc8fa4311eeca4fa748aba2c176363b6e60d75f0
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:56:45 2015 -0700
mesa: Enable ARB_direct_state_access by default for core profile
And core profile only.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 1ca60de4c00e864bffbee8265f631b2267c8ea29)
commit eafe639aeef72f1c148dfa110357e8aab0599a09
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed May 20 20:19:07 2015 -0700
dispatch_sanity: Validate the compatibility profile dispatch table too
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Suggested-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit ef4dd0fc3e6b5ffbad6bd286ef9c6c25d0b25bae)
commit 97eb22e959e92da090fa7461255e116edffa195b
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed May 20 20:17:19 2015 -0700
dispatch_sanity: Split list of GL 3.1 functions in to core and common
The next patch will add a test for compatibility profile dispatch, and
it seems to make more sense to share the lists.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 49ab670f52947dda04585cc5156e55b89f0c1c4a)
Conflicts:
src/mesa/main/tests/dispatch_sanity.cpp
commit 964d358bc1fbb23ecf30250551350b17f79e6061
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed May 20 20:13:12 2015 -0700
mesa: Don't install glVertexAttribL* functions in compatibility profile
GL_ARB_vertex_attrib_64bit is exclusive to core profile, and none of the
other functions added by the extension are advertised in other profiles.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: Dave Airlie <airlied at redhat.com>
Cc: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit a6fa74e6bb65f852ad1608f43dd0731e854ea42f)
commit 384ee736e76a49c0da8c27f0841867261778b292
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue May 19 11:48:11 2015 -0700
glapi: Make GL_ARB_direct_state_access functions exclusive to core profile
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: Dave Airlie <airlied at redhat.com>
Cc: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: Dylan Baker <baker.dylan.c at gmail.com>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 4e5efa9e7ddb6d5273996cf9b09677d918759d17)
commit 3599928fc6fb0ffd9e10d812f4a67b53265815ae
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue May 19 11:24:26 2015 -0700
glapi: Store exec table version info outside the XML
Currently on the functions that are exclusive to core-profile are
implemented. The remainder continue to live in the XML. Additional
functions can be moved later.
The functions for GL_ARB_draw_indirect and GL_ARB_multi_draw_indirect
are put in the dispatch table inside the VBO module, so they do not need
to be moved over.
The diff of src/mesa/main/api_exec.c before and after this patch is as
expected. All of the functions listed in apiexec.py moved out of a 'if
(_mesa_is_desktop(ctx))' block into a new 'if (ctx->API ==
API_OPENGL_CORE)' block.
v2: Remove stray shebang line in apiexec.py. Suggested by Ilia.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: Dave Airlie <airlied at redhat.com>
Cc: Dylan Baker <baker.dylan.c at gmail.com>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit f20899b7276b73e1b60c3ed8d8abdf959e787c0c)
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Conflicts:
src/mapi/glapi/gen/gl_genexec.py
commit 03304290056a4f683f307f176605d2ae9450243c
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:55:04 2015 -0700
Revert "mesa: Add an extension flag for ARB_direct_state_access"
This reverts commit 30dcaaec356cc117d7227c6680620cd50ff534e7.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 5c4aab58ee79a8bfa3d96f3ec442f37da587ff45)
commit 828eeb65dc8ccff90bb6af6d29d86df391ba6e3e
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed May 20 17:19:29 2015 -0700
mesa: Use the profile instead of an extension bit to validate GL_TEXTURE_CUBE_MAP
The extension on which this depends will always be enabled in core
profile, and the extension bit is about to be removed.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 832ea2345a96388950bb39ce8a2e4ca8bfdb4fe5)
commit 74e7328281dbdfcdaa86057c3dcdcc6bf387f92a
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:54:55 2015 -0700
Revert "mesa: Add ARB_direct_state_access checks in XFB functions"
This reverts commit 7d212765a470972f4712e42caf6406b257220369.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 90e98ea215906bb7e9ecadc4d30d2718ba2186ad)
commit 9e71637022a505d1f464a91c02b06cffa137b885
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:54:39 2015 -0700
Revert "mesa: Add ARB_direct_state_access checks in buffer object functions"
This reverts commit 339ed0984d4f54fca91235a1df2ce3a850f6123f.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit cab233f277936f4cdc49aa0bbfc7ed1a85c925f1)
commit 83eed1ea9028068f5fec5feca59035380d043382
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:54:35 2015 -0700
Revert "mesa: Add ARB_direct_state_access checks in FBO functions"
This reverts commit 6ad0b7e07a0445e9e0f368e079c4f7b8a6757bb3.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 8bcd14fab9a86276980a8859740999a1db4c55d5)
commit 7ddacf6df33fc0843cf99110cb1af6194bee0e7d
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:54:29 2015 -0700
Revert "mesa: Add ARB_direct_state_access checks in renderbuffer functions"
This reverts commit cb49940766b581c6656473d89c221653c69fa0f9.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit f3e8596a371c3708e9d9d68a021c39982c676cf1)
commit 83007290c6340a8bc9a940f99525d1fa0e211522
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:54:25 2015 -0700
Revert "mesa: Add ARB_direct_state_access checks in texture functions"
This reverts commit 8940957238e8584ce27295791cee4cc3d6f7cf1e.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 1ac6a8f1d1952a20d54df3e513c253d7988402ac)
commit 38fb22ceced0c180db5d0c505855e00be3de42be
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:54:21 2015 -0700
Revert "mesa: Add ARB_direct_state_access checks in VAO functions"
This reverts commit 36b05793372b86b914d9b95d0188f5f387e01d68.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 92e362191e6c1c15e3944464fbf6bbda9e7d9892)
commit 1deda22b880c9672650ca8e6efbda37c331bf096
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:54:18 2015 -0700
Revert "mesa: Add ARB_direct_state_access checks in sampler object functions"
This reverts commit 9e7149c8986348bf9567f049444783ef52775f4e.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit ae5457754492b594c55911433a9b3675216c46c1)
commit ef6670ca4315c5ad20ea5e9e869997feda637546
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:54:15 2015 -0700
Revert "mesa: Add ARB_direct_state_access checks in program pipeline functions"
This reverts commit bebf3c6ab314bde05ac5a3b4d3e63fd36243c58e.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit a9dcf45cd88b6e4d7816f45756d0b96d9c77cffe)
commit b8c030d9cf2bf593f07a265aa6883c3435083bee
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:54:11 2015 -0700
Revert "mesa: Add ARB_direct_state_access checks in query object functions"
This reverts commit d3368e0c9e27ced6059eb2ecdf2aa999a00e90b0.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit a9f678a8f4d4f9806dc4e931477fad300c61b4a1)
commit 9c04f375dbd838cae7c70799686efda21c69fe6c
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:54:08 2015 -0700
Revert "i915: Enable ARB_direct_state_access"
This reverts commit 121030eed8fc41789d2f4f7517bbc0dd6199667b.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit f1fcf79e3c8e4f3594dc1b6d268430f8e8d4eb97)
commit 944bf20c1704b780bd1fd98d9d20c7654441a335
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:53:58 2015 -0700
Revert "i965: Enable ARB_direct_state_access"
This reverts commit a57feba0a35de35728269aeb26b039e4f2393d69.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 4bc00b1a4b34abc3e6e26f126686608ccfa33f52)
commit b4da1d9ebd8e3c4b5c3b5833c13e9e216b084bb0
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon May 18 13:53:49 2015 -0700
Revert "st/mesa: Enable ARB_direct_state_access"
This reverts commit 357bf80caade9e0be20dcc88ec38884e34abc986.
Acked-by: Fredrik Höglund <fredrik at kde.org>
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 73cf10e6236fbf119c8262e69cd24f55557116f1)
commit 75691166bef11f00af05d0504bc3a113eaa92656
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Mon May 25 09:31:55 2015 -0700
i965/fs: Properly handle explicit depth in SIMD16 with dual-source blend
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90629
Tested-by: Markus Wick <markus at selfnet.de>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit 8bbe7fa7a853d8ebf69e5d2d0fdc4343a20b638f)
commit 8c57dc26a749f8759b30efbc689e3d99ffcba785
Author: Ben Widawsky <benjamin.widawsky at intel.com>
Date: Wed May 20 19:20:14 2015 -0700
i965: Emit 3DSTATE_MULTISAMPLE before WM_HZ_OP (gen8+)
Starting with GEN8, there is documentation that the multisample state command
must be emitted before the 3DSTATE_WM_HZ_OP command any time the multisample
count changes. The 3DSTATE_WM_HZ_OP packet gets emitted as a result of a
intel_hix_exec(), which is called upon a fast clear and/or a resolve. This can
happen before the state atoms are checked, and so the multisample state must be
put directly in the function.
v1:
- In v0, I was always emitting the command, but Ken came up with the condition to
determine whether or not the sample count actually changed.
- Ken's recommendation was to set brw->num_multisamples after emitting
3DSTATE_MULTISAMPLE. This doesn't work. I put my best guess as to why in the XXX
(it was causing 7 regressions on BDW).
v2:
Flag NEW_MULTISAMPLE state. As Ken found, in state upload we check for the
multisample change to determine whether or not to emit certain packets. Since
the hiz code doesn't actually care about the number of multisamples, set the
flag and let the later code take care of it.
Jenkins results:
http://otc-mesa-ci.jf.intel.com/view/dev/job/bwidawsk/136/
Fixes around 200 piglit tests on SKL. I'm somewhat surprised that it seems to
have no impact on BDW as the restriction is needed there as well.
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
Reviewed-by: Neil Roberts <neil at linux.intel.com> (v0)
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org> (v2)
(cherry picked from commit e2d84d99f5a66738e8f584bdfea66182f36fe46c)
commit 230891cc9c24744cbe59cc40a748a69a6b89edf6
Author: Matt Turner <mattst88 at gmail.com>
Date: Wed May 27 10:44:45 2015 -0700
i965/fs: Fix lowering of integer multiplication with cmod.
If the multiplication's result is unused, except by a conditional_mod,
the destination will be null. Since the final instruction in the lowered
sequence is a partial-write, we can't put the conditional mod on it and
we have to store the full result to a register and do a MOV with a
conditional mod.
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90580
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 0596134410a0decc2f6bba77bfedb82d308aabbe)
commit ffd133bdbe4560f3a70aa76b7a6cbedc23e554ed
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed May 27 12:39:19 2015 +0100
Increment version to 10.6.0-rc2
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
commit 77b116f1d3c2f0df1a1bb040bad592d2ec2749d9
Author: Brian Paul <brianp at vmware.com>
Date: Fri May 15 09:08:14 2015 -0600
mesa: do not use _glapi_new_nop_table() for DRI builds
Commit 4bdbb588a9d38 introduced new _glapi_new_nop_table() and
_glapi_set_nop_handler() functions in the glapi dispatcher (which
live in libGL.so). The calls to those functions from context.c
would be undefined (i.e. an ABI break) if the libGL used at runtime
was older.
For the time being, use the old single generic_nop() function for
non-Windows builds to avoid this problem. At some point in the future
it should be safe to remove this work-around. See comments for more
details.
v2: Incorporate feedback from Emil. Use _WIN32 instead of
GLX_DIRECT_RENDERING to control behavior, move comments.
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Reviewed-and-tested-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit be71bbfaa2ad201b570b56847a13328fc359d0ee)
Squashed with commit
glapi: Encapsulate nop table knowledge in new _mesa_new_nop_table function
Encapsulate the knowledge about how to build the nop table in a new
_mesa_new_nop_table function. This makes it easier for dispatch_sanity
to keep working now and in the future.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Tested-by: Mark Janes <mark.a.janes at intel.com>
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 2b8c51834bcc34a70dec9b470a28c0ef972d6993)
commit 1eef92e336346b677ddf341331503f815e0dfbd5
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon May 18 14:56:34 2015 +0200
radeonsi: fix scratch buffer setup for geometry shaders
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
(cherry picked from commit fa7f606e89dc4447f07fec0b84d396a4ff25ee7e)
commit 317fa3e7eff892bf5406eda1a285df35d2757a3b
Author: Koop Mast <kwm at rainbow-runner.nl>
Date: Tue May 26 10:24:40 2015 +0200
clover: Build fix for FreeBSD.
Cc: 10.6 10.5 <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 967825d053f71c5f5fc3ba31eabc0c6004fde4f1)
commit 580351d3d31c588fb151e887ca33d9caeb357287
Author: Neil Roberts <neil at linux.intel.com>
Date: Wed May 20 19:26:02 2015 +0100
i965/skl: Add a message header for the TXF_MCS instruction in vec4vs
When using SIMD4x2 on Skylake, the sampler instructions need a message
header to select the correct mode. This was added for most sample
instructions in 0ac4c2727 but the TXF_MCS instruction is emitted
separately and it was missed.
This fixes a bunch of Piglit tests which test texelFetch in a geometry
shader, for example:
spec/arb_texture_multisample/texelfetch/2-gs-sampler2dms
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 5ae6c7bfce5c9fb91ab6cef2ea74a39af091d5f6)
commit 534f5e8d802c5bac7349152128931228c78bf1ef
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Mon May 25 17:46:45 2015 -0400
nv30: falling back to draw path for edgeflag does no good
The problem is that the EDGEFLAG has to be toggled at vertex submission
time. This can be done from either the draw or the regular paths. Avoid
falling back to draw just because there's an edgeflag.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 3ec18152858fd9aadb398d78d5ad2d2b938507c1)
commit 74e2db8a9202acc7ed38a31fe0a3453ec3a7a1dd
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat May 23 22:11:38 2015 -0400
nv30/draw: switch varying hookup logic to know about texcoords
Commit 8acaf862dfe switched things over to use TEXCOORD instead of
GENERIC, but did not update the nv30 swtnl draw paths. This teaches the
draw logic about TEXCOORD.
Among other things, this fixes a crash in demos/arbocclude when using
swtnl. Curiously enough, the point-sprite piglit works without this.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 25be70462dbb7ee994e69ffccc3de94e4114e667)
commit c288bf3b89dfd510dec7b1481dfb5ae339301ae3
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Mon May 25 21:14:13 2015 -0400
nv30/draw: allocate vertex buffers in gart
These are only used once per draw, so it makes sense to keep them in
GART. Also take this opportunity to modernize the buffer mapping API
usage.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Ben Skeggs <bskeggs at redhat.com>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit c3d36a2e1a87a4aded662db7a5d320ee7ac3a8b5)
commit 18e05588dfe8d56fc78aa4e8bbae6dab95fe1faa
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Mon May 25 21:12:46 2015 -0400
nv30/draw: only use the DMA1 object (GART) if the bo is not in VRAM
Instead of always having it in the data, let the bo placement decide it.
This fixes glxgears with swtnl forced on.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Ben Skeggs <bskeggs at redhat.com>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit fdad7dfbdae07b9273fc8f57e63258dbe542c9b5)
commit 407e20d45d09b5e170aced7e78d61914cecca5cd
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Mon May 25 20:15:09 2015 -0400
nv30/draw: fix indexed draws with swtnl path and a resource index buffer
The map = assignment was missing.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 3600439897c79d37c3c654546867ddfa0c420743)
commit 5eef18390d540d679aaeb664fdb2deb7d56e74ae
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sun May 17 17:56:44 2015 -0400
glsl: avoid leaking linked gl_shader when there's a late linker error
This makes piglit mixing-clip-distance-and-clip-vertex-disallowed have 0
definitely lost blocks with valgrind. (Same non-0 number of possibly
lost blocks though.)
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 5646f0f18a620292524eebcd77353ff3d3687eb2)
commit 34ff020aeac214976bdc152dc5009be9534c6ed7
Author: Roland Scheidegger <sroland at vmware.com>
Date: Mon May 25 22:24:05 2015 +0200
llvmpipe: (trivial) add parantheses in (!x == y) expression
Apparently some compilers think we probably wanted to do !(x == y) instead
and issue a warning, so just shut it up... No functional change, obviously.
Cc: <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 6a111e54d7578abee6bce4a75ce1399ed369ab5f)
commit 8fc109160efa8ff018081f3331dd4215a6e66a9f
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sun May 17 17:32:24 2015 -0400
st/mesa: don't leak glsl_to_tgsi object on link failure
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit bb973723a5e1f27817b6be2c2fa4fb3ea28e733c)
commit cb0c057a3135b4e6c0b6921df7bc7b29dea3315d
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Mon May 25 14:06:01 2015 -0400
nv30/draw: draw expects constbuf size in bytes, not vec4 units
This fixes glxgears with NV30_SWTNL=1 forced on. Probably fixes a bunch
of other situations where we fall back to the swtnl path.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 147816375d22a653176ab28ed650fa811ceea83f)
commit 60294f8c39191374631b574b97ebe46b6afe2a44
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sun May 24 11:56:21 2015 -0400
nv30/draw: avoid leaving stale pointers in draw state
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 89585edf3c01c94b62d163adf0209568efa68568)
commit 6319fd51fe56a17fbae78bfd64c7875c69c12231
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat May 23 20:58:53 2015 -0400
nv30: fix clip plane uploads and enable changes
nv30_validate_clip depends on the rasterizer state. Also we should
upload all the new clip planes on change since next time the plane data
won't have changed, but the enables might.
This fixes fixed-clip-enables and vs-clip-vertex-enables shader tests.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 7518fc3c66e9b5703b987bccca7970a344deadfa)
commit 08baacb6db3b38d241f7abc7c853c219cf5d876d
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sun May 24 02:23:16 2015 -0400
nv30: avoid leaking render state and draw shaders
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 9870ed05dd333a20662479b9b1e3a8db542924c4)
commit c23bbfc007ef2bda14bbcbd99f69fc7b42547062
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sun May 24 01:31:11 2015 -0400
nv30: don't leak fragprog consts
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 605ce36d7f4a90c4062d6940bea82ab483bbe3b2)
commit aa326e4e223f060c0e96a40bb633d955dc010c7c
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat May 23 01:57:41 2015 -0400
nv50/ir: avoid messing up arg1 of PFETCH
There can be scenarios where the "indirect" arg of a PFETCH becomes
known, and so the code will attempt to propagate it. Use this
opportunity to just fold it into the first argument, and prevent the
load propagation pass from touching PFETCH further.
This fixes gs-input-array-vec4-index-rd.shader_test and
vs-output-array-vec4-index-wr-before-gs.shader_test on nvc0 at least.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit fa7f9f123b70f313d3c073b52c9c16b4b8df28f8)
commit 1595955974976a68eda47d56bdde0110c21f2252
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat May 23 17:35:42 2015 -0400
nvc0: a geometry shader can have up to 1024 vertices output
The 1024 is already reported everywhere, not sure where this 0x1ff came
from.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 921917c8d8e707dd854e7be05fba7a3e55bc71bf)
commit a760db21ecd78051a37429d9d67e9301047d3435
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Tue May 19 17:35:29 2015 -0700
i965/fs: Fix implied_mrf_writes for scratch writes
We build the entire message in the generator so all the MRF writes are
implied.
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 6ca67f62e885f0e42c0cef2db5c0ae837adfe646)
commit 2cf0e748c3558a2013a39004f2d2f2d19b6b50cb
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Fri May 22 19:03:58 2015 -0400
nvc0/ir: LOAD's can't be used for shader inputs
We forgot to convert to VFETCH in case of indirect access. Fix that.
This avoids crashes on the new gs-input-array-vec4-index-rd and
vs-output-array-vec4-index-wr-before-gs but they still fail.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 217301843aea0299ab245e260b20af7ad250e9d8)
commit 564c56de12e9c140082da5afed7169525a5b2950
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Fri May 22 19:02:41 2015 -0400
nv50/ir: guess that the constant offset is the starting slot of array
When we get something like IN[ADDR[0].x+5], we will now guess that we
should look at IN[5] for the "base" information.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 0bab3962f5f313ea829c95920c02f32afb23715d)
commit 45986bd391e6ebc1bdb72c0a81a10ec363369ad0
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Fri May 22 16:40:08 2015 -0400
nvc0/ir: set ftz when sources are floats, not just destinations
In the case of a compare, the destination might be a predicate, but we
still want to flush denorms.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit d1eea18a595a468dbc2267a8d14197a3b1a5a4b6)
commit 90644f9217b66539b52635475eb8c1367f551c05
Author: Dave Airlie <airlied at redhat.com>
Date: Thu May 21 11:23:06 2015 +1000
u_math: uses assert, include assert.h
this fixes a build problem found on RHEL s390.
not sure what configure options caused it, I couldn't get it on
x86 here.
Reviewed-by: Brian Paul <brianp at vmware.com>
Cc: "10.6" mesa-stable at lists.freedesktop.org
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 7c1a00174b2bec102030b19b6094ebcab23fe04d)
commit 61c6819d1aeb24589ffdf671ace1547388c09394
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Wed May 20 04:00:16 2015 -0400
freedreno/a3xx: set .zw of sprite coords to .01
Fixes non-determinism in bin/point-sprite rendering, and the stars on
the intro screen to neverball.
Cc: "10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
(cherry picked from commit 6cdb29d52fc51e3d904b50bb7003c9fa38bb7896)
commit bf33fc653dca329ba6bc72ce6d76c6bc554e1837
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Mon Apr 27 23:47:40 2015 -0400
freedreno/ir3: fix immediate usage in tgsi tex fe
get_immediate will return a const reference, the requested immediate
isn't necessarily in the x slot. Make sure to use the swizzle.
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org
(cherry picked from commit 3e7bc6728520b469ed53a2588ead28287f8b88f0)
commit e4f74121dbe481f7df54d7703e8a260807df1b8f
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed May 20 21:51:52 2015 +0100
targets/osmesa: drop the -module tag from LDFLAGS
Gallium equivalent of commit 06ff751f97f(darwin: Fix install name of
libOSMesa)
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 36438f0db6c7c696df73ced12684f4df9d2b47e5)
commit 62fda88080f157215a9ff1c006969a501a183a96
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Wed Feb 11 02:32:33 2015 -0800
darwin: Fix install name of libOSMesa
Passing -module to glibtool causes the resulting library to be called
libSomething.so rather than libSomething.dylib on darwin.
Regardless if libOSMesa is a library or a module, it has been used as
the former for quite some time. Update the build to reflect that and
resolve the naming issue.
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
[Emil Velikov: Tweak the commit message.]
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit 06ff751f97fbeb62a23936cd8f9c54733920d082)
commit 4c83138e5f67cee2016dbfbc9b6daf79260b279b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Fri May 15 19:05:45 2015 -0700
swrast: Build fix for Solaris
Fixes regression from commit 5b2d3480f57168d50ad24cf0b8c9244414bd3701
Cc: "10.5 10.6" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
(cherry picked from commit 31cd2d75dc3844e40143f649fe383de17c152a13)
commit f02f25dcf7b146808daf9892580bc918f7c44624
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon May 18 11:26:10 2015 +0200
cso: add context cleanup code from st/mesa
This fixes a crash in nouveau which can't handle
set_constant_buffer(PIPE_SHADER_TESS_*).
Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
(cherry picked from commit e4201bb618f02a279fda59a1c528d7218e6900a5)
commit 7c5cca5ee2c4076db45f89658e3a38098d6f828d
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Tue May 19 12:02:04 2015 +0100
Increment version to 10.6.0-rc1
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
More information about the Xquartz-changes
mailing list