AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,072 Commits 1 Branch 0 Tags
f67cd0bbd978a093c6802bef33099c5b83e496df
Commit Graph

116260 Commits

Author SHA1 Message Date
Karol Herbst
f67cd0bbd9 nouveau: enable HMM 
v2: move declarations into libdrm
v3: fix typos
    rework handling of how much memory to reserve
v4: remove unused parameter
    unmap cutout on error and when the screen is destroyed
v5: move into screen_create
    enable HMM only if CL gets enabled

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4580>
 2020-07-14 14:04:59 +00:00
Mike Blumenkrantz
e1e7584bde zink: block resolve blits for depth/stencil buffers 
"The format features of dstImage must contain VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT"
- vkCmdResolveImage spec

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5888>
 2020-07-14 12:57:22 +00:00
Mike Blumenkrantz
582669f07e zink: block vkCmdBlitImage usage for multi sampled blits 
this is prohibited by spec

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5888>
 2020-07-14 12:57:22 +00:00
Mike Blumenkrantz
ab78831baa zink: try copy_region hook for blits where we can't do a regular blit or resolve 
in cases where the formats match, we can likely just pass this through for now

fixes a ton of spec@!opengl 1.1@depthstencil-default_fb-blit piglit tests

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5888>
 2020-07-14 12:57:22 +00:00
Erik Faye-Lund
34fe561895 mesa/main: use call_once instead of open-coding 
We already have a utility for this, so let's use that instead.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5879>
 2020-07-14 10:56:03 +00:00
Erik Faye-Lund
0a4aa612ba mesa/main: factor out one-time-init into a helper 
This will make the next commit a bit cleaner.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5879>
 2020-07-14 10:56:03 +00:00
Karol Herbst
38e3cbb639 gv100/ir: set ftz bit on floating point operations 
Fixes Unigine Heavens ambient occlusion

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5881>
 2020-07-14 10:35:24 +00:00
Eric Engestrom
f95637f01a meson: fix android vulkan build 
Android doesn't have `pthread_cancel()` and is unlikely to ever
implement it [1], but `wsi_common_display.c` needs it (or an
alternative).

Let's just disable the platform on Android (as it used to be
before 448eb19158).

[1] https://android-review.googlesource.com/c/platform/bionic/+/1215779/1/docs/status.md

Fixes: 448eb19158 ("vulkan: automatically compile the `display` platform when available")
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Acked-by: Nataraj Deshpande <nataraj.deshpande@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5860>
 2020-07-14 09:34:54 +00:00
Connor Abbott
bf1376aba0 tu: Don't invalidate irrelevant state when changing pipeline 
At least in the future this could let us avoid re-emitting gfx/cs
constants when the other changes. This also matches what the blob does.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5877>
 2020-07-14 10:23:58 +02:00
Connor Abbott
a16136796f freedreno/a6xx: Add some documentation for shared consts 
I'm not convinced we'll actually want to use this, and there may be
another enable bit in SP_UNKNOWN_AB00, but it's nice to at least write
this down in case we want to try using it in the future.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5877>
 2020-07-14 10:23:58 +02:00
Connor Abbott
e1fa740c4c freedreno/a6xx: Rename and document HLSQ_UPDATE_CNTL 
It turns out that this clears CP_LOAD_STATE6 packets, including
disabling any pending loads for SS6_INDIRECT/SS6_BINDLESS (these loads
don't actually happen until the draw itself, and I'm not sure if they
happen if the state is unused by the shader) and marking constants and
UBO descriptors loaded with SS6_DIRECT as invalid. It's used very
differently from HLSQ_UPDATE_CNTL on a4xx from whence the name came, and
unlike on a4xx it's not readable, so this probably doesn't line up with
HLSQ_UPDATE_CNTL on a4xx.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5877>
 2020-07-14 10:23:58 +02:00
Serge Martin
dad042b15a clover: implements clEnqueueFillBuffer 
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5897>
 2020-07-14 09:33:02 +02:00
Serge Martin
fea109d40f clover: add more cl_mem_object_type to pipe_texture_target mapping 
It avoid unnecessary CL_INVALID_VALUE return from clGetSupportedImageFormats

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5897>
 2020-07-14 09:33:02 +02:00
Samuel Pitoiset
ac642d8e6d radv: add the custom border color BO to the list of buffers 
The buffer was never added to the list of buffers. This might lead to
VM faults and GPU hangs.

Found this by luck.

Fixes: 57e796a12a ("radv: Implement VK_EXT_custom_border_color")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5884>
 2020-07-14 08:29:06 +02:00
Kristian H. Kristensen
684cfca748 freedreno/registers: Rename SP_2D_SRC_FORMAT 
This register contains information about the destination format, so
let's rename to SP_2D_DST_FORMAT.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
d5c82c3c5f freedreno/a6xx: Split clear and blit texture into different functions 
Now that most of the state programming is in shareable helpers, we can
split emit_blit_or_clear_texture into emit_blit_texture and
fd6_clear_surface.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
f383b2c18a freedreno/a6xx: Don't take pipe_blit_info in emit_blit_dst 
We only need a few fields and we'll want to use this in cases where we
don't have a pipe_blit_info.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
3158b8ba0a freedreno/a6xx: Program RB_UNKNOWN_8C01 in setup helper 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
3ee89e6d03 freedreno/a6xx: Move CP_SET_MARKER to setup helper 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
3961fb7e28 freedreno/a6xx: Move REG_A6XX_SP_2D_SRC_FORMAT programming to helper 
Rename helper to emit_blit_setup().

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
03ad130bc9 freedreno/a6xx: Program A6XX_SP_2D_SRC_FORMAT_COLOR_FORMAT based on dst format 
It's a badly named register...

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
5c3c0c5c7b freedreno/a6xx: Make blit_control helper a little more helpful 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
77d4aa7687 freedreno/a6xx: Enable FMT6_10_10_10_2_UNORM blitting 
Now that we correctly program the _DEST version for the blit
destination and use float16 internal format, these formats work with
the blitter.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
1a58596258 freedreno/a6xx: Separate stencil sysmem clear fix 
We need to clear with PIPE_FORMAT_S8_UINT.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
ab61393bc7 freedreno/a6xx: Don't emit src state when clearing 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
416513d915 freedreno/a6xx: Consolidate computing blit_cntl 
Compute the blit_cntl value in one place and group it with the
register writes.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
b36c675858 freedreno/a6xx: Program SP_2D_SRC_FORMAT outside blit loop 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
556cd8f3e1 freedreno/a6xx: Set src and dst rects outside blit loop 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
25bfc3b049 freedreno/a6xx: Don't set unknown bit when tiling differs 
There is a bit here that's sometimes set, but it's generally not
related to whether tiling differs between src and dst.  Let's stop
setting it until we know more.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
def7e7426d freedreno/a6xx: Split out src and dst setup helpers for blit 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
bf0cf4c181 freedreno/a6xx: Move fd6_ifmt into fd6_blitter.c 
It's only used in this file.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Kristian H. Kristensen
094b68fa72 freedreno/a6xx: Don't blit with R2D_RAW 
Map all formats to a valid ifmt.  FMT6_10_10_10_2_UNORM_DEST still
doesn't work on the blitter so keep that one on the u_blitter path.

Fixes
dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.*
with FD_MESA_DEBUG=nogmem.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
 2020-07-14 06:12:22 +00:00
Jonathan Marek
53e36cf062 turnip: drop GS clear path 
We didn't know how to write layer id without GS, since that's the only way
to do it through VK/GL, and the blob didn't implement this clear case (and
failed cases where it was absolutely necessary). However now we know how to
set it after some educated guesses and looking at tess/geom traces, so the
GS path can be dropped.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5790>
 2020-07-14 04:05:24 +00:00
Jonathan Marek
a1a80c38ea turnip: clean up primitive output state 
We only need to emit one set of primitive output registers. This may differ
from the blob, because it seems to try to allow using the same pipeline
with tess/geom enabled/disabled.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5790>
 2020-07-14 04:05:24 +00:00
Jonathan Marek
7748afbb1e freedreno/regs: update primitive output related registers 
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5790>
 2020-07-14 04:05:24 +00:00
Eric Anholt
5c1afd1ce4 freedreno/ir3: Fix uninit var warning. 
It's a decent bit of analysis to see that the initialization will always
happen, and my compiler isn't doing so in at least one configuration.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5834>
 2020-07-14 03:38:53 +00:00
Eric Anholt
afb3f21c9f freedreno/ir3_cmdline: Fix an uninit var warning. 
You could only access entry through the initialized path, but we can clean
up the compiler warning by not keeping the other var.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5834>
 2020-07-14 03:38:53 +00:00
Hyunjun Ko
d941c6b74f turnip: implement VK_EXT_private_data 
Which is using base class's implementation.

Signed-off-by: Hyunjun Ko <zzoon@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5539>
 2020-07-14 02:48:30 +00:00
Hyunjun Ko
5d3fdbc52b turnip: Use the common base object type and struct. 
v2. Define new helper function to avoid duplicated a pair of function calls.
v3. Move new helper functions to vk_object.h and call them.
v4. Merge 2 commits to use commomn base object type and struct into one.

Signed-off-by: Hyunjun Ko <zzoon@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5539>
 2020-07-14 02:48:30 +00:00
Hyunjun Ko
cd85315dcb tu: Fix wrong copies of sampler descriptor. 
Found this with the following patch but it exists since adding ycbcr
sampler to the struct.

Fixes: d070a7ba0c

Signed-off-by: Hyunjun Ko <zzoon@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5539>
 2020-07-14 02:48:30 +00:00
Hyunjun Ko
3a153137f4 vulkan: Adds helpers for vk_object (de)alloation and (de)initialization. 
Signed-off-by: Hyunjun Ko <zzoon@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5539>
 2020-07-14 02:48:30 +00:00
Eric Engestrom
b7b72681bd meson/intel: add missing dep on git_sha1.h 
Fixes: 805b32cab9 ("intel: add identifier for debug purposes")
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Dylan Baker <dylanx.c.baker@intel.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5882>
 2020-07-13 21:26:25 +00:00
Mike Blumenkrantz
d4f4546ada zink: use type of src[0] for ntv store and load ops 
in some cases (e.g., gl_ClipDistance) the nir_variable type doesn't match
the needed destination type, so we can simplify this code to just use
the destination type

fixes spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-vertex

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5852>
 2020-07-13 21:13:45 +00:00
Mike Blumenkrantz
359c938483 zink: add lengthy comment and remove assert from discard_if ntv pass 
as in the comment, while we may want to try verifying that discard will be
the last instruction in a block, it's a bit problematic given that other nir
passes we're doing may insert instructions after a discard as part of e.g.,
nir_opt_dead_cf in the process of removing another block

fixes shaders@glsl-fs-discard-04

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5852>
 2020-07-13 21:13:45 +00:00
Mike Blumenkrantz
97ec109d8f zink: handle ntv case of nested loop instructions more permissively 
if the last instruction in a loop's body terminates a block, e.g., from
a nested loop with a jump as its final instruction, then no block will
have been started when returning to the original loop, and there's no need
to emit a branch

fixes shaders@glsl-vs-continue-in-switch-in-do-while

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5852>
 2020-07-13 21:13:45 +00:00
Mike Blumenkrantz
e40a77ea5d zink: use right vulkan type for GL_PRIMITIVES_GENERATED queries 
VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT includes
primitives which won't get drawn due to e.g., not enough vertices emitted
by geometry shader

fixes spec@glsl-1.50@gs-emits-too-few-verts

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5533>
 2020-07-13 20:59:07 +00:00
Mike Blumenkrantz
b9b943793b zink: only reset query pool on query end if current batch isn't in renderpass 
reset can't be performed during a renderpass, so we need to defer that until a
time when we're definitely not in a renderpass, such as when we're starting a
new query or resuming a query

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5533>
 2020-07-13 20:59:07 +00:00
Mike Blumenkrantz
2c02ca2184 zink: properly handle query pool overflows 
inline a query result value to each query object so we can stash the partial
result just before we do a pool reset, which will always happen during the
suspend/resume query mechanism that swaps active queries from a flushed batch
to the next batch

once (or if) the "real" call to fetch query results is called, we can dump the
inlined value into the fetch value and return the full results

fixes mesa/mesa#3000

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5533>
 2020-07-13 20:59:07 +00:00
Mike Blumenkrantz
510631ad76 zink: only stall during query destroy for xfb queries 
xfb queries allocate vk buffer objects in the underlying driver which
can be deallocated while an xfb query is in-flight if we attempt to
defer it due to the way that gl xfb is translated to vk, so we need to
continue forcing this behavior in that case

for other query types, we can safely defer here until the current batch has
finished rather than block

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5533>
 2020-07-13 20:59:07 +00:00
Mike Blumenkrantz
27defcd20e zink: use #define for number of queries per-pool 
just to ensure we're consistent internally

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5533>
 2020-07-13 20:59:07 +00:00