AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,222 Commits 1 Branch 0 Tags
08d22bb908e161b15b12dd094f94de06ec0c883f
Commit Graph

124222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Airlie 9f8c7e232e llvmpipe: multisample sample mask + early/late depth pass 
Start adding support for multisample masks and the depth passes

The depth passes have to run per-sample, this isn't complete support
it adds the loops, and handles the execution masks.

One mask is stored per sample, they are combined post the early Z
pass into a single shader execution mask, and then the resulting
shader execution mask is anded back in for the late Z pass.

Init the vars to NULL to avoid gcc warnings

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie f12dac5e10 llvmpipe: move some fs code around 
this just moves the num_fs loop around for follow on refactors

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 5e949b16c1 llvmpipe: add per-sample depth/stencil test 
The current depth stencil test code has some optimisations using
the mask when there is only one depth value, multisample requires
per-sample zstencil testing, and for that case just pass in the
mask that needs updating.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie d297f2ecf1 llvmpipe: move getting mask value out of depth code. (v2) 
In order to add per-sample support to this code, the mask
value is needed not the value from the exec mask.

v2: update comment

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 18fd62a26e llvmpipe: add per-sample interpolation. 
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 8154bdf25b llvmpipe: add centroid interpolation support. 
This just adds the implementation and API to the interpolation builders.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 5697b9c00c llvmpipe: pass interp location into interpolation code. 
This just tracks the attribute interpolation location into the
interp code.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 339a3a4dea nir/tgsi: translate the interp location 
translate sample and centroid locations.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 28cc2ed79c gallivm: add mask api to force mask 
For per-sample shading the mask needs to be forced for each
iteration of the fragment shader.

Just adds the API for now.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie d89499063b gallivm: add sample id/pos intrinsic support 
The sample position is looked up in an incoming array using the
sample id.

(These are mostly for ARB_sample_shading support)

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 455c8e3584 llvmpipe: add cbuf/zsbuf + coverage samples to the fragment shader key. 
These will cause different fragment shaders to be generated.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie d2f488684a llvmpipe: change mask input to fragment shader to 64-bit. 
In order to handle a 4xMSAA mask (16-bits per sample) increase
the fragment shader API to be 64-bit.

v2: drop pointless if (Roland)

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 67ec1760ee llvmpipe: add multisample bit to fragment shader key. 
The fragment shader needs to be regenerated when multisample changes.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie f5463576b9 llvmpipe: plumb multisample state bit into setup code. 
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie e47d39aee1 llvmpipe/rast: fix tile clearing for multisample color and depth tiles 
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 01e9779c00 llvmpipe: record sample info for color/depth buffers in scene 
This adds the nr_samples + sample_stride to the scene records
for cbufs and zsbuf.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie a30db60ede llvmpipe: pass color and depth sample strides into fragment shader. 
This just adds the interface and passes the depth and sample strides
into the fragment shader, nothing uses them yet.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 24cf7a2b36 draw: disable point/line smoothing for multisample (v2) 
When MSAA is enabled smoothing is ignored

v2: As pointed out by Roland I got this completely wrong,
fix this to work the other way

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 4c72bb4a96 llvmpipe: handle multisample render target clears 
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 782271c0e1 llvmpipe: add clear texture support for multisample textures. 
This adds the clear paths for multisample textures.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie c8740cbf01 llvmpipe: add multisample resource copy region support. 
This allows direct copies of all samples between two resources.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 178df06821 llvmpipe: add internal multisample texture mapping path. 
For clearing and copying textures llvmpipe needs to internally
access the per-sample data.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie cab13f9174 llvmpipe: pass incoming sample_mask into fragment shader context. 
This links up the api changing the sample mask to passing it into
the fragment shader.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie c070af8511 llvmpipe/jit: pass fragment sample mask via jit context. 
The incoming sample mask for the fragment shader can be passed
via the jit context

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 0a6150251a llvmpipe: add get_sample_position support (v2) 
This just adds the sample values for 4xmsaa, and hooks them
up to the get_sample_position API

v2: move to vulkan standard sample positions

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie f6383673c9 llvmpipe: fix race between draw and setting fragment shader. 
There is a race with u_blitter shaders + pipeline shaders (aaline/aapoint)
where the draw bind can cause a pipeline flush which can use bind_fs_state to
 be reenters and llvmpipe->fs gets the wrong value. Fix this by only
setting the llvmpipe->fs value after the draw binding is complete.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 6befeb6607 gallium/util: split out zstencil clearing code. 
llvmpipe will want to reuse this for it's multisample clears.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie bcbe5b3d26 llvmpipe: add a max samples define set to 4. 
I doubt I'll care about much higher MSAA levels, so 4 it is.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 1b02eb1a4c llvmpipe: add multisample support to texture allocator. 
This adds a sample stride field and allocates enough memory for
each sample storage. Hook up the sample_stride field to draw
and jit textures and images

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 339aec7241 util: add a resource wrapper to get resource samples 
This return 1 as a baseline and should be used in allocator paths.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 1970390026 llvmpipe: add samples support to image jit 
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 2e5cddacf7 llvmpipe: add num_samples/sample_stride support to jit textures 
This adds the support for num_samples/sample_stride retrieval to the
jit texture infrastructure.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie bc3641d616 draw: add support for num_samples + sample_stride to the image paths 
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 026bf26599 draw: introduce sampler num samples + stride members 
This adds the num samples + sampler stride into the texture mapping paths,
currently drivers just pass 0 for now.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie 609a3bea16 gallivm/nir: add multisample image operations 
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie be8a10e265 gallivm/nir: add multisample support to image size 
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie ae95a08b9c gallivm/nir/tgsi: add multisample texture sampling. 
Both paths are required as u_blitter needs the TGSI path.

This just hooks the instructions up to the sampling code.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie eb5919d9d8 gallivm/sample: add multisample image operation support 
Just adds in the sample stride.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Dave Airlie c2545c9b15 gallivm/sample: add multisample support for texel fetch 
This adds a new callback to get the stride between the per-sample
images, adds a new value for the per-sample index to lookup,
and a flag to use multisampling.

gallivm/sample: add num samples interface for dynamic samplers

This will be used for getting number of samples in jit code.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
 2020-05-06 06:20:37 +00:00
Tomeu Vizoso b6a20804ad virgl: Properly check for encode_stride when encoding transfers 
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4763>
 2020-05-06 08:04:58 +02:00
Dave Airlie 99fce3a6d7 llvmpipe: simple texture barrier implementation. 
Just flush.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4774>
 2020-05-06 15:09:42 +10:00
Dave Airlie 870b6a6050 llvmpipo/nir: free compute shader NIR 
I forgot this in the last round.

Fixes: 18f896e55d (llvmpipe: add initial nir support)

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4899>
 2020-05-06 05:11:19 +10:00
Dave Airlie d1ad1be35a draw/tess: free tessellation control shader i/o memory. 
Fixes: 0d02a7b8ca (draw: add main tessellation code)

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4899>
 2020-05-06 05:11:07 +10:00
Rhys Perry a46aa3dc2e nir: add missing group_memory_barrier handling 
Totals from 2 (0.00% of 127638) affected shaders:
VGPRs: 164 -> 168 (+2.44%)
CodeSize: 18420 -> 18756 (+1.82%)
Instrs: 3658 -> 3700 (+1.15%)
Cycles: 82912 -> 83080 (+0.20%)
VMEM: 70 -> 69 (-1.43%)
PreVGPRs: 155 -> 168 (+8.39%)

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
CC: <mesa-stable@lists.freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4889>
 2020-05-05 18:34:02 +00:00
Eric Anholt 9a6bbf4c80 freedreno/ir3: Disable sin/cos range reduction for mediump. 
robclark noted that the blob wasn't doing range reduction in the mediump
case, and I confirmed it on
dEQP-GLES3.functional.shaders.operator.angle_and_trigonometry.sin.mediump_float_fragment
vs
dEQP-GLES3.functional.shaders.operator.angle_and_trigonometry.sin.highp_float_fragment.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4893>
 2020-05-05 17:23:34 +00:00
Axel Davy aac964af4a st/nine: Set correctly blend max_rt 
Currently nine_convert_blend_state has no way
of knowing the number of rts.
For now set to an upper bound.

Signed-off-by: Axel Davy <davyaxel0@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4891>
 2020-05-05 16:45:06 +00:00
Marek Olšák 0d83e7f4b9 radeonsi: enable TC-compatible HTILE on demand for best Z/S performance 
I haven't measured this, but it can only help.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4866>
 2020-05-05 16:27:29 +00:00
Marek Olšák 39571d384e radeonsi: allow tc_compatible_htile to be mutable 
Move the relevant code from si_init_depth_surface to
si_emit_framebuffer_state, so that it can be changed after a pipe_surface
is initialized.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4866>
 2020-05-05 16:27:29 +00:00
Marek Olšák 04085bedc2 radeonsi/gfx9: always use IMG_DATA_FORMAT_S8_32 for 8-bit stencil 
I wanna remove dependency on tc_compatible_htile from non-dynamic states.
This should be the same as 8_UINT if HTILE is disabled.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4866>
 2020-05-05 16:27:29 +00:00
Marek Olšák 345b8aed5c ac/surface: unset RADEON_SURF_TC_COMPATIBLE_HTILE if HTILE hasn't been computed 
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4866>
 2020-05-05 16:27:29 +00:00