platform/upstream/mesa.git
7 years agoradv: flush smem for uniform buffer bit.
Dave Airlie [Wed, 21 Dec 2016 22:09:46 +0000 (22:09 +0000)]
radv: flush smem for uniform buffer bit.

(cc'ing stable as I'd like to backport the ubo speedup as well)

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Cc: "13.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
7 years agoradeonsi: add Polaris12 PCI ID
Junwei Zhang [Thu, 4 Aug 2016 05:08:40 +0000 (13:08 +0800)]
radeonsi: add Polaris12 PCI ID

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
7 years agoradeonsi: add Polaris12 support (v3)
Junwei Zhang [Mon, 19 Dec 2016 18:51:25 +0000 (13:51 -0500)]
radeonsi: add Polaris12 support (v3)

v2: use gfxip names for llvm 4.0+
v3: use tonga for llvm <= 3.8, drop gfxip name,
we can just change that we change the other asics.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
7 years agoglsl: Eliminate the open-coded version of process_block_array_leaf
Ian Romanick [Mon, 19 Dec 2016 23:06:41 +0000 (15:06 -0800)]
glsl: Eliminate the open-coded version of process_block_array_leaf

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
7 years agottn: handle GLSL_SAMPLER_DIM_SUBPASS_MS case
Juan A. Suarez Romero [Thu, 24 Nov 2016 12:25:27 +0000 (13:25 +0100)]
ttn: handle GLSL_SAMPLER_DIM_SUBPASS_MS case

Fixes a warning.

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
7 years agoi965: allow unsourced enabled VAO
Juan A. Suarez Romero [Thu, 3 Nov 2016 07:56:23 +0000 (08:56 +0100)]
i965: allow unsourced enabled VAO

The GL 4.5 spec says:
    "If any enabled array’s buffer binding is zero when DrawArrays
    or one of the other drawing commands defined in section 10.4 is
    called, the result is undefined."

This commits avoids crashing the code, which is not a very good
"undefined result".

This fixes spec/!opengl 3.1/vao-broken-attrib piglit test.

7 years agosvga: Fix a strict-aliasing violation in shader dumper
Edward O'Callaghan [Tue, 6 Dec 2016 00:28:56 +0000 (11:28 +1100)]
svga: Fix a strict-aliasing violation in shader dumper

As per the C spec, it is illegal to alias pointers to different
types. This results in undefined behaviour after optimization
passes, resulting in very subtle bugs that happen only on a
full moon..

Use a memcpy() as a well defined coercion between the isomorphic
bit-field interpretations of memory.

V.2: Use C99 compat STATIC_ASSERT() over C11 static_assert().

Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
7 years agodraw: use SoA fetch, not AoS one
Roland Scheidegger [Wed, 21 Dec 2016 03:43:07 +0000 (04:43 +0100)]
draw: use SoA fetch, not AoS one

Now that there's some SoA fetch which never falls back, we should always get
results which are better or at least not worse (something like rgba32f will
stay the same).

For cases which get way better, think something like R16_UNORM with 8-wide
vectors: this was 8 sign-extend fetches, 8 cvt, 8 muls, followed by
a couple of shuffles to stitch things together (if it is smart enough,
6 unpacks) and then a (8-wide) transpose (not sure if llvm could even
optimize the shuffles + transpose, since the 16bit values were actually
sign-extended to 128bit before being cast to a float vec, so that would be
another 8 unpacks). Now that is just 8 fetches (directly inserted into
vector, albeit there's one 128bit insert needed), 1 cvt, 1 mul.

v2: ditch the old AoS code instead of just disabling it.

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
7 years agogallivm: generalize the compressed format soa fetch a bit
Roland Scheidegger [Wed, 21 Dec 2016 03:30:02 +0000 (04:30 +0100)]
gallivm: generalize the compressed format soa fetch a bit

This can now handle rgtc (unorm) too - this path no longer handles plain
formats, but that's unnecessary they now all have their proper SoA unpack
(this will still be dog-slow though due to the actual fetch being per-pixel
util fallbacks).

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
7 years agogallivm: provide soa fetch path handling formats with more than 32bit
Roland Scheidegger [Sun, 11 Dec 2016 22:41:07 +0000 (23:41 +0100)]
gallivm: provide soa fetch path handling formats with more than 32bit

This previously always fell back to AoS conversion. Even for 4-float formats
(which is the optimal case by far for that fallback case) this was suboptimal,
since it meant the conversion couldn't be done with 256bit vectors. While this
may still only be partly possible for some formats, (unless there's AVX2
support) at least the transpose can be done with half the unpacks
(and before using the transpose for AoS fallbacks, it was worse still).
With less than 4 channels, things got way worse with the AoS fallback
quickly even with 128bit vectors.
The strategy is pretty much the same as the existing one for formats
which fit into 32 bits, except there's now multiple vectors to be
fetched (2 or 4 to be exact), which need to be shuffled first (if it's 4
vectors, this amounts to a transpose, for 2 it's a bit different),
then the unpack is done the same (with the exception that the shift
of the channels is now modulo 32, and we need to select the right
vector).
In fact the most complex part about it is to get the shuffles right
for separating into lo/hi parts for AVX/AVX2...
This also makes use of the new ability of gather to use provided type
information, which we abuse to outsmart llvm so we get decent shuffles,
and to fetch 3x32bit vectors without having to ZExt the scalar.
And just because we can, we handle double formats too, albeit they are
a bit different (draw sometimes needs to handle that).
v2: fix typo float/int bug (generating inefficient code).

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
7 years agogallivm: optimize gather a bit, by using supplied destination type
Roland Scheidegger [Sun, 11 Dec 2016 22:39:22 +0000 (23:39 +0100)]
gallivm: optimize gather a bit, by using supplied destination type

By using a dst_type in the the gather interface, gather has some more
knowledge about how values should be fetched.
E.g. if this is a 3x32bit fetch and dst_type is 4x32bit vector gather
will no longer do a ZExt with a 96bit scalar value to 128bit, but
just fetch the 96bit as 3x32bit vector (this is still going to be
2 loads of course, but the loads can be done directly to simd vector
that way).
Also, we can now do some try to use the right int/float type. This should
make no difference really since there's typically no domain transition
penalties for such simd loads, however it actually makes a difference
since llvm will use different shuffle lowering afterwards so the caller
can use this to trick llvm into using sane shuffle afterwards (and yes
llvm is really stupid there - nothing against using the shuffle
instruction from the correct domain, but not at the cost of doing 3 times
more shuffles, the case which actually matters is refusal to use shufps
for integer values).
Also do some attempt to avoid things which look great on paper but llvm
doesn't really handle (e.g. fetching 3-element 8 bit and 16 bit vectors
which is simply disastrous - I suspect type legalizer is to blame trying
to extend these vectors to 128bit types somehow, so fetching these with
scalars like before which is suboptimal due to the ZExt).

Remove the ability for truncation (no point, this is gather, not conversion)
as it is complex enough already.

While here also implement not just the float, but also the 64bit avx2
gathers (disabled though since based on the theoretical numbers the benefit
just isn't there at all until Skylake at least).

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
7 years agogallivm: optimize SoA AoS fallback fetch path a little
Roland Scheidegger [Wed, 21 Dec 2016 03:23:55 +0000 (04:23 +0100)]
gallivm: optimize SoA AoS fallback fetch path a little

We should do transpose, not extract/insert, at least with "sufficient" amount
of channels (for 4 channels, extract/insert shuffles generated otherwise look
truly terrifying). Albeit we shouldn't fallback to that so often in any case.
v2: ditch the extract/insert path, not worth keeping (we're going to avoid
hitting the fallback that often with future patches).

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
7 years agogallivm: (trivial) handle non-aligned fetch for lp_build_fetch_rgba_soa
Roland Scheidegger [Sun, 11 Dec 2016 22:37:30 +0000 (23:37 +0100)]
gallivm: (trivial) handle non-aligned fetch for lp_build_fetch_rgba_soa

soa fetch so far always assumed that data was aligned. However, we want to
use this for vertex fetch, and data might not be aligned there, so handle
it in this path too (basically just pass through alignment through to other
functions). (It looks like it wouldn't work for for cached s3tc but this is
no different than with AoS fetch.)

Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
7 years agost/nine: Upload on secondary context for Draw*Up
Axel Davy [Sun, 18 Dec 2016 18:21:08 +0000 (19:21 +0100)]
st/nine: Upload on secondary context for Draw*Up

Avoid synchronization by using the secondary context
for uploading the vertex data for Draw*Up.

v2: Rely on u_upload_mgr to use persistent coherent
buffers. Do not flush.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Dirty MANAGED buffers at Lock time
Axel Davy [Tue, 13 Dec 2016 00:16:21 +0000 (01:16 +0100)]
st/nine: Dirty MANAGED buffers at Lock time

Tests suggest MANAGED buffers are made dirty
at Lock time, not at Unlock time.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Implement new buffer upload path
Axel Davy [Sun, 4 Dec 2016 19:34:59 +0000 (20:34 +0100)]
st/nine: Implement new buffer upload path

This new buffer upload path enables to lock
faster than the normal path when using
DISCARD/NOOVERWRITE.

v2: Diverse cleanups and fixes.
v3: Fix allocation size for 'lone' buffers and
add more debug info.
v4: Rewrite of the path to handle when DISCARD/NOOVERWRITE
is not used anymore. The resource content is copied to the
new resource used.
v5: flush for safety after unmap (not sure it is really required
here, but safer to flush).
v6: Do not use the path if persistent coherent mapping is unavailable.
Fix buffer creation flags.
v7: Do not flush since it is not needed.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Allow non-zero resource offset for vertex buffers
Axel Davy [Sun, 4 Dec 2016 18:23:11 +0000 (19:23 +0100)]
st/nine: Allow non-zero resource offset for vertex buffers

Next patches will introduce an offset.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Do not wait for DEFAULT lock for volumes when we can
Axel Davy [Sun, 4 Dec 2016 09:34:34 +0000 (10:34 +0100)]
st/nine: Do not wait for DEFAULT lock for volumes when we can

If the volumes (and the texture container) are not referenced,
then they are no pending operations on them. We can lock directly.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Do not wait for DEFAULT lock for surfaces when we can
Axel Davy [Sun, 4 Dec 2016 09:33:19 +0000 (10:33 +0100)]
st/nine: Do not wait for DEFAULT lock for surfaces when we can

If the surfaces (and the texture container) are not referenced,
then they are no pending operations on them. We can lock directly.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Add arguments to context's blit and copy_region
Axel Davy [Sun, 4 Dec 2016 09:32:01 +0000 (10:32 +0100)]
st/nine: Add arguments to context's blit and copy_region

The new arguments enable to reference the objects while
the function hasn't run.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Idem for nine_context_gen_mipmap
Axel Davy [Sun, 4 Dec 2016 00:13:25 +0000 (01:13 +0100)]
st/nine: Idem for nine_context_gen_mipmap

Will enable to use the bind count as an information for
whether the surface/volume is used in the worker thread.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Bind destination for surface/volume uploads
Axel Davy [Sun, 4 Dec 2016 00:10:34 +0000 (01:10 +0100)]
st/nine: Bind destination for surface/volume uploads

Will enable to use the bind count as an information for
whether the surface/volume is used in the worker thread.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Use nine_context_box_upload for volumes
Axel Davy [Sat, 3 Dec 2016 23:29:16 +0000 (00:29 +0100)]
st/nine: Use nine_context_box_upload for volumes

Use nine_context_box_upload for uploads:
. systemmem volume to default volume
. managed volume internal content to its resource.

Check the uploads are executed before any action
that can alter the data, that is LockBox and
volume destruction.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Fix leak with volume dtor
Axel Davy [Sun, 4 Dec 2016 23:12:52 +0000 (00:12 +0100)]
st/nine: Fix leak with volume dtor

The last level was not released.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Fix leak with cubetexture dtor
Axel Davy [Sun, 4 Dec 2016 23:12:07 +0000 (00:12 +0100)]
st/nine: Fix leak with cubetexture dtor

The last level was not released.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Use nine_context_box_upload for surfaces
Axel Davy [Sat, 3 Dec 2016 23:19:45 +0000 (00:19 +0100)]
st/nine: Use nine_context_box_upload for surfaces

Use nine_context_box_upload for uploads:
. systemmem surface to default surface
. managed surface internal content to its resource.

Check the uploads are executed before any action
that can alter the data, that is LockRect,
NineSurface9_CopyDefaultToMem and surface destruction.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Implement nine_context_box_upload
Axel Davy [Sat, 3 Dec 2016 22:18:30 +0000 (23:18 +0100)]
st/nine: Implement nine_context_box_upload

This function will be used for surface and volume uploads

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Use nine_context_gen_mipmap in BaseTexture9
Axel Davy [Sat, 3 Dec 2016 22:04:07 +0000 (23:04 +0100)]
st/nine: Use nine_context_gen_mipmap in BaseTexture9

Generate mipmaps in the worker thread.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Implement nine_context_gen_mipmap
Axel Davy [Sat, 3 Dec 2016 22:01:56 +0000 (23:01 +0100)]
st/nine: Implement nine_context_gen_mipmap

To offload mipmap generation as well.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Optimize managed buffer upload
Axel Davy [Thu, 1 Dec 2016 21:50:22 +0000 (22:50 +0100)]
st/nine: Optimize managed buffer upload

Do the upload in the other thread.

Usually managed buffers are used once per frame.
It is then very likely pending_upload is 0 at Lock
time.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Implement nine_context_range_upload
Axel Davy [Thu, 1 Dec 2016 21:44:06 +0000 (22:44 +0100)]
st/nine: Implement nine_context_range_upload

Will be used to upload buffers.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Do not bind the container if forward is false
Axel Davy [Sat, 3 Dec 2016 18:41:40 +0000 (19:41 +0100)]
st/nine: Do not bind the container if forward is false

This doesn't make sense to bind the container in that specific case.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Comment and simplify iunknown
Axel Davy [Sat, 3 Dec 2016 18:37:06 +0000 (19:37 +0100)]
st/nine: Comment and simplify iunknown

The behaviour is a bit less obscure now.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Detach buffers in swapchain dtor.
Axel Davy [Sat, 3 Dec 2016 17:58:00 +0000 (18:58 +0100)]
st/nine: Detach buffers in swapchain dtor.

BackBuffers can survive swapchain dtor if
the user has a reference on them.

The swapchain itself has no reference on the buffer.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Fix NineUnknown_Detach
Axel Davy [Sat, 3 Dec 2016 17:46:26 +0000 (18:46 +0100)]
st/nine: Fix NineUnknown_Detach

We don't bind the container in AddRef.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Simplify ARG_BIND_REF
Axel Davy [Sat, 3 Dec 2016 16:52:12 +0000 (17:52 +0100)]
st/nine: Simplify ARG_BIND_REF

Remove some noop operations.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Avoid flushing the queue for queries GetData
Axel Davy [Sun, 13 Nov 2016 15:28:33 +0000 (16:28 +0100)]
st/nine: Avoid flushing the queue for queries GetData

Use the newly introduced counter to know when we don't
need synchronization.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Add CSMT_NO_WAIT_WITH_COUNTER
Patrick Rudolph [Sun, 13 Nov 2016 14:41:58 +0000 (15:41 +0100)]
st/nine: Add CSMT_NO_WAIT_WITH_COUNTER

Similar to the other macros, but introduces a counter,
which enables to know when the instructions has been
executed.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
7 years agost/nine: Use nine_context_clear_render_target
Axel Davy [Sun, 13 Nov 2016 11:47:58 +0000 (12:47 +0100)]
st/nine: Use nine_context_clear_render_target

Enables to not wait for the worker thread for ColorFill.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Optimize ColorFill
Axel Davy [Sun, 13 Nov 2016 11:41:53 +0000 (12:41 +0100)]
st/nine: Optimize ColorFill

When we lock the whole surface to overwrite it, we can use DISCARD.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Simplify ColorFill
Axel Davy [Sun, 13 Nov 2016 11:40:10 +0000 (12:40 +0100)]
st/nine: Simplify ColorFill

For render targets, NineSurface9_GetSurface is not
expected to fail.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: use get_pipe_acquire/release when possible
Axel Davy [Sat, 12 Nov 2016 22:36:35 +0000 (23:36 +0100)]
st/nine: use get_pipe_acquire/release when possible

Use the acquire/release semantic when we don't need
to wait for any pending command.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Implement Fast path for dynamic buffers and csmt
Axel Davy [Thu, 3 Nov 2016 22:37:46 +0000 (23:37 +0100)]
st/nine: Implement Fast path for dynamic buffers and csmt

Use the secondary pipe for DISCARD/NOOVERWRITE, which
avoids stalling to get the pipe from the worker thread.

v2: flush at unmap. This is required for example if
the driver does hidden draw calls or copies. In the case
of unsynchronized it is probably not required, but
it is more safe.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Add secondary pipe for device
Axel Davy [Thu, 3 Nov 2016 21:12:01 +0000 (22:12 +0100)]
st/nine: Add secondary pipe for device

The secondary pipe will be used for operations
that don't need synchronization.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Add nine_context_get_pipe_acquire/release
Axel Davy [Sat, 12 Nov 2016 21:24:04 +0000 (22:24 +0100)]
st/nine: Add nine_context_get_pipe_acquire/release

See commit for description.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: SYSTEMMEM ignores DISCARD.
Axel Davy [Tue, 13 Dec 2016 00:10:15 +0000 (01:10 +0100)]
st/nine: SYSTEMMEM ignores DISCARD.

Tests show SYSTEMMEM should ignore DISCARD.

Prevents game bugs with following patches reimplementing
DISCARD. Halo is affected.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Upload Managed buffers just before draw call using them
Axel Davy [Sun, 6 Nov 2016 11:38:38 +0000 (12:38 +0100)]
st/nine: Upload Managed buffers just before draw call using them

Previously we were uploading Managed buffers at the next draw call
after they were set dirty.
This is not the expected behaviour. Instead upload just before
draw call needing the content.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Track bindings for buffers
Axel Davy [Thu, 3 Nov 2016 20:53:53 +0000 (21:53 +0100)]
st/nine: Track bindings for buffers

Similar code than for textures.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Fix BASETEX_REGISTER_UPDATE
Axel Davy [Sun, 6 Nov 2016 11:06:22 +0000 (12:06 +0100)]
st/nine: Fix BASETEX_REGISTER_UPDATE

BASETEX_REGISTER_UPDATE was adding the texture to the list
of textures to upload in too many cases. tex->base.base.bind
will be set to true if the texture is in a stateblock, whereas
we want to upload only if bound to the device, which is
what bind_count is for.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Simplify the logic to bind textures
Axel Davy [Sun, 6 Nov 2016 11:05:50 +0000 (12:05 +0100)]
st/nine: Simplify the logic to bind textures

This makes the code more readable.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Use nine_context for resource_copy_region
Patrick Rudolph [Wed, 2 Nov 2016 16:17:21 +0000 (17:17 +0100)]
st/nine: Use nine_context for resource_copy_region

Use nine_context wrapper for resource_copy_region.
Enables to offload it with CSMT.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
7 years agost/nine: Use nine_context for blit
Patrick Rudolph [Thu, 27 Oct 2016 05:39:03 +0000 (07:39 +0200)]
st/nine: Use nine_context for blit

Enables to offload it with CSMT.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
7 years agost/nine: Add NINE_DEBUG=tid to turn threadid on or off
Patrick Rudolph [Fri, 28 Oct 2016 16:04:10 +0000 (18:04 +0200)]
st/nine: Add NINE_DEBUG=tid to turn threadid on or off

To ease debugging.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
7 years agost/nine: Print threadid in debug log
Patrick Rudolph [Fri, 28 Oct 2016 15:54:18 +0000 (17:54 +0200)]
st/nine: Print threadid in debug log

To ease debugging.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
7 years agost/nine: Implement gallium nine CSMT
Patrick Rudolph [Wed, 26 Oct 2016 15:11:00 +0000 (17:11 +0200)]
st/nine: Implement gallium nine CSMT

Use an offloading thread for all nine_context functions.
Macros are used to ease the reading of the code.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Call GetPipe for implicit pipe usages
Axel Davy [Sun, 18 Dec 2016 09:59:53 +0000 (10:59 +0100)]
st/nine: Call GetPipe for implicit pipe usages

With csmt, every usage of the pipe in the main thread
has to be protected by calling GetPipe.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Add struct nine_clipplane
Patrick Rudolph [Tue, 25 Oct 2016 18:06:31 +0000 (20:06 +0200)]
st/nine: Add struct nine_clipplane

Required to know the size exact size of the plane.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
7 years agost/nine: Add nine_queue
Patrick Rudolph [Tue, 25 Oct 2016 16:03:44 +0000 (18:03 +0200)]
st/nine: Add nine_queue

This queue mechanism will be used for CSMT.

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
7 years agost/nine: Create pipe_surfaces on resource creation.
Axel Davy [Fri, 4 Nov 2016 21:39:14 +0000 (22:39 +0100)]
st/nine: Create pipe_surfaces on resource creation.

Create the pipe_surfaces on renderable resources creation.

This enables to avoid creating them on the fly.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back swvp in nine_context
Axel Davy [Tue, 1 Nov 2016 17:30:33 +0000 (18:30 +0100)]
st/nine: Back swvp in nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Change the way nine_shader gets the pipe
Axel Davy [Tue, 1 Nov 2016 17:23:05 +0000 (18:23 +0100)]
st/nine: Change the way nine_shader gets the pipe

The change is required with csmt, where depending on the thread
you don't access the pipe the same way.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Reimplement nine_context_apply_stateblock
Axel Davy [Tue, 1 Nov 2016 17:00:02 +0000 (18:00 +0100)]
st/nine: Reimplement nine_context_apply_stateblock

The new version uses nine_context functions instead of
applying the changes directly to nine_context.
This will enable it to work with CSMT.

v2: Fix nine_context_light_enable_stateblock
The memcpy arguments were wrong, and the state
wasn't set dirty.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Decompose nine_context_set_texture
Axel Davy [Tue, 1 Nov 2016 15:57:37 +0000 (16:57 +0100)]
st/nine: Decompose nine_context_set_texture

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Decompose nine_context_set_indices
Axel Davy [Tue, 1 Nov 2016 15:38:57 +0000 (16:38 +0100)]
st/nine: Decompose nine_context_set_indices

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Decompose nine_context_set_stream_source
Axel Davy [Wed, 26 Oct 2016 21:25:05 +0000 (23:25 +0200)]
st/nine: Decompose nine_context_set_stream_source

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Do not use NineBaseTexture9 in nine_context
Axel Davy [Mon, 31 Oct 2016 16:04:29 +0000 (17:04 +0100)]
st/nine: Do not use NineBaseTexture9 in nine_context

Some fields are subject to modification outside of nine_context
(SetLod, etc).

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Move Managed Pool handling out of nine_context
Axel Davy [Sun, 30 Oct 2016 14:00:48 +0000 (15:00 +0100)]
st/nine: Move Managed Pool handling out of nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Integrate nine_pipe_context_clear to nine_context_clear
Axel Davy [Fri, 28 Oct 2016 17:19:39 +0000 (19:19 +0200)]
st/nine: Integrate nine_pipe_context_clear to nine_context_clear

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Move pipe and cso to nine_context
Axel Davy [Fri, 28 Oct 2016 17:03:59 +0000 (19:03 +0200)]
st/nine: Move pipe and cso to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Rename pipe to pipe_data in nine_context
Axel Davy [Fri, 28 Oct 2016 17:05:31 +0000 (19:05 +0200)]
st/nine: Rename pipe to pipe_data in nine_context

This patch it to avoid name conflict when device->pipe
will be moved to nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Rename cso in nine_context to cso_shader
Axel Davy [Fri, 28 Oct 2016 16:54:52 +0000 (18:54 +0200)]
st/nine: Rename cso in nine_context to cso_shader

This patch it to avoid name conflict when device->cso
is moved to nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Access pipe_context via NineDevice9_GetPipe
Axel Davy [Thu, 27 Oct 2016 22:43:56 +0000 (00:43 +0200)]
st/nine: Access pipe_context via NineDevice9_GetPipe

Except for nine_ff and nine_state.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Remove NineDevice9_GetCSO
Axel Davy [Thu, 27 Oct 2016 21:36:39 +0000 (23:36 +0200)]
st/nine: Remove NineDevice9_GetCSO

Was useless. Remove useless usage in
swapchain9.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Move query9 pipe calls to nine_context
Axel Davy [Thu, 27 Oct 2016 20:52:53 +0000 (22:52 +0200)]
st/nine: Move query9 pipe calls to nine_context

This will enable to use threading for them.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Use atomics for nine_bind
Axel Davy [Wed, 26 Oct 2016 21:15:34 +0000 (23:15 +0200)]
st/nine: Use atomics for nine_bind

nine_bind didn't need atomics up to now,
because it's use what always within a protected
mutex. We need to use atomics because with the
next patches several threads may use nine_bind.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Track dirty state groups in nine_context
Axel Davy [Thu, 20 Oct 2016 20:10:34 +0000 (22:10 +0200)]
st/nine: Track dirty state groups in nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back User Clip Planes to nine_context
Axel Davy [Thu, 20 Oct 2016 19:59:01 +0000 (21:59 +0200)]
st/nine: Back User Clip Planes to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back ps to nine_context
Axel Davy [Thu, 20 Oct 2016 19:41:19 +0000 (21:41 +0200)]
st/nine: Back ps to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back ds to nine_context
Axel Davy [Thu, 20 Oct 2016 19:31:43 +0000 (21:31 +0200)]
st/nine: Back ds to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back all ff states in nine_context
Axel Davy [Wed, 19 Oct 2016 21:40:27 +0000 (23:40 +0200)]
st/nine: Back all ff states in nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Refactor LightEnable
Axel Davy [Wed, 19 Oct 2016 21:36:50 +0000 (23:36 +0200)]
st/nine: Refactor LightEnable

Call a helper function.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Refactor SetLight
Axel Davy [Wed, 19 Oct 2016 21:29:58 +0000 (23:29 +0200)]
st/nine: Refactor SetLight

Call a helper function to set the light.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Put ff data in a separate structure
Axel Davy [Wed, 19 Oct 2016 21:06:05 +0000 (23:06 +0200)]
st/nine: Put ff data in a separate structure

And make nine_state_access_transform take this
new structure as input.
Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back viewport to nine_context
Axel Davy [Wed, 19 Oct 2016 19:57:52 +0000 (21:57 +0200)]
st/nine: Back viewport to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back scissor to nine_context
Axel Davy [Wed, 19 Oct 2016 19:47:02 +0000 (21:47 +0200)]
st/nine: Back scissor to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back RT to nine_context
Axel Davy [Wed, 19 Oct 2016 19:38:47 +0000 (21:38 +0200)]
st/nine: Back RT to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back current index buffer to nine_context
Axel Davy [Wed, 19 Oct 2016 18:41:40 +0000 (20:41 +0200)]
st/nine: Back current index buffer to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back all shader constants to nine_context
Axel Davy [Tue, 18 Oct 2016 20:43:53 +0000 (22:43 +0200)]
st/nine: Back all shader constants to nine_context

For device vs shader float constants and may_swvp,
the same tips than for the other constant types is
used.

Also memset the constants properly.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back sampler states to nine_context
Axel Davy [Tue, 18 Oct 2016 18:48:54 +0000 (20:48 +0200)]
st/nine: Back sampler states to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back vs to nine_context
Axel Davy [Mon, 17 Oct 2016 19:43:11 +0000 (21:43 +0200)]
st/nine: Back vs to nine_context

And move programmable_vs storage and computation.
Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back vdecl to nine_context
Axel Davy [Mon, 17 Oct 2016 19:18:42 +0000 (21:18 +0200)]
st/nine: Back vdecl to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Move stream freq data to nine_context
Axel Davy [Sun, 16 Oct 2016 17:16:31 +0000 (19:16 +0200)]
st/nine: Move stream freq data to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Move vtxbuf to nine_context
Axel Davy [Sun, 16 Oct 2016 16:17:27 +0000 (18:17 +0200)]
st/nine: Move vtxbuf to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Move stream_usage_mask to nine_context
Axel Davy [Sun, 16 Oct 2016 15:49:09 +0000 (17:49 +0200)]
st/nine: Move stream_usage_mask to nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Back textures into nine_context
Axel Davy [Sun, 16 Oct 2016 14:09:51 +0000 (16:09 +0200)]
st/nine: Back textures into nine_context

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Move texture setting to nine_context_*
Axel Davy [Sun, 16 Oct 2016 13:56:14 +0000 (15:56 +0200)]
st/nine: Move texture setting to nine_context_*

And move samplers_shadow to nine_context.
Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Track changed.texture only for stateblocks
Axel Davy [Sun, 16 Oct 2016 13:29:46 +0000 (15:29 +0200)]
st/nine: Track changed.texture only for stateblocks

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Move draw calls to nine_state
Axel Davy [Sun, 16 Oct 2016 09:34:35 +0000 (11:34 +0200)]
st/nine: Move draw calls to nine_state

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

v2: Release buffers for Draw*Up functions in device9.c,
instead of nine_context. This prevents a leak with csmt
where the wrong pointers were released.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Move core of device clear to nine_state
Axel Davy [Sat, 15 Oct 2016 11:52:04 +0000 (13:52 +0200)]
st/nine: Move core of device clear to nine_state

Part of the refactor to move all gallium calls to
nine_state.c, and have all internal states required
for those calls in nine_context.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
7 years agost/nine: Introduce nine_context
Axel Davy [Sat, 15 Oct 2016 11:17:52 +0000 (13:17 +0200)]
st/nine: Introduce nine_context

nine_context is a new structure which goal will be
to contain all internal states. It will be the states
of the second thread in the to-be-introduced CSMT mode.

This patch moves several internal states to nine_context,
while the next patches add the other fields.

Signed-off-by: Axel Davy <axel.davy@ens.fr>