OSDN Git Service
Jason Ekstrand [Sat, 27 Oct 2018 03:18:41 +0000 (22:18 -0500)]
iris/compute: Don't increment the grid size offset
It may be in the dynamic state buffer but the fact that we have a
resource takes care of that. We don't need to add in the address of
the dynamic state buffer again.
Kenneth Graunke [Wed, 24 Oct 2018 21:45:00 +0000 (14:45 -0700)]
iris: SO_DECL_LIST fix
Kenneth Graunke [Wed, 24 Oct 2018 21:16:38 +0000 (14:16 -0700)]
iris: Fall back to 1x1x1 null surface if no framebuffer supplied
If the state tracker never gave us the framebuffer dimensions via
a set_framebuffer_state() call, just fall back to the unbound texture
null surface, which is 1x1x1. Otherwise we'd use a NULL resource
(no pun intended).
Kenneth Graunke [Tue, 23 Oct 2018 08:36:26 +0000 (01:36 -0700)]
iris: Fix off by one in scissoring, empty scissors, default scissors
Kenneth Graunke [Mon, 22 Oct 2018 22:55:54 +0000 (15:55 -0700)]
iris: Move snapshots_landed to the front.
Transform feedback overflow queries need to write additional data,
and it would be nice to have this field remain at a consistent offset.
Kenneth Graunke [Mon, 22 Oct 2018 21:35:33 +0000 (14:35 -0700)]
iris: Clamp UBO and SSBO access to the actual BO size, for safety
Kenneth Graunke [Mon, 22 Oct 2018 21:28:54 +0000 (14:28 -0700)]
iris: Fix texture buffer / image buffer sizes.
Also fix image buffers with offsets.
Kenneth Graunke [Mon, 22 Oct 2018 21:06:04 +0000 (14:06 -0700)]
iris: fix SF_CLIP_VIEWPORT array indexing with multiple VPs
fixes bunches of viewport stuffs
Kenneth Graunke [Mon, 22 Oct 2018 00:43:32 +0000 (17:43 -0700)]
iris: flag CC_VIEWPORT when changing num viewports
this also has a loop over num_viewports
Kenneth Graunke [Sun, 21 Oct 2018 22:14:02 +0000 (15:14 -0700)]
iris: fix UBOs with bindings that have an offset
Kenneth Graunke [Fri, 19 Oct 2018 09:12:29 +0000 (02:12 -0700)]
iris: try and avoid pointless compute submissions
if apps don't use compute shaders, we don't even want to kick off the
compute initialization batch
Kenneth Graunke [Fri, 19 Oct 2018 09:11:11 +0000 (02:11 -0700)]
iris: fix SBA flushing by refactoring code
Kenneth Graunke [Fri, 19 Oct 2018 09:00:13 +0000 (02:00 -0700)]
iris: do PIPELINE_SELECT for render engine, add flushes, GLK hacks
Kenneth Graunke [Fri, 19 Oct 2018 08:40:06 +0000 (01:40 -0700)]
iris: hack to avoid memorybarriers out the wazoo
we don't want to emit piles of pipe controls to a compute batch if
it isn't necessary...
prevents double-batch-wraps in cs-op-selection-bool-bvec4-bvec4
(but it's still kinda a big ol' hack...)
Kenneth Graunke [Fri, 19 Oct 2018 08:31:56 +0000 (01:31 -0700)]
iris: don't let render/compute contexts stomp each other's dirty bits
only clear what you process
Kenneth Graunke [Fri, 19 Oct 2018 08:29:05 +0000 (01:29 -0700)]
iris: better dirty checking
Kenneth Graunke [Fri, 19 Oct 2018 08:14:38 +0000 (01:14 -0700)]
iris: rewrite grid surface handling
now we only upload a new grid when it's actually changed, which saves us
from having to emit a new binding table every time it changes.
this also moves a bunch of non-gen-specific stuff out of iris_state.c
Kenneth Graunke [Fri, 19 Oct 2018 05:38:32 +0000 (22:38 -0700)]
iris: XXX for compute state tracking :/
Maybe we should just move dirty to batch, it would help with the
reset stuff too
Kenneth Graunke [Fri, 19 Oct 2018 05:32:50 +0000 (22:32 -0700)]
iris: fix whitespace
Kenneth Graunke [Fri, 19 Oct 2018 04:26:06 +0000 (21:26 -0700)]
iris: bail if SLM is needed
Kenneth Graunke [Fri, 19 Oct 2018 04:15:02 +0000 (21:15 -0700)]
iris: leave XXX about unnecessary binding table uploads
Kenneth Graunke [Fri, 19 Oct 2018 03:04:33 +0000 (20:04 -0700)]
iris: drop unnecessary #ifdefs
Kenneth Graunke [Mon, 15 Oct 2018 02:05:31 +0000 (19:05 -0700)]
iris: drop XXX that Jordan handled
Jordan Justen [Fri, 21 Sep 2018 09:28:44 +0000 (02:28 -0700)]
iris/compute: Support indirect compute dispatch
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Jordan Justen [Tue, 18 Sep 2018 23:24:13 +0000 (16:24 -0700)]
iris/compute: Push subgroup-id
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Jordan Justen [Tue, 18 Sep 2018 22:08:44 +0000 (15:08 -0700)]
iris/compute: Flush compute batch on memory-barriers
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Jordan Justen [Sun, 23 Sep 2018 22:25:10 +0000 (15:25 -0700)]
iris/compute: Provide binding table entry for gl_NumWorkGroups
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Jordan Justen [Tue, 18 Sep 2018 22:04:14 +0000 (15:04 -0700)]
iris/compute: Wait on compute batch when mapping
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Jordan Justen [Tue, 18 Sep 2018 21:23:58 +0000 (14:23 -0700)]
iris/program: Don't try to push ubo ranges for compute
We only can push constants for compute shaders from one range.
Gallium glsl-to-nir (src/mesa/state_tracker/st_glsl_to_nir.cpp) lowers
all uniform accesses to a ubo.
Unfortunately we also load the subgroup-id as a uniform in the
compiler. Since we use the 1 push range for this subgroup-id, we then
lose the ability to actually push the ubo with all the normal user
uniform values.
In other words, there is lots of room for performance improvement, but
at least retrieving the uniforms as pull-constants is functional for
now.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Jordan Justen [Tue, 18 Sep 2018 20:04:59 +0000 (13:04 -0700)]
iris/compute: Get group counts from grid->grid
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Jordan Justen [Thu, 13 Sep 2018 18:42:29 +0000 (11:42 -0700)]
iris/compute: Flush compute batches
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Jordan Justen [Sun, 23 Sep 2018 22:09:55 +0000 (15:09 -0700)]
iris/compute: Add MEDIA_STATE_FLUSH following WALKER
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Jordan Justen [Wed, 19 Sep 2018 19:25:18 +0000 (12:25 -0700)]
iris: Add iris_restore_compute_saved_bos
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Jordan Justen [Wed, 19 Sep 2018 19:24:09 +0000 (12:24 -0700)]
iris: Add IRIS_DIRTY_CONSTANTS_CS
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Jordan Justen [Thu, 13 Sep 2018 18:40:10 +0000 (11:40 -0700)]
iris/compute: Set mask bits on PIPELINE_SELECT
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Kenneth Graunke [Fri, 27 Jul 2018 04:59:20 +0000 (21:59 -0700)]
iris: little bits of compute basics
Kenneth Graunke [Tue, 16 Oct 2018 02:25:24 +0000 (19:25 -0700)]
iris: drop XXX's about swizzling
pretty sure this is unnecessary on modern HW
Kenneth Graunke [Tue, 16 Oct 2018 02:22:22 +0000 (19:22 -0700)]
iris: drop dead format //'s
these just aren't supported
Kenneth Graunke [Tue, 16 Oct 2018 02:15:06 +0000 (19:15 -0700)]
iris: yes
Kenneth Graunke [Fri, 27 Jul 2018 06:13:51 +0000 (23:13 -0700)]
iris: initial compute caps
RET macro borrowed from freedreno
Kenneth Graunke [Mon, 15 Oct 2018 17:43:49 +0000 (10:43 -0700)]
iris: Enable fb fetch
needed for ES 3.2
Kenneth Graunke [Mon, 15 Oct 2018 16:51:54 +0000 (09:51 -0700)]
iris: advertise GL_ARB_shader_texture_image_samples
Jordan Justen [Tue, 18 Sep 2018 21:22:34 +0000 (14:22 -0700)]
iris: Set num_uniforms in bytes
Ref: brw_nir_lower_uniforms, type_size_scalar_bytes
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Kenneth Graunke [Thu, 11 Oct 2018 04:44:43 +0000 (21:44 -0700)]
iris: move images next to textures in binding table
Kenneth Graunke [Tue, 2 Oct 2018 17:21:57 +0000 (10:21 -0700)]
iris: null for non-existent cbufs
prevents BTs from being shifted down incorrectly
Kenneth Graunke [Tue, 2 Oct 2018 17:09:26 +0000 (10:09 -0700)]
iris: actually set image access
Jason Ekstrand [Tue, 2 Oct 2018 03:18:00 +0000 (22:18 -0500)]
iris: Don't lower image formats for write-only images
Kenneth Graunke [Fri, 14 Sep 2018 07:49:13 +0000 (00:49 -0700)]
iris: set image access correctly
Kenneth Graunke [Thu, 30 Aug 2018 22:49:32 +0000 (15:49 -0700)]
iris: bother with BTIs
Kenneth Graunke [Thu, 30 Aug 2018 22:45:36 +0000 (15:45 -0700)]
iris: implement set_shader_images hook
Kenneth Graunke [Thu, 30 Aug 2018 22:20:12 +0000 (15:20 -0700)]
iris: lower storage image derefs
Kenneth Graunke [Fri, 14 Sep 2018 21:18:13 +0000 (14:18 -0700)]
iris: set the binding table size
we weren't doing mark_surface_used on images (i965 does it while
uploading the unnecessary image uniforms), so our binding tables were
too small...
Kenneth Graunke [Tue, 9 Oct 2018 23:47:54 +0000 (16:47 -0700)]
iris: X32_S8X24 :/
This can happen when faking Z32_S8X24 and setting StencilSampling = true
I guess we'll just turn it into S8_UINT...
Fixes KHR-GL45.texture_swizzle.functional
Kenneth Graunke [Mon, 8 Oct 2018 03:50:19 +0000 (20:50 -0700)]
iris: enable I/L formats
Kenneth Graunke [Mon, 8 Oct 2018 03:47:21 +0000 (20:47 -0700)]
iris: Use R/RG instead of I/L/A when sampling
Kenneth Graunke [Mon, 8 Oct 2018 03:31:09 +0000 (20:31 -0700)]
iris: rework format translation apis
Kenneth Graunke [Mon, 8 Oct 2018 20:44:01 +0000 (13:44 -0700)]
iris: Allow PIPE_CONTROL with Stall at Scoreboard and RT flush
It's nonsensical, but not illegal, and mandatory on Icelake
Kenneth Graunke [Mon, 8 Oct 2018 13:26:15 +0000 (06:26 -0700)]
iris: add gen11 to genX_call
Kenneth Graunke [Sun, 7 Oct 2018 05:54:38 +0000 (22:54 -0700)]
iris: inline stage_from_pipe to avoid unused warnings
Kenneth Graunke [Sun, 7 Oct 2018 05:50:34 +0000 (22:50 -0700)]
iris: pipe to scs -> iris_pipe.h
Kenneth Graunke [Fri, 5 Oct 2018 22:25:53 +0000 (15:25 -0700)]
iris: force persample interp cap
Kenneth Graunke [Fri, 5 Oct 2018 02:49:06 +0000 (19:49 -0700)]
iris: stencil texturing
Kenneth Graunke [Fri, 5 Oct 2018 02:34:34 +0000 (19:34 -0700)]
iris: fix Z32_S8 depth sampling
We were accidentally using the ISL_FORMAT_R32_FLOAT_X8X24_TYPELESS
format, which is NOT what we use. We just store R32_FLOAT depth.
fixes Piglit's texwrap GL_ARB_depth_buffer_float
Kenneth Graunke [Wed, 3 Oct 2018 03:09:01 +0000 (20:09 -0700)]
iris: don't mark contains_draw = false when chaining batches
chaining to a new batch reuses create_batch(), but we don't need to do
the work of pinning BOs we inherit from a previous batch...when that is
actually part of the same execbuf invocation.
instead, just flag it when setting primary_batch_size = 0, in
iris_batch_reset
Kenneth Graunke [Wed, 3 Oct 2018 02:55:29 +0000 (19:55 -0700)]
iris: vma_free bo->size, not bo_size
this is more obviously correct. I think the two end up being the same
in practice, since this is in the alloc_from_cache case, and presumably
bo from the bucket has bo->size == bucket->size, and bo_size also is
bucket->size...
still. better to do the obvious thing.
brw_bufmgr already does it this way.
Kenneth Graunke [Tue, 2 Oct 2018 01:33:17 +0000 (18:33 -0700)]
iris: drop a bunch of pipe_sampler_state stuff we don't need
Kenneth Graunke [Sun, 30 Sep 2018 06:49:02 +0000 (08:49 +0200)]
iris: just mark snapshots_landed from the CPU
otherwise, get results may check q->map->snapshots_landed...before our
commands to initialize it to false have actually executed...so it'd get
some random garbage from the BO...
Kenneth Graunke [Sat, 29 Sep 2018 09:04:48 +0000 (11:04 +0200)]
iris: Enable ARB_shader_vote
The easiest get out the vote campaign ever
Kenneth Graunke [Sat, 29 Sep 2018 08:47:01 +0000 (10:47 +0200)]
iris: magic number 36 -> #define
Kenneth Graunke [Sat, 29 Sep 2018 08:43:00 +0000 (10:43 +0200)]
iris: better query file comment
Kenneth Graunke [Sat, 29 Sep 2018 08:41:44 +0000 (10:41 +0200)]
iris: early return properly
Kenneth Graunke [Sat, 29 Sep 2018 08:39:39 +0000 (10:39 +0200)]
iris: 36-bit overflow fixes
Kenneth Graunke [Fri, 28 Sep 2018 14:45:04 +0000 (16:45 +0200)]
iris: Need to | 1 when asking for timestamps
Kenneth Graunke [Fri, 28 Sep 2018 13:42:51 +0000 (15:42 +0200)]
iris: glGet timestamps, more correct timestamps
Kenneth Graunke [Fri, 28 Sep 2018 10:39:10 +0000 (12:39 +0200)]
iris: ...and SO prims emitted queries
looks like we have queries
some fails still due to races between snapshots_written and start/end
not being garbage...not sure what that's about
Kenneth Graunke [Fri, 28 Sep 2018 10:25:36 +0000 (12:25 +0200)]
iris: timestamps
Kenneth Graunke [Fri, 28 Sep 2018 10:09:19 +0000 (12:09 +0200)]
iris: drop explicit pinning
writes will already rw_bo or ro_bo that
Kenneth Graunke [Fri, 28 Sep 2018 10:07:54 +0000 (12:07 +0200)]
iris: primitives generated query support
Kenneth Graunke [Thu, 27 Sep 2018 12:36:31 +0000 (14:36 +0200)]
iris: pipeline stats
Kenneth Graunke [Thu, 27 Sep 2018 12:27:41 +0000 (14:27 +0200)]
iris: play chicken with timer queries for now
they have been crashy in the past and I don't want to risk tanking my
laptop right before my XDC talk
Kenneth Graunke [Thu, 27 Sep 2018 10:58:52 +0000 (12:58 +0200)]
iris: gpr0 to bool
I think OQ is basically working now.
Kenneth Graunke [Thu, 27 Sep 2018 10:50:26 +0000 (12:50 +0200)]
iris: fix random failures via CS stall...but why?
Kenneth Graunke [Thu, 27 Sep 2018 10:14:26 +0000 (12:14 +0200)]
iris: flush batch when asking for result via QBO
Kenneth Graunke [Thu, 27 Sep 2018 08:39:04 +0000 (10:39 +0200)]
iris: results write
Kenneth Graunke [Wed, 26 Sep 2018 10:51:44 +0000 (12:51 +0200)]
iris: gen10+ workarounds and break fix
Kenneth Graunke [Mon, 17 Sep 2018 23:37:26 +0000 (16:37 -0700)]
iris: initial query code
Kenneth Graunke [Mon, 17 Sep 2018 23:37:26 +0000 (16:37 -0700)]
iris: LRM/SRM/SDI hooks
Kenneth Graunke [Tue, 18 Sep 2018 04:15:48 +0000 (21:15 -0700)]
iris: rw_bo for pipe controls
this is used for WRITE IMMEDIATE...
but maybe we don't want to for the workaround BO?
Kenneth Graunke [Fri, 21 Sep 2018 22:43:49 +0000 (15:43 -0700)]
iris: use 0 for TCS passthrough program string ID
the passthrough shader doesn't need a real program string ID - that's
basically used for ARB programs indicating total program source code
changes, or other pre-baked uniform changes, etc...none of which a
passthrough shader has...so we don't need a unique identifier to
distinguish them. We want to use a consistent value so we find
existing passthrough shaders in the cache.
Caio Marcelo de Oliveira Filho [Fri, 21 Sep 2018 19:22:34 +0000 (12:22 -0700)]
iris: Add support for TCS passthrough
If no TCS is provided, create a "passthrough" TCS that will take the
default values set in the API as constants and pass to the TES, along
with any other inputs it expects. The code to create the NIR shader
is the same as in i965.
Tested with
./piglit run -t 'tess' quick_shader r
and fixed a dozen crashes from that list.
Kenneth Graunke [Fri, 21 Sep 2018 00:27:47 +0000 (17:27 -0700)]
iris: inherit the index buffer properly
Kenneth Graunke [Thu, 20 Sep 2018 23:46:58 +0000 (16:46 -0700)]
iris: delete bogus comment
Caio asked what was wrong. There is nothing wrong. :)
Kenneth Graunke [Thu, 20 Sep 2018 22:35:14 +0000 (15:35 -0700)]
iris: properly re-pin stencil buffers
Kenneth Graunke [Thu, 20 Sep 2018 20:32:07 +0000 (13:32 -0700)]
iris: fix context restore of 3DSTATE_CONSTANT ranges
if clean we want to DO the pinning...not SKIP the pinning.
thanks to Jordan Justen for catching this!
Kenneth Graunke [Thu, 20 Sep 2018 18:12:27 +0000 (11:12 -0700)]
iris: silence const warning
not sure why this is labeled const, I'm pretty sure we are taking the
reference and owning this, so there's no particular reason we can't
change it. it certainly seems to be working for non-compute. and,
freedreno's ir3_shader.c seems to do this as well. still...gross :/
Kenneth Graunke [Fri, 27 Jul 2018 04:59:20 +0000 (21:59 -0700)]
iris: refactor program CSO stuff
Caio Marcelo de Oliveira Filho [Wed, 19 Sep 2018 17:17:23 +0000 (10:17 -0700)]
iris: Fix uses of gl_TessLevel*
The backend compiler expects the gl_TessLevel* variables to be mapped
as inputs instead of system values. Use the new PIPE_CAP to get this
behavior from GLSL compiler.
Tested with:
tests/spec/arb_tessellation_shader/execution/vs-tcs-tes-tessinner-tessouter-inputs-quads.shader_test
Kenneth Graunke [Tue, 18 Sep 2018 18:04:44 +0000 (11:04 -0700)]
iris: totally untested icelake support
Kenneth Graunke [Tue, 18 Sep 2018 18:07:16 +0000 (11:07 -0700)]
iris: initialize "don't suck" bits, as Ben likes to call them
Kenneth Graunke [Tue, 18 Sep 2018 18:04:24 +0000 (11:04 -0700)]
iris: refactor LRIs in context setup
we're going to have more of them, so reduce the boilerplate