Timothy Arceri [Sun, 27 Oct 2019 22:49:39 +0000 (09:49 +1100)]
util: remove LIST_INITHEAD macro
Just use the inlined function directly. The macro was replaced with
the function in
ebe304fa540f.
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Erik Faye-Lund [Mon, 28 Oct 2019 11:02:51 +0000 (12:02 +0100)]
gitlab-ci: fixup debian tags
When resolving a merge-conflict, I accidentally only updated the
ARM64-tag tag. Let's correct this.
Fixes: 3d529c17393 ("gitlab-ci: also build Zink on CI")
Danylo Piliaiev [Fri, 25 Oct 2019 16:49:43 +0000 (19:49 +0300)]
intel/compiler: Fix C++ one definition rule violations
When building with "-flto" brw::block_data definitions
were colliding.
Signed-off-by: Danylo Piliaiev <danylo.piliaiev@globallogic.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Erik Faye-Lund [Tue, 22 Oct 2019 07:08:11 +0000 (09:08 +0200)]
gitlab-ci: also build Zink on CI
This prevents accidentally breaking the driver-build while working on
other drivers.
Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Erik Faye-Lund [Wed, 9 Oct 2019 09:25:50 +0000 (11:25 +0200)]
zink: simplify gl-to-vulkan lowering
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Tue, 8 Oct 2019 09:54:10 +0000 (11:54 +0200)]
zink/spirv: more complete sampler-dim handling
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Tue, 8 Oct 2019 09:43:29 +0000 (11:43 +0200)]
zink: fixup scissoring
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Duncan Hopkins [Thu, 26 Sep 2019 11:25:26 +0000 (12:25 +0100)]
zink: limited uniform buffer size so the limits is not exceeded.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 23 Sep 2019 20:13:50 +0000 (22:13 +0200)]
zink: do not set lineWidth to invalid value
Some implementations don't support the lineWidth-feature, so let's
avoid setting invalid state to them. But since we don't have a fallback
for this, inform the user.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 23 Sep 2019 20:11:35 +0000 (22:11 +0200)]
zink: pass screen to zink_create_gfx_pipeline
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Duncan Hopkins [Thu, 11 Jul 2019 10:51:08 +0000 (11:51 +0100)]
zink: respect ubo buffer alignment requirement
The driver can report a minimum alignment for UBOs, and that can be
larger than 64, which we've currently been using. Let's play ball, and
use the reported value instead.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Duncan Hopkins [Wed, 10 Jul 2019 13:50:16 +0000 (14:50 +0100)]
zink: fix line-width calculation
There's two things that goes wrong in this code on some drivers:
1. Rounding off the line-width to granularity can push it outside the
legal range.
2. A granularity of 0.0 results in NaN, because we divide by zero.
So let's make this code a bit more robust.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 25 Jul 2019 18:52:10 +0000 (20:52 +0200)]
zink: fixup return-value
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 24 Jul 2019 21:18:08 +0000 (23:18 +0200)]
zink: refactor blitting
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 24 Jul 2019 15:58:54 +0000 (17:58 +0200)]
zink: implement resource_from_handle
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 24 Jul 2019 19:59:04 +0000 (21:59 +0200)]
zink: use VK_FORMAT_B8G8R8A8_UNORM for PIPE_FORMAT_B8G8R8X8_UNORM
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 24 Jul 2019 12:09:11 +0000 (14:09 +0200)]
zink: do not set VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT for non-3D textures
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Tue, 23 Jul 2019 15:55:51 +0000 (17:55 +0200)]
zink/spirv: alias var0 on tex0 etc instead
This fixes Quake3, and is more in line with directx semantics.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 25 Jul 2019 11:50:40 +0000 (13:50 +0200)]
zink: lower two-sided coloring
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 22 Jul 2019 14:16:40 +0000 (16:16 +0200)]
zink/spirv: alias generic varyings on non-generic ones
This gets rid of the nasty location-allocation hack.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 22 Jul 2019 11:24:14 +0000 (13:24 +0200)]
zink/spirv: implement load_front_face
We're now adding interface-types during code-emitting, so we need to
defer emitting the entry-point. No biggie, spirv_builder is prepares for
this.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 15:35:27 +0000 (17:35 +0200)]
zink/spirv: fixup b2i32
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 15:05:19 +0000 (17:05 +0200)]
zink: do not lower bools to float
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 15:04:50 +0000 (17:04 +0200)]
zink/spirv: prepare for 1-bit booleans
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 14:53:04 +0000 (16:53 +0200)]
zink/spirv: fixup b2i32 and implement b2f32
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 14:25:21 +0000 (16:25 +0200)]
zink/spirv: clean up get_[fu]vec_constant
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 14:12:57 +0000 (16:12 +0200)]
zink/spirv: inline get_uvec_constant into emit_load_const
This is the only call-site that wants to specify unique values per
component for any of the get_*_constant functions. So let's give this
its own implementation instead, so we can ease the burden for the rest.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 14:09:11 +0000 (16:09 +0200)]
zink/spirv: add emit_uint_const-helper
While we're at it, let's move emit_float_const to the same location as
this needs to be defined at.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 13:49:23 +0000 (15:49 +0200)]
zink/spirv: add emit_bitcast-helper
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 13:34:07 +0000 (15:34 +0200)]
zink/spirv: use bit_size instead of hard-coding
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 13:30:54 +0000 (15:30 +0200)]
zink/spirv: implement emit_float_const helper
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 13:23:47 +0000 (15:23 +0200)]
zink/spirv: implement emit_select helper
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 13:03:13 +0000 (15:03 +0200)]
zink/spirv: implement b2i32
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 13:02:49 +0000 (15:02 +0200)]
zink/spirv: implement bitwise ops
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 12:41:08 +0000 (14:41 +0200)]
zink/spirv: implement bcsel
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 12:39:30 +0000 (14:39 +0200)]
zink/spirv: assert bit-size
This is going to make it easier to verify that 1-bit float sizes don't
leak into the rest of the code.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 19 Jul 2019 12:27:47 +0000 (14:27 +0200)]
zink/spirv: implement f2b1
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 18 Jul 2019 16:42:20 +0000 (18:42 +0200)]
zink/spirv: use ordered compares
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 18 Jul 2019 15:04:09 +0000 (17:04 +0200)]
zink: lower point-size
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 17 Jul 2019 09:33:58 +0000 (11:33 +0200)]
zink: add missing sRGB DXT-formats
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 17 Jul 2019 09:26:53 +0000 (11:26 +0200)]
zink: disable PIPE_CAP_QUERY_TIME_ELAPSED for now
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Tue, 16 Jul 2019 15:52:36 +0000 (17:52 +0200)]
zink: support shadow-samplers
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Tue, 16 Jul 2019 15:16:09 +0000 (17:16 +0200)]
zink: fix rendering to 3D-textures
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Tue, 16 Jul 2019 15:02:56 +0000 (17:02 +0200)]
zink: initialize nr_samples for pipe_surface
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Tue, 16 Jul 2019 13:18:53 +0000 (15:18 +0200)]
zink: use primconvert to get rid of 8-bit indices
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Tue, 16 Jul 2019 12:25:59 +0000 (14:25 +0200)]
zink: also accept txl
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Tue, 16 Jul 2019 11:29:06 +0000 (13:29 +0200)]
HACK: zink: suspend / resume queries on batch-boundaries
HACK because we assert that we don't overrun the pool. We need a
fallback here instead.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Tue, 16 Jul 2019 09:20:42 +0000 (11:20 +0200)]
zink: move set_active_query_state-stub to zink_query.c
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Tue, 16 Jul 2019 09:02:16 +0000 (11:02 +0200)]
zink: disable timestamp-queries
We don't implement the get_timestamp context-method, so this is just
going to crash if anyone tries to use it. Let's implement it later.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 17:24:15 +0000 (19:24 +0200)]
zink: fixup boolean queries
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 13:48:31 +0000 (15:48 +0200)]
zink/spirv: support vec1 coordinates
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 13:33:34 +0000 (15:33 +0200)]
zink: do not use both depth and stencil aspects for sampler-views
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 13:02:59 +0000 (15:02 +0200)]
zink/spirv: always enable Sampled1D for fragment shaders
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 13:02:15 +0000 (15:02 +0200)]
zink: add note about enabling PIPE_CAP_CLIP_HALFZ
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 12:44:11 +0000 (14:44 +0200)]
zink: don't crash when setting rast-state to NULL
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 12:42:37 +0000 (14:42 +0200)]
zink: remove insecure comment
This isn't as inaccurate as the comment says, the Vulkan documentation
even seems to suggest this is the same. Let's drop the comment.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 12:07:49 +0000 (14:07 +0200)]
zink: avoid texelFetch until it's implemented
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 12:06:22 +0000 (14:06 +0200)]
zink: set ExecutionModeDepthReplacing when depth is written
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 12:05:41 +0000 (14:05 +0200)]
zink: fixup: save rasterizer
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 10:16:25 +0000 (12:16 +0200)]
zink: ensure layout is reasonable before copying
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 10:03:08 +0000 (12:03 +0200)]
zink/spirv: debug-print unknown varying slots
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 15 Jul 2019 10:02:31 +0000 (12:02 +0200)]
zink/spirv: be a bit more strict with fragment-results
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 12 Jul 2019 10:58:49 +0000 (12:58 +0200)]
zink: wait for transfer when reading
TODO: this could really benefit from a separate transfer-queue, I think.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 12 Jul 2019 10:43:20 +0000 (12:43 +0200)]
zink: support more texturing
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 12 Jul 2019 10:06:51 +0000 (12:06 +0200)]
zink/spirv: correct opcode
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 12 Jul 2019 09:59:12 +0000 (11:59 +0200)]
zink: make sure imageExtent.depth is 1 for arrays
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 12 Jul 2019 09:40:12 +0000 (11:40 +0200)]
zink: stub resource_from_handle
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 12 Jul 2019 09:28:45 +0000 (11:28 +0200)]
zink: abort on submit-failure
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Fri, 12 Jul 2019 08:51:12 +0000 (10:51 +0200)]
zink: crash hard on unknown queries
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 11 Jul 2019 14:36:50 +0000 (16:36 +0200)]
zink: add more compares
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 11 Jul 2019 14:25:25 +0000 (16:25 +0200)]
zink: more converts
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 11 Jul 2019 14:23:52 +0000 (16:23 +0200)]
zink: more comparison-ops
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 11 Jul 2019 12:47:20 +0000 (14:47 +0200)]
zink: implement ineg
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 11 Jul 2019 12:46:20 +0000 (14:46 +0200)]
zink: add shift ops
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 11 Jul 2019 12:43:32 +0000 (14:43 +0200)]
zink: add division ops
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 11 Jul 2019 12:31:42 +0000 (14:31 +0200)]
zink: add some opcodes
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 11 Jul 2019 12:22:59 +0000 (14:22 +0200)]
zink: clean up opcode-emitting a bit
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 11 Jul 2019 12:09:15 +0000 (14:09 +0200)]
zink: process one aspect-mask bit at the time
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 10 Jul 2019 15:30:12 +0000 (17:30 +0200)]
zink: save all supported util_blitter states
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 10 Jul 2019 15:19:39 +0000 (17:19 +0200)]
zink: save original scissor and viewport
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 10 Jul 2019 15:10:49 +0000 (17:10 +0200)]
zink: store sampler and image_view counts
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 10 Jul 2019 14:56:10 +0000 (16:56 +0200)]
zink: use pipe_stencil_ref instead of uint32_t-array
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 10 Jul 2019 14:33:27 +0000 (16:33 +0200)]
zink: document end-of-frame hack
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 10 Jul 2019 12:59:58 +0000 (14:59 +0200)]
zink: only consider format-desc if checking details
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Dave Airlie [Mon, 5 Nov 2018 02:41:37 +0000 (02:41 +0000)]
zink: attempt to get multisample resource creation right
Use the exposed vulkan limits to fill out supported formats.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Dave Airlie [Thu, 25 Oct 2018 02:02:15 +0000 (12:02 +1000)]
zink: add samples to rasterizer
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Dave Airlie [Mon, 22 Oct 2018 23:22:34 +0000 (09:22 +1000)]
zink: add sample mask support
This isn't really used yet, but may as well just fill it in.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 10 Jul 2019 12:11:56 +0000 (14:11 +0200)]
zink: refactor fence destruction
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 10 Jul 2019 10:46:30 +0000 (12:46 +0200)]
zink: drop unused argument
Because si.waitSemaphoreCount is 0, this won't even be looked at by the
driver, so let's just drop it.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Wed, 10 Jul 2019 10:40:01 +0000 (12:40 +0200)]
zink: cleanup zink_end_batch
This inlines submit_cmdbuf into zink_end_batch, the only place it's
used. This makes the code a bit more straight-forward to read.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 25 Jul 2019 12:06:53 +0000 (14:06 +0200)]
zink: request ucp-lowering
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 8 Jul 2019 13:17:28 +0000 (15:17 +0200)]
zink: do not lower io
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 8 Jul 2019 11:34:13 +0000 (13:34 +0200)]
zink/spirv: rename vec_type
These aren't guaranteed to be vectors, they can also be scalars. The
var-part is the significant part here, not the vector-ness. So let's
rename these.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 8 Jul 2019 11:22:01 +0000 (13:22 +0200)]
zink/spirv: var -> regs
These track nir-registers, so it's clearer if we refer to them by that
name instead. There's potentially more vars than these.
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Dave Airlie [Wed, 3 Oct 2018 05:25:09 +0000 (06:25 +0100)]
zink: add support for compressed formats
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Thu, 25 Jul 2019 12:09:52 +0000 (14:09 +0200)]
zink: request alpha-test lowering
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 24 Jun 2019 16:56:23 +0000 (18:56 +0200)]
zink: pool descriptors per batch
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 24 Jun 2019 16:23:38 +0000 (18:23 +0200)]
zink: reuse constants
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 24 Jun 2019 16:23:13 +0000 (18:23 +0200)]
zink: fix off-by-one in assert
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Erik Faye-Lund [Mon, 24 Jun 2019 09:54:30 +0000 (11:54 +0200)]
zink: squashme: trade cplusplus wrapper for header-guard
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
projects / mesa.git / log