external_mesa3d/src/mesa, branch replicant-6.0

Merge remote-tracking branch 'mesa/13.0' into nougat-x86

2017-01-08T16:30:27+00:00

i965/fs: Reject copy propagation into SEL if not min/max.

2016-12-24T13:03:53+00:00

We shouldn't ever see a SEL with conditional mod other than GE (for max)
or L (for min), but we might see one with predication and no conditional
mod.

total instructions in shared programs: 8241806 -> 8241902 (0.00%)
instructions in affected programs: 13284 -> 13380 (0.72%)
HURT: 62

total cycles in shared programs: 84165104 -> 84166244 (0.00%)
cycles in affected programs: 75364 -> 76504 (1.51%)
helped: 10
HURT: 34

Fixes generated code in at least Sanctum 2, Borderlands 2, Goat
Simulator, XCOM: Enemy Unknown, and Shogun 2.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92234
Reviewed-by: Jason Ekstrand 
(cherry picked from commit 7bed52bb5fb4cfd5f91c902a654b3452f921da17)

i965/fs: Add unit tests for copy propagation pass.

2016-12-24T13:02:55+00:00

Pretty basic, but it's a start.

Acked-by: Jason Ekstrand 
(cherry picked from commit 091a8a04adb28a2044e3baadba0af52a185b3bd0)
[Emil Velikov: nir_shader_create() has only three arguments]
Signed-off-by: Emil Velikov

i965/fs: Rename opt_copy_propagate -> opt_copy_propagation.

2016-12-16T13:53:50+00:00

Matches the vec4 backend, cmod propagation, and saturate propagation.

Reviewed-by: Jason Ekstrand 
(cherry picked from commit 6014da50ec41d1ad43fec94a625962ac3f2f10cb)

mesa/fbobject: Update CubeMapFace when reusing textures

2016-12-16T12:01:23+00:00

Framebuffer attachments can be specified through FramebufferTexture*
calls. Upon specifying a depth (or stencil) framebuffer attachment that
internally reuses a texture, the cube map face of the new attachment
would not be updated (defaulting to TEXTURE_CUBE_MAP_POSITIVE_X).
Fix this issue by actually updating the CubeMapFace field.

This bug manifested itself in BindFramebuffer calls performed on
framebuffers whose stencil attachments internally reused a depth
texture.  When binding a framebuffer, we walk through the framebuffer's
attachments and update each one's corresponding gl_renderbuffer. Since
the framebuffer's depth and stencil attachments may share a
gl_renderbuffer and the walk visits the stencil attachment after
the depth attachment, the uninitialized CubeMapFace forced rendering
to TEXTURE_CUBE_MAP_POSITIVE_X.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77662
Signed-off-by: Nanley Chery 
Reviewed-by: Brian Paul 
(cherry picked from commit 63318d34acd4a5edb271d57adf3b01e2e52552f8)

i965/mt: Disable aux surfaces after making miptree shareable

2016-12-14T19:31:30+00:00

The entire goal of intel_miptree_make_shareable() is to permanently
disable the miptree's aux surfaces. So set
intel_mipmap_tree:disable_aux_buffers after the function's done with
discarding down the aux surfaces.

References: https://bugs.freedesktop.org/show_bug.cgi?id=98329
Reviewed-by: Topi Pohjolainen 
Reviewed-by: Kenneth Graunke 
Cc: Nanley Chery 
Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit 1c8be049bea786c2c054a770025976beba5b8636)

i965: Allocate at least some URB space even when max_vertices = 0.

2016-12-14T19:03:11+00:00

Allocating zero URB space is a really bad idea.  The hardware has to
give threads a handle to their URB space, and threads have to use that
to terminate the thread.  Having it be an empty region just breaks a
lot of assumptions.  Hence, why we asserted that it isn't possible.

Unfortunately, it /is/ possible prior to Gen8, if max_vertices = 0.
In theory a geometry shader could do SSBO/image access and maybe
still accomplish something.  In reality, this is tripped up by
conformance tests.

Gen8+ already avoids this problem by placing the vertex count DWord
in the URB entry header.  This fixes things on earlier generations.

Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Kenneth Graunke 
Reviewed-by: Anuj Phogat 
Tested-by: Ian Romanick 
(cherry picked from commit a41f5dcb141a11ca5ca0c765c305027b0f0b609e)

mesa: only verify that enabled arrays have backing buffers

2016-12-14T19:03:11+00:00

We were previously also verifying that no backing buffers were available
when an array wasn't enabled. This is has no basis in the spec, and it
causes GLupeN64 to fail as a result.

Fixes: c2e146f487 ("mesa: error out in indirect draw when vertex bindings mismatch")
Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Ilia Mirkin 
Reviewed-by: Timothy Arceri 
Reviewed-by: Tapani Pälli 
(cherry picked from commit 7c16552f8dcc869b14cf7ef443a1b5de83b07973)

mesa: fix active subroutine uniforms properly

2016-12-14T19:03:10+00:00

07fe2d565b introduced a big hack in order to return
NumSubroutineUniforms when querying ACTIVE_RESOURCES for
_SUBROUTINE_UNIFORM interfaces. However this is the
wrong fix we are meant to be returning the number of active
resources i.e. the count of subroutine uniforms in the
resource list which is what the code was previously doing,
anything else will cause trouble when trying to retrieve
the resource properties based on the ACTIVE_RESOURCES count.

The real problem is that NumSubroutineUniforms was counting
array elements as separate uniforms but the innermost array
is always considered a single uniform so we fix that count
instead which was counted incorrectly in 7fa0250f9.

Idealy we could probably completely remove
NumSubroutineUniforms and just compute its value when needed
from the resource list but this works for now.

Reviewed-by: Alejandro Piñeiro 
Reviewed-by: Tapani Pälli 
Cc: 13.0 
(cherry picked from commit 0303201dfb73c16751d5519cca7480fa678d429a)
[Emil Velikov: LinkStatus is in gl_shader_program]
Signed-off-by: Emil Velikov 

Conflicts:
	src/mesa/main/program_resource.c

Merge remote-tracking branch 'mesa/13.0' into nougat-x86

2016-11-25T04:05:07+00:00