mesa.git
6 years agoac: add missing extern "C" guards
Nicolai Hähnle [Sat, 13 May 2017 20:59:19 +0000 (22:59 +0200)]
ac: add missing extern "C" guards

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoac: add radeon_info::num_{sdma,compute}_rings
Nicolai Hähnle [Thu, 11 May 2017 23:04:56 +0000 (01:04 +0200)]
ac: add radeon_info::num_{sdma,compute}_rings

Vulkan needs them.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoac: add radeon_surf::htile_slice_size
Nicolai Hähnle [Wed, 10 May 2017 20:52:27 +0000 (22:52 +0200)]
ac: add radeon_surf::htile_slice_size

Vulkan needs it.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoac_surface: use radeon_info from ac_gpu_info
Nicolai Hähnle [Thu, 11 May 2017 23:24:48 +0000 (01:24 +0200)]
ac_surface: use radeon_info from ac_gpu_info

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoac/radeonsi: move radeon_info initialization to amd/common
Nicolai Hähnle [Thu, 11 May 2017 12:14:06 +0000 (14:14 +0200)]
ac/radeonsi: move radeon_info initialization to amd/common

v2: update Android.common.mk (Emil)

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoac/radeonsi: move struct radeon_info to ac_gpu_info.h
Nicolai Hähnle [Thu, 11 May 2017 08:19:26 +0000 (10:19 +0200)]
ac/radeonsi: move struct radeon_info to ac_gpu_info.h

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoac/radeonsi: move some aspects of sanity checking to ac_surface
Nicolai Hähnle [Wed, 10 May 2017 18:44:51 +0000 (20:44 +0200)]
ac/radeonsi: move some aspects of sanity checking to ac_surface

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoac/radeonsi: add ac_compute_surface to automatically switch gfx6 vs. gfx9
Nicolai Hähnle [Wed, 10 May 2017 18:40:14 +0000 (20:40 +0200)]
ac/radeonsi: add ac_compute_surface to automatically switch gfx6 vs. gfx9

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoac/radeonsi: move the bulk of gfx9_surface_init to ac_surface
Nicolai Hähnle [Wed, 10 May 2017 18:36:03 +0000 (20:36 +0200)]
ac/radeonsi: move the bulk of gfx9_surface_init to ac_surface

We can now merge the two *_surface_init functions.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoac/radeonsi: move the bulk of gfx6_surface_init to ac_surface
Nicolai Hähnle [Wed, 10 May 2017 18:21:36 +0000 (20:21 +0200)]
ac/radeonsi: move the bulk of gfx6_surface_init to ac_surface

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoac/radeonsi: move amdgpu_addr_create to ac_surface
Nicolai Hähnle [Wed, 10 May 2017 15:35:25 +0000 (17:35 +0200)]
ac/radeonsi: move amdgpu_addr_create to ac_surface

v2:
- update Android.common.mk (Emil)
- rebase on top of Raven support

Reviewed-by: Marek Olšák <marek.olsak@amd.com> (v1)
6 years agoac/radeonsi: move surface definitions to new header ac_surface.h
Nicolai Hähnle [Wed, 10 May 2017 12:56:22 +0000 (14:56 +0200)]
ac/radeonsi: move surface definitions to new header ac_surface.h

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agost/mesa: remove an incorrect assertion
Nicolai Hähnle [Wed, 17 May 2017 13:14:35 +0000 (15:14 +0200)]
st/mesa: remove an incorrect assertion

There is really no reason why the current DrawBuffer needs to be complete
at this point. In particular, the assertion gets hit on the X server side
in libglx when running .../piglit/bin/glx-get-current-display-ext -auto
(which uses indirect GLX rendering).

Fixes: 19b61799e3d0 ("st/mesa: don't cast the incomplete framebufer to st_framebuffer")
Reported-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoi965/vec4: load dvec3/4 uniforms first in the push constant buffer
Samuel Iglesias Gonsálvez [Wed, 19 Apr 2017 09:18:35 +0000 (11:18 +0200)]
i965/vec4: load dvec3/4 uniforms first in the push constant buffer

Reorder the uniforms to load first the dvec4-aligned variables in the
push constant buffer and then push the vec4-aligned ones. It takes
into account that the relocated uniforms should be aligned to their
channel size.

This fixes a bug were the dvec3/4 might be loaded one part on a GRF and
the rest in next GRF, so the region parameters to read that could break
the HW rules.

v2:
- Fix broken logic.
- Add a comment to explain what should be needed to optimise the usage
  of the push constant buffer slots, as this patch does not pack the
  uniforms.

v3:
- Implemented the push constant buffer usage optimization.

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Cc: "17.1" <mesa-stable@lists.freedesktop.org>
Acked-by: Francisco Jerez <currojerez@riseup.net>
6 years agoi965/vec4: fix swizzle and writemask when loading an uniform with constant offset
Samuel Iglesias Gonsálvez [Wed, 19 Apr 2017 08:35:07 +0000 (10:35 +0200)]
i965/vec4: fix swizzle and writemask when loading an uniform with constant offset

It was setting XYWZ swizzle and writemask to all uniforms, no matter if they
were a vector or scalar, so this can lead to problems when loading them
to the push constant buffer.

Moreover, 'shift' calculation was designed to calculate the offset in
DWORDS, but it doesn't take into account DFs, so the calculated swizzle
for the later ones was wrong.

The indirect case is not changed because MOV INDIRECT will write
to all components. Added an assert to verify that these uniforms
are aligned.

v2:
- Fix 'shift' calculation (Curro)
- Set both swizzle and writemask.
- Add assert(shift == 0) for the indirect case.

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Cc: "17.1" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
6 years agoi965/vec4/gs: restore the uniform values which was overwritten by failed vec4_gs_visi...
Samuel Iglesias Gonsálvez [Fri, 5 May 2017 08:42:15 +0000 (10:42 +0200)]
i965/vec4/gs: restore the uniform values which was overwritten by failed vec4_gs_visitor execution

We are going to add a packing feature to reduce the usage of the push
constant buffer. One of the consequences is that 'nr_params' would be
modified by vec4_visitor's run call, so we need to restore it if one of
them failed before executing the fallback ones. Same thing happens to the
uniforms values that would be reordered afterwards.

Fixes GL45-CTS.arrays_of_arrays_gl.InteractionFunctionCalls2 when
the dvec4 alignment and packing patch is applied.

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Cc: "17.1" <mesa-stable@lists.freedesktop.org>
Acked-by: Francisco Jerez <currojerez@riseup.net>
6 years agovc4: Don't allocate new BOs to avoid synchronization when they're shared.
Eric Anholt [Wed, 17 May 2017 20:22:39 +0000 (13:22 -0700)]
vc4: Don't allocate new BOs to avoid synchronization when they're shared.

If X11 did a software fallback to the entire screen, we would throw out
the BO the screen is scanning out from and allocate a new one.

Cc: mesa-stable@lists.freedesktop.org
6 years agovc4: Drop pointless indirections around BO import/export.
Eric Anholt [Mon, 8 May 2017 23:46:59 +0000 (16:46 -0700)]
vc4: Drop pointless indirections around BO import/export.

I've since found them to be more confusing by adding indirections than
clarifying by screening off resources from the handle/fd import/export
process.

6 years agovc4: Drop the u_resource_vtbl no-op layer.
Eric Anholt [Mon, 8 May 2017 23:43:06 +0000 (16:43 -0700)]
vc4: Drop the u_resource_vtbl no-op layer.

We only ever attached one vtbl, so it was a waste of space and
indirections.

6 years agogallium/radeon: use a top-of-pipe timestamp for the start of TIME_ELAPSED
Marek Olšák [Mon, 15 May 2017 15:27:25 +0000 (17:27 +0200)]
gallium/radeon: use a top-of-pipe timestamp for the start of TIME_ELAPSED

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: don't check mapped buffers in every draw call if drivers allow it
Marek Olšák [Mon, 15 May 2017 14:34:06 +0000 (16:34 +0200)]
mesa: don't check mapped buffers in every draw call if drivers allow it

Before: DrawElements (16 VBOs) w/ no state change: 4.34 million/s
After:  DrawElements (16 VBOs) w/ no state change: 8.80 million/s

This inefficiency was uncovered by Timothy Arceri's no_error work.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add gl_constants::AllowMappedBuffersDuringExecution
Marek Olšák [Mon, 15 May 2017 14:30:30 +0000 (16:30 +0200)]
mesa: add gl_constants::AllowMappedBuffersDuringExecution

for skipping mapped-buffer checking in every GL draw call

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agogallium: add PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION
Marek Olšák [Mon, 15 May 2017 14:30:30 +0000 (16:30 +0200)]
gallium: add PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION

for skipping mapped-buffer checking in every GL draw call

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agoglxglvnddispatch: Add missing dispatch for GetDriverConfig
Hans de Goede [Mon, 20 Mar 2017 07:41:26 +0000 (08:41 +0100)]
glxglvnddispatch: Add missing dispatch for GetDriverConfig

Together with some fixes to xdriinfo this fixes xdriinfo not working
with glvnd.

Since apps (xdriinfo) expect GetDriverConfig to work without going to
need through the dance to setup a glxcontext (which is a reasonable
expectation IMHO), the dispatch for this ends up significantly different
then any other dispatch function.

This patch gets the job done, but I'm not really happy with how this
patch turned out, suggestions for a better fix are welcome.

Cc: Kyle Brenneman <kbrenneman@nvidia.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Cc: mesa-stable@lists.freedesktop.org
6 years agoswr: don't use AttributeSet with llvm >= 5
Tim Rowley [Thu, 11 May 2017 15:56:20 +0000 (10:56 -0500)]
swr: don't use AttributeSet with llvm >= 5

This change fixes the build break with llvm-svn.

r301981 of llvm-svn made add/remove of function attributes
use AttrBuilder instead of AttributeList.

Tested with llvm-3.9, llvm-4.0, llvm-svn.

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
6 years agoAndroid: correct libz dependency
Chih-Wei Huang [Wed, 17 May 2017 05:10:02 +0000 (13:10 +0800)]
Android: correct libz dependency

Commit 6facb0c0 ("android: fix libz dynamic library dependencies")
unconditionally adds libz as a dependency to all shared libraries.
That is unnecessary.

Commit 85a9b1b5 introduced libz as a dependency to libmesa_util.
So only the shared libraries that use libmesa_util need libz.

Fix Android Lollipop build by adding the include path of zlib to
libmesa_util explicitly instead of getting the path implicitly
from zlib since it doesn't export the include path in Lollipop.

Fixes: 6facb0c0 "android: fix libz dynamic library dependencies"
Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Rob Herring <robh@kernel.org>
6 years agomesa: add KHR_no_error support for glDispatchCompute*()
Timothy Arceri [Mon, 15 May 2017 02:28:08 +0000 (12:28 +1000)]
mesa: add KHR_no_error support for glDispatchCompute*()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add DispatchCompute* helpers
Timothy Arceri [Mon, 15 May 2017 02:13:01 +0000 (12:13 +1000)]
mesa: add DispatchCompute* helpers

These will be used to add KHR_no_error support.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: move FLUSH_CURRENT() calls out of DispatchCompute*() validation
Timothy Arceri [Mon, 15 May 2017 01:22:25 +0000 (11:22 +1000)]
mesa: move FLUSH_CURRENT() calls out of DispatchCompute*() validation

This is required to add KHR_no_error support.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: compute.c C99 tidy up
Timothy Arceri [Mon, 15 May 2017 01:12:13 +0000 (11:12 +1000)]
mesa: compute.c C99 tidy up

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: move DispatchCompute() validation to compute.c
Timothy Arceri [Mon, 15 May 2017 01:08:13 +0000 (11:08 +1000)]
mesa: move DispatchCompute() validation to compute.c

This is the only place it is used so there is no reason for it to be
in api_validate.c

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for glBlendEquationSeparateiARB()
Timothy Arceri [Mon, 15 May 2017 00:51:34 +0000 (10:51 +1000)]
mesa: add KHR_no_error support for glBlendEquationSeparateiARB()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add blend_equation_separatei() helper
Timothy Arceri [Mon, 15 May 2017 00:48:17 +0000 (10:48 +1000)]
mesa: add blend_equation_separatei() helper

Will be used to add KHR_no_error support.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for glBlendFunc*iARB()
Timothy Arceri [Mon, 15 May 2017 00:41:23 +0000 (10:41 +1000)]
mesa: add KHR_no_error support for glBlendFunc*iARB()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add blend_func_separatei() helper
Timothy Arceri [Mon, 15 May 2017 00:31:38 +0000 (10:31 +1000)]
mesa: add blend_func_separatei() helper

This will be used to add KHR_no_error support.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for glBufferSubData()
Timothy Arceri [Fri, 12 May 2017 11:36:25 +0000 (21:36 +1000)]
mesa: add KHR_no_error support for glBufferSubData()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for glNamedBufferSubData()
Timothy Arceri [Fri, 12 May 2017 11:29:11 +0000 (21:29 +1000)]
mesa: add KHR_no_error support for glNamedBufferSubData()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add buffer_sub_data() helper
Timothy Arceri [Fri, 12 May 2017 11:21:38 +0000 (21:21 +1000)]
mesa: add buffer_sub_data() helper

This will allow us to share code between the dsa, non-dsa and
no_error variants.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: create validate_buffer_sub_data() helper
Timothy Arceri [Fri, 12 May 2017 07:10:10 +0000 (17:10 +1000)]
mesa: create validate_buffer_sub_data() helper

This change assumes meta will always pass valid arguments to
_mesa_buffer_sub_data().

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for glBufferStorage()
Timothy Arceri [Fri, 12 May 2017 06:51:24 +0000 (16:51 +1000)]
mesa: add KHR_no_error support for glBufferStorage()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for glNamedBufferStorage()
Timothy Arceri [Fri, 12 May 2017 06:43:30 +0000 (16:43 +1000)]
mesa: add KHR_no_error support for glNamedBufferStorage()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add inlined_buffer_storage() helper
Timothy Arceri [Fri, 12 May 2017 06:31:01 +0000 (16:31 +1000)]
mesa: add inlined_buffer_storage() helper

This will allow us to share code between the dsa, non-dsa and
no_error variants.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add validate_buffer_storage() helper
Timothy Arceri [Fri, 12 May 2017 05:41:22 +0000 (15:41 +1000)]
mesa: add validate_buffer_storage() helper

This will allow use to add KHR_no_error support.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for glCompressedTex*SubImage3D()
Timothy Arceri [Fri, 12 May 2017 00:47:14 +0000 (10:47 +1000)]
mesa: add KHR_no_error support for glCompressedTex*SubImage3D()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add 3D support to compressed_tex_sub_image() helper
Timothy Arceri [Fri, 12 May 2017 00:36:54 +0000 (10:36 +1000)]
mesa: add 3D support to compressed_tex_sub_image() helper

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for glCompressedTex*SubImage2D()
Timothy Arceri [Thu, 11 May 2017 12:16:07 +0000 (22:16 +1000)]
mesa: add KHR_no_error support for glCompressedTex*SubImage2D()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add 2D support to compressed_tex_sub_image() helper
Timothy Arceri [Thu, 11 May 2017 07:14:06 +0000 (17:14 +1000)]
mesa: add 2D support to compressed_tex_sub_image() helper

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for CompressedTex*SubImage1D()
Timothy Arceri [Wed, 10 May 2017 07:20:10 +0000 (17:20 +1000)]
mesa: add KHR_no_error support for CompressedTex*SubImage1D()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add compressed_tex_sub_image() helper
Timothy Arceri [Wed, 10 May 2017 07:07:32 +0000 (17:07 +1000)]
mesa: add compressed_tex_sub_image() helper

This reduces duplication between the dsa and non-dsa function
and will also be used in the following commit to add
KHR_no_error support.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: make _mesa_compressed_texture_sub_image() static
Timothy Arceri [Wed, 10 May 2017 05:22:40 +0000 (15:22 +1000)]
mesa: make _mesa_compressed_texture_sub_image() static

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for NamedFramebufferTexture
Timothy Arceri [Mon, 8 May 2017 02:01:33 +0000 (12:01 +1000)]
mesa: add KHR_no_error support for NamedFramebufferTexture

V3: use frame_buffer_texture() helper

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for FramebufferTexture
Timothy Arceri [Mon, 8 May 2017 01:52:45 +0000 (11:52 +1000)]
mesa: add KHR_no_error support for FramebufferTexture

V3: use the frame_buffer_texture() helper

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add *FramebufferTexture() support to frame_buffer_texture helper
Timothy Arceri [Wed, 10 May 2017 01:44:54 +0000 (11:44 +1000)]
mesa: add *FramebufferTexture() support to frame_buffer_texture helper

V2: call check_layered_texture_target() even for no_error

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for NamedFramebufferTextureLayer
Timothy Arceri [Mon, 8 May 2017 01:37:33 +0000 (11:37 +1000)]
mesa: add KHR_no_error support for NamedFramebufferTextureLayer

v3: use frame_buffer_texture_layer() helper

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for FramebufferTextureLayer
Timothy Arceri [Mon, 8 May 2017 01:24:07 +0000 (11:24 +1000)]
mesa: add KHR_no_error support for FramebufferTextureLayer

V3: use frame_buffer_texture_layer() helper

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add no error support to frame_buffer_texture_layer() helper
Timothy Arceri [Thu, 11 May 2017 05:43:44 +0000 (15:43 +1000)]
mesa: add no error support to frame_buffer_texture_layer() helper

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add frame_buffer_texture_layer() helper
Timothy Arceri [Wed, 10 May 2017 01:22:47 +0000 (11:22 +1000)]
mesa: add frame_buffer_texture_layer() helper

To be used to add KHR_no_error support while sharing code between
the DSA and non-DSA OpenGL function.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: add KHR_no_error support for glUseProgram
Timothy Arceri [Wed, 3 May 2017 06:40:39 +0000 (16:40 +1000)]
mesa: add KHR_no_error support for glUseProgram

V3: use always_inline attribute (Suggested by Nicolai)

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agomesa: move use_program() inside _mesa_use_program()
Timothy Arceri [Thu, 11 May 2017 04:59:41 +0000 (14:59 +1000)]
mesa: move use_program() inside _mesa_use_program()

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agointel/isl/gen6: Fix combined depth stencil alignment
Jason Ekstrand [Mon, 15 May 2017 20:51:13 +0000 (13:51 -0700)]
intel/isl/gen6: Fix combined depth stencil alignment

All combined depth stencil buffers (even those with just stencil)
require a 4x4 alignment on Sandy Bridge.  The only depth/stencil buffer
type that requires 4x2 is separate stencil.

Reviewed-by: Chad Versace <chadversary@chromium.org>
6 years agointel/isl: Refactor gen8_choose_image_alignment_el
Jason Ekstrand [Wed, 10 May 2017 19:29:04 +0000 (12:29 -0700)]
intel/isl: Refactor gen8_choose_image_alignment_el

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>
6 years agointel/isl: Refactor gen6_choose_image_alignment_el
Jason Ekstrand [Wed, 10 May 2017 19:15:01 +0000 (12:15 -0700)]
intel/isl: Refactor gen6_choose_image_alignment_el

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>
6 years agointel/isl: Refactor gen7_choose_image_alignment_el
Jason Ekstrand [Tue, 9 May 2017 16:50:21 +0000 (09:50 -0700)]
intel/isl: Refactor gen7_choose_image_alignment_el

The Ivy Bridge PRM provides a nice table that handles most of the
alignment cases in one place.  For standard color buffers we have a
little freedom of choice but for most depth, stencil and compressed it's
hard-coded.  Chad's original functions split halign and valign apart and
implemented them almost entirely based on restrictions and not the
table.  This makes things way more confusing than they need to be.  This
commit gets rid of the split and makes us implement the exact table
up-front.  If our surface isn't one of the ones in the table then we
have to make real choices.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>
6 years agointel/isl/gen7: Use stencil vertical alignment of 8 instead of 4
Pohjolainen, Topi [Wed, 3 May 2017 09:22:50 +0000 (12:22 +0300)]
intel/isl/gen7: Use stencil vertical alignment of 8 instead of 4

The reasoning Chad gave in the comment for choosing a valign of 4 is
entirely bunk.  The fact that you have to multiply pitch by 2 is
completely unrelated to the halign/valign parameters used for texture
layout.  (Not completely unrelated.  W-tiling is just Y-tiling with a
bit of extra swizzling which turns 8x8 W-tiled chunks into 16x4 y-tiled
chunks so it makes everything easier if miplevels are always aligned to
8x8.)  The fact that RENDER_SURFACE_STATE::SurfaceVerticalAlignmet
doesn't have a VALIGN_8 option doesn't matter since this is gen7 and you
can't do stencil texturing anyway.

v2 (Jason Ekstrand):
 - Delete most of Chad's comment and add a more descriptive commit
   message.

Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Cc: "17.0 17.1" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Chad Versace <chadversary@chromium.org>
6 years agofreedreno/gmem: fix hw binning hangs with large render targets
Rob Clark [Tue, 16 May 2017 12:37:50 +0000 (08:37 -0400)]
freedreno/gmem: fix hw binning hangs with large render targets

On all 3 gens, we have 4 bits for width and height in the VSC pipe
config.  And overflow results in setting width and/or height to zero
which causes hangs.

Signed-off-by: Rob Clark <robdclark@gmail.com>
6 years agofreedreno/ir3: fix crash with atomics
Rob Clark [Mon, 15 May 2017 20:42:15 +0000 (16:42 -0400)]
freedreno/ir3: fix crash with atomics

Atomics can have a result value.  And sometimes it is even used.

Signed-off-by: Rob Clark <robdclark@gmail.com>
6 years agomesa/st: fix yuv EGLImage's
Rob Clark [Tue, 16 May 2017 14:29:44 +0000 (10:29 -0400)]
mesa/st: fix yuv EGLImage's

Don't reject YUV formats that the driver doesn't handle natively, since
mesa/st already knows how to lower this in shader.

Reported-by: Nicolas Dechesne <ndec@linaro.org>
Fixes: 83e9de2 ("st/mesa: EGLImageTarget* error handling")
Cc: 17.1 <mesa-stable@lists.freedesktop.org
Signed-off-by: Rob Clark <robdclark@gmail.com>
Tested-by: Nicolas Dechesne <ndec@linaro.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
6 years agottn: fix dest size for some texture instructions
Rob Clark [Mon, 15 May 2017 17:31:44 +0000 (13:31 -0400)]
ttn: fix dest size for some texture instructions

Some, like lod, don't return 4 components.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
6 years agottn: fix txd src sizes
Rob Clark [Mon, 15 May 2017 17:24:34 +0000 (13:24 -0400)]
ttn: fix txd src sizes

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
6 years agottn: fix txs dest size
Rob Clark [Mon, 15 May 2017 17:03:44 +0000 (13:03 -0400)]
ttn: fix txs dest size

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
6 years agofreedreno/a5xx: remove unneeded assert
Rob Clark [Mon, 15 May 2017 18:08:16 +0000 (14:08 -0400)]
freedreno/a5xx: remove unneeded assert

Signed-off-by: Rob Clark <robdclark@gmail.com>
6 years agofreedreno/a5xx: fallback to slow-clear for z32
Rob Clark [Mon, 15 May 2017 16:36:24 +0000 (12:36 -0400)]
freedreno/a5xx: fallback to slow-clear for z32

We probably *could* do this with blit path, but I think it would involve
clobbering settings from batch->gmem (see emit_zs()).

Signed-off-by: Rob Clark <robdclark@gmail.com>
6 years agoetnaviv: increment the resource seqno in resource_changed
Philipp Zabel [Wed, 10 May 2017 16:01:08 +0000 (18:01 +0200)]
etnaviv: increment the resource seqno in resource_changed

Just increment the resource seqno instead of setting the texture
seqno to be lower by one than the resource seqno.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-By: Wladimir J. van der Laan <laanwj@gmail.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
6 years agoetnaviv: clean up sampler view reference counting
Lucas Stach [Wed, 10 May 2017 16:01:07 +0000 (18:01 +0200)]
etnaviv: clean up sampler view reference counting

Use the proper pipe_resource_reference function instead of
rolling our own.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
6 years agoetnaviv: apply feature overrides in one central location
Lucas Stach [Wed, 10 May 2017 16:01:06 +0000 (18:01 +0200)]
etnaviv: apply feature overrides in one central location

This way we can just test the feature bits and don't need to spread
the debug overrides to all locations touching a feature.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-By: Wladimir J. van der Laan <laanwj@gmail.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
6 years agoetnaviv: allow R/B swapped surfaces to be cleared
Lucas Stach [Wed, 10 May 2017 16:01:05 +0000 (18:01 +0200)]
etnaviv: allow R/B swapped surfaces to be cleared

Fixes: 7f62ffb68ad ("etnaviv: add support for rb swap")
Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
6 years agoetnaviv: stop oversizing buffer resources
Lucas Stach [Wed, 10 May 2017 16:01:04 +0000 (18:01 +0200)]
etnaviv: stop oversizing buffer resources

PIPE_BUFFER is a target enum, not a binding. This caused the driver to
up-align the height of buffer resources, leading to largely oversizing
those resources. This is especially bad, as the buffer resources used
by the upload manager are already 1MB in size. Height alignment meant
that those would result in 4 to 8MB big BOs.

Fixes: c9e8b49b885 ("etnaviv: gallium driver for Vivante GPUs")
Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-By: Wladimir J. van der Laan <laanwj@gmail.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
6 years agoi965: Fix test_eu_validate.cpp
Matt Turner [Tue, 16 May 2017 18:43:57 +0000 (11:43 -0700)]
i965: Fix test_eu_validate.cpp

Broken by commit a7217e909ce6 ("i965: Pass pointer and end of assembly
to brw_validate_instructions").

Reported-by: Aaron Watry <awatry@gmail.com>
6 years agoanv: Implement VK_KHR_get_surface_capabilities2
Jason Ekstrand [Fri, 17 Mar 2017 22:07:44 +0000 (15:07 -0700)]
anv: Implement VK_KHR_get_surface_capabilities2

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
6 years agovulkan/wsi/wayland: Add support for VK_KHR_get_surface_capabilities2
Jason Ekstrand [Fri, 17 Mar 2017 21:08:04 +0000 (14:08 -0700)]
vulkan/wsi/wayland: Add support for VK_KHR_get_surface_capabilities2

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
6 years agovulkan/wsi/x11: Add support for VK_KHR_get_surface_capabilities2
Jason Ekstrand [Fri, 17 Mar 2017 21:04:57 +0000 (14:04 -0700)]
vulkan/wsi/x11: Add support for VK_KHR_get_surface_capabilities2

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
6 years agovulkan/wsi: Add get_capabilities2 and get_formats2d interface pointers
Jason Ekstrand [Fri, 17 Mar 2017 20:50:24 +0000 (13:50 -0700)]
vulkan/wsi: Add get_capabilities2 and get_formats2d interface pointers

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
6 years agovulkan/wsi: Use vk_outarray for surface_get_formats
Jason Ekstrand [Fri, 17 Mar 2017 21:02:43 +0000 (14:02 -0700)]
vulkan/wsi: Use vk_outarray for surface_get_formats

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
6 years agovulkan: Update registry and headers to 1.0.49
Jason Ekstrand [Mon, 15 May 2017 14:58:43 +0000 (07:58 -0700)]
vulkan: Update registry and headers to 1.0.49

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
6 years agoradeonsi: extract TGSI memory/texture opcode handling into its own file
Nicolai Hähnle [Mon, 15 May 2017 21:35:28 +0000 (23:35 +0200)]
radeonsi: extract TGSI memory/texture opcode handling into its own file

It's about time to get the growth of si_shader.c somewhat under control.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoradeonsi: make const_array externally accessible
Nicolai Hähnle [Mon, 15 May 2017 21:17:54 +0000 (23:17 +0200)]
radeonsi: make const_array externally accessible

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoradeonsi: make get_bounded_indirect_index externally accessible
Nicolai Hähnle [Mon, 15 May 2017 21:11:46 +0000 (23:11 +0200)]
radeonsi: make get_bounded_indirect_index externally accessible

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoradeonsi: make emit_waitcnt externally accessible
Nicolai Hähnle [Mon, 15 May 2017 21:06:08 +0000 (23:06 +0200)]
radeonsi: make emit_waitcnt externally accessible

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoradeonsi: silence a Coverity warning
Nicolai Hähnle [Wed, 10 May 2017 16:45:40 +0000 (18:45 +0200)]
radeonsi: silence a Coverity warning

Coverity doesn't understand that we'll never pass non-NULL for vertex
shaders.

This is a bit lame, actually. A straightforward cross-procedural analysis
limited to this source file should be enough to prove that there's no
NULL-pointer dereference. Oh well.

CID: 1405999
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoradeonsi: rename tcs_tes_uses_prim_id for clarity
Nicolai Hähnle [Mon, 15 May 2017 09:13:44 +0000 (11:13 +0200)]
radeonsi: rename tcs_tes_uses_prim_id for clarity

What we care about is whether PrimID is used while tessellation is
enabled; whether it's used in TCS/TES or further down the pipeline is
irrelevant.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoradeonsi: fix gl_PrimitiveIDIn in geometry shader when using tessellation
Nicolai Hähnle [Mon, 15 May 2017 09:10:13 +0000 (11:10 +0200)]
radeonsi: fix gl_PrimitiveIDIn in geometry shader when using tessellation

This builds on commit 0549ea15ec38 ("radeonsi: fix primitive ID in
fragment shader when using tessellation").

Fixes piglit
arb_tessellation_shader/execution/gs-primitiveid-instanced.shader_test

Cc: 17.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
6 years agoac/debug: handle index field in SET_*_REG correctly
Nicolai Hähnle [Mon, 15 May 2017 09:10:31 +0000 (11:10 +0200)]
ac/debug: handle index field in SET_*_REG correctly

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
7 years agoglsl: simplify link_assign_uniform_storage() a bit
Samuel Pitoiset [Mon, 15 May 2017 10:55:06 +0000 (12:55 +0200)]
glsl: simplify link_assign_uniform_storage() a bit

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Elie Tournier <elie.tournier@collabora.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
7 years agomesa: unify _mesa_uniform() for image uniforms
Samuel Pitoiset [Mon, 15 May 2017 10:55:05 +0000 (12:55 +0200)]
mesa: unify _mesa_uniform() for image uniforms

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Elie Tournier <elie.tournier@collabora.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
7 years agomesa: fix indentation in _mesa_uniform()
Samuel Pitoiset [Mon, 15 May 2017 10:55:04 +0000 (12:55 +0200)]
mesa: fix indentation in _mesa_uniform()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Elie Tournier <elie.tournier@collabora.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
7 years agomesa: fix indentation in _mesa_associate_uniform_storage()
Samuel Pitoiset [Mon, 15 May 2017 10:55:03 +0000 (12:55 +0200)]
mesa: fix indentation in _mesa_associate_uniform_storage()

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Elie Tournier <elie.tournier@collabora.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
7 years agomesa: replace _mesa_problem() with unreachable() in pack.c
Timothy Arceri [Tue, 9 May 2017 02:50:56 +0000 (12:50 +1000)]
mesa: replace _mesa_problem() with unreachable() in pack.c

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
7 years agomesa: replace _mesa_problem() with unreachable() in mipmap.c
Timothy Arceri [Tue, 9 May 2017 02:46:48 +0000 (12:46 +1000)]
mesa: replace _mesa_problem() with unreachable() in mipmap.c

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
7 years agomesa: replace _mesa_problem() with unreachable() in _mesa_convert_colors()
Timothy Arceri [Tue, 9 May 2017 02:38:44 +0000 (12:38 +1000)]
mesa: replace _mesa_problem() with unreachable() in _mesa_convert_colors()

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
7 years agomesa: replace _mesa_problem() with unreachable() in _mesa_light()
Timothy Arceri [Tue, 9 May 2017 02:36:35 +0000 (12:36 +1000)]
mesa: replace _mesa_problem() with unreachable() in _mesa_light()

All drivers but the old nouveau dri driver return after this anyway.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>