Marek Olšák
678d568c7b
radeonsi: don't load PrimID in TES if it's not used
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
808c33f6f0
radeonsi: explain (non-)monolithic shaders
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
fc478248f3
radeonsi/gfx9: enable OpenGL 4.5
...
Tentatively enable it, expecting the scratch buffer support to be done before
the next Mesa release.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
ed9a51cd3b
radeonsi/gfx9: 2nd shader of merged shaders should hold a reference of the 1st
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
ef40937854
radeonsi: add reference counting for shader selectors
...
The 2nd shader of merged shaders should take a reference of the 1st shader.
The next commit will do that.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
6c15e15af4
radeonsi/gfx9: set VGT_VERTEX_REUSE for ES in ES-GS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
887ef1de34
radeonsi/gfx9: set TES registers for merged ES-GS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
49cd0cbfd5
radeonsi/gfx9: disallow scratch buffer for LS-HS and ES-GS
...
not implemented yet
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
2857b14bba
radeonsi/gfx9: always compile monolithic ES-GS (asynchronously)
...
In addition to the non-monolithic variant.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
a82398a8f5
radeonsi/gfx9: add support for monolithic ES-GS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
6a9c20fdd5
radeonsi/gfx9: make sure the 1st shader's main part exists for merged shaders
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
7df682c291
radeonsi/gfx9: select shader parts for non-monolithic ES-GS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
cd99c442c4
radeonsi/gfx9: add GS prolog support for merged ES-GS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
e0570bc283
radeonsi/gfx9: add VS prolog support for merged ES-GS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
6b93452b24
radeonsi/gfx9: pass GS input SGPRs and VGPRs from the ES part to GS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
37e22ab65e
radeonsi/gfx9: store ES outputs to LDS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
d616c57342
radeonsi/gfx9: load GS inputs from LDS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
fc781fa0ab
radeonsi/gfx9: get GS wave ID from the correct input
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
bcaf905129
radeonsi/gfx9: add the function signature of merged ES-GS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
8b220877ad
radeonsi/gfx9: set registers and shader key for merged ES-GS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
ab197ad8d1
radeonsi/gfx9: add GS user SGPRs
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
b2f5d03152
radeonsi: rename declare_tess_lds -> declare_lds_as_pointer
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
e3caa1cd36
radeonsi: simplify some shader type conditions
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
021e65640e
radeonsi: rename the swizzle parameter of lds_store
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
dcea7e5d19
radeonsi: add si_shader::prolog2
...
For a GS prolog in merged ES-GS.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
eb35238ffe
radeonsi/gfx9: move RW_BUFFERS to s[0:1] for merged shaders
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
0af00f179e
radeonsi/gfx9: add support for monolithic merged LS-HS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
0d6d25475d
radeonsi/gfx9: set EXEC for non-mono merged shaders, add a barrier between them
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
a84a6feac9
radeonsi/gfx9: don't store the HS control word
...
GFX9 doesn't have it.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
1d90ecd3a5
radeonsi/gfx9: pass inputs from LS to TCS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
cbd1bc2e3e
radeonsi/gfx9: add TCS epilog support for merged LS-HS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
f11ced475e
radeonsi/gfx9: add VS prolog support for merged LS-HS
...
HS input VGPRs must be reserved.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
82a0e4f658
radeonsi/gfx9: merged shaders have scratch offset at the beginning
...
also, screen wasn't initialized for compute shaders
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
0c253557b2
radeonsi/gfx9: define LS-HS main shader function prototype
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
852ea69a2d
radeonsi: assign VS/TCS/TES/GS shader input parameter locations dynamically
...
They will vary with merged stages.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
067dacd1b1
radeonsi/gfx9: define and set LS-HS user SGPRs
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
0588146cb0
radeonsi/gfx9: set up shader registers for merged LS-HS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
62abdb17bb
radeonsi/gfx9: add initial code generation for non-monolithic merged LS-HS
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
c73d9bd643
radeonsi: separate out code for selecting the VS prolog
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
a98c9ba580
radeonsi/gfx9: add si_shader::previous_stage for merged shaders
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
cfb0798bb3
radeonsi/gfx9: enlarge num_input_sgprs in shader keys due to higher hw limit
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
4ab36e0ebc
radeonsi/gfx9: update the summary of shader stage configs
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
9d6ed572d9
radeonsi: adjust the signature of si_get_vs_prolog_key
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
b1ed3ffc56
radeonsi: separate out VS prolog key generation
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
e4542f00ce
radeonsi: separate out VS prolog key printing
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
983d7e743e
radeonsi: code shuffling in si_emit_derived_tess_state
...
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
130e198c49
radeonsi: separate out TGSI initialization of si_shader_context
...
so that we can put multiple different TGSI shaders into one module.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:47:35 +02:00
Marek Olšák
c3f37e9b50
st/mesa: use min_index and max_index directly from vbo
...
also remove the incorrect comment about primitive restart.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:46:44 +02:00
Marek Olšák
53cd67859d
vbo: set min_index = 0 so gallium can use the value directly
...
We could also remove index_bounds_valid and use max_index != ~0 instead.
Opinions on that are welcome.
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
2017-04-28 21:46:44 +02:00
Matt Turner
ee70937d15
Revert "glsl: reject image qualifiers with non-image types inside uniform blocks"
...
This reverts commit 24011ead71 .
This causes lots of ES 3.1 CTS tests to fail to compile a bit of code
like:
layout(binding = 0) buffer InOut
{
highp uint inputValues[384];
highp uint outputValues[384];
coherent highp uint groupValues[64]; <-----
} sb_inout;
error: memory qualifiers may only be applied to images
2017-04-28 12:31:20 -07:00