Jason Ekstrand
22fdb2f855
nir/spirv: Update to the latest revision
2015-08-31 17:05:23 -07:00
Jason Ekstrand
ce70cae756
nir/builder: Use nir_after_instr to advance the cursor
...
This *should* ensure that the cursor gets properly advanced in all cases.
We had a problem before where, if the cursor was created using
nir_after_cf_node on a non-block cf_node, that would call nir_before_block
on the block following the cf node. Instructions would then get inserted
in backwards order at the top of the block which is not at all what you
would expect from nir_after_cf_node. By just resetting to after_instr, we
avoid all these problems.
2015-08-31 17:05:23 -07:00
Jason Ekstrand
24b0c53231
nir/intrinsics: Move to a two-dimensional binding model for UBO's
2015-08-31 17:05:23 -07:00
Jason Ekstrand
f4608bc530
nir/nir_variable: Add a descriptor set field
...
We need this for SPIR-V
2015-08-31 17:05:23 -07:00
Jason Ekstrand
85cf2385c5
mesa: Move gl_vert_attrib from mtypes.h to shader_enums.h
...
It is a shader enum after all...
2015-08-31 17:05:23 -07:00
Jason Ekstrand
de4f379a70
nir/cursor: Add a helper for getting the current block
2015-08-31 17:05:23 -07:00
Connor Abbott
024c49e95e
nir/builder: add a nir_fdot() convenience function
2015-08-31 17:05:23 -07:00
Jason Ekstrand
f6a0eff1ba
nir: Add a pass to lower outputs to temporary variables
...
This pass can be used as a helper for NIR producers so they don't have to
worry about creating the temporaries themselves.
2015-08-31 17:05:23 -07:00
Jason Ekstrand
4956bbaa33
nir/cursor: Add a constructor for the end of a block but before the jump
2015-08-31 16:58:20 -07:00
Connor Abbott
c62be38286
nir/types: add more nir_type_is_xxx() wrappers
2015-08-31 16:58:20 -07:00
Connor Abbott
a1e136711b
nir/types: add a helper to transpose a matrix type
2015-08-31 16:58:20 -07:00
Jason Ekstrand
756b00389c
nir/spirv: Don't assert that the current block is empty
...
It's possible that someone will give us SPIR-V code in which someone
needlessly branches to new blocks. We should handle that ok now.
2015-08-31 16:58:20 -07:00
Jason Ekstrand
fe220ebd37
nir/spirv: Add initial support for samplers
2015-08-31 16:58:20 -07:00
Jason Ekstrand
a992909aae
nir/spirv: Move Exp and Log to the list of currently unhandled ALU ops
...
NIR doesn't have the native opcodes for them anymore
2015-08-31 16:58:20 -07:00
Jason Ekstrand
45963c9c64
nir/types: Add support for sampler types
2015-08-31 16:58:20 -07:00
Jason Ekstrand
2887e68f36
nir/spirv: Make the global constants in spirv.h static
...
I've been promissed in a bug that this will be fixed in a future version of
the header. However, in the interest of my branch building, I'm adding
these changes in myself for the moment.
2015-08-31 16:58:20 -07:00
Jason Ekstrand
62b094a81c
nir/spirv: Handle jump-to-loop in a more general way
2015-08-31 16:58:20 -07:00
Jason Ekstrand
ca51d926fd
nir/spirv: Handle boolean uniforms correctly
2015-08-31 16:58:20 -07:00
Jason Ekstrand
b6562bbc30
nir/spirv: Handle control-flow with loops
2015-08-31 16:58:20 -07:00
Jason Ekstrand
4a63761e1d
nir/spirv: Set a name on temporary variables
2015-08-31 16:58:20 -07:00
Jason Ekstrand
6fc7911d15
nir/spirv: Use the correct length for copying string literals
2015-08-31 16:58:20 -07:00
Jason Ekstrand
9da6d808be
nir/spirv: Make vtn_ssa_value handle constants as well as ssa values
2015-08-31 16:58:20 -07:00
Jason Ekstrand
1feeee9cf4
nir/spirv: Add initial support for GLSL 4.50 builtins
2015-08-31 16:58:20 -07:00
Jason Ekstrand
577c09fdad
nir/spirv: Split the core datastructures into a header file
2015-08-31 16:58:20 -07:00
Jason Ekstrand
66fc7f252f
nir/spirv: Use the builder for all instructions
...
We don't actually use it to create all the instructions but we do use it
for insertion always. This should make things far more consistent for
implementing extended instructions.
2015-08-31 16:58:20 -07:00
Jason Ekstrand
9e03b6724c
nir/spirv: Add support for a bunch of ALU operations
2015-08-31 16:58:20 -07:00
Jason Ekstrand
91b3b46d8b
nir/spirv: Add support for indirect array accesses
2015-08-31 16:58:20 -07:00
Jason Ekstrand
9197e3b9fc
nir/spirv: Explicitly type constants and SSA values
2015-08-31 16:58:20 -07:00
Jason Ekstrand
b7904b8281
nir/spirv: Handle OpBranchConditional
...
We do control-flow handling as a two-step process. The first step is to
walk the instructions list and record various information about blocks and
functions. This is where the acutal nir_function_overload objects get
created. We also record the start/stop instruction for each block. Then
a second pass walks over each of the functions and over the blocks in each
function in a way that's NIR-friendly and actually parses the instructions.
2015-08-31 16:58:20 -07:00
Jason Ekstrand
d216dcee94
nir/spirv: Add a helper for getting a value as an SSA value
2015-08-31 16:58:20 -07:00
Jason Ekstrand
f36fabb736
nir/spirv: Split instruction handling into preamble and body sections
2015-08-31 16:58:20 -07:00
Jason Ekstrand
7bf4b53f1c
nir/spirv: Implement load/store instructiosn
2015-08-31 16:58:20 -07:00
Jason Ekstrand
7d64741a5e
nir: Add a helper for getting the tail of a deref chain
2015-08-31 16:58:20 -07:00
Jason Ekstrand
112c607216
nir/spirv: Actaully add variables to the funciton or shader
2015-08-31 16:58:20 -07:00
Jason Ekstrand
4fa1366392
nir/spirv: Add a vtn_untyped_value helper
2015-08-31 16:58:20 -07:00
Jason Ekstrand
e709a4ebb8
nir/spirv: Use vtn_value in the types code and fix a off-by-one error
2015-08-31 16:58:20 -07:00
Jason Ekstrand
67af6c59f2
nir/types: Add an is_vector_or_scalar helper
2015-08-31 16:58:20 -07:00
Jason Ekstrand
5e6c5e3c8e
nir/spirv: Add support for deref chains
2015-08-31 16:58:20 -07:00
Jason Ekstrand
366366c7f7
nir/types: Add a scalar type constructor
2015-08-31 16:58:20 -07:00
Jason Ekstrand
befecb3c55
nir/spirv: Add support for OpLabel
2015-08-31 16:58:20 -07:00
Jason Ekstrand
399e962d25
nir/spirv: Add support for declaring functions
2015-08-31 16:58:20 -07:00
Jason Ekstrand
ac4d459aa2
nir/types: Add accessors for function parameter/return types
2015-08-31 16:58:20 -07:00
Jason Ekstrand
3a266a18ae
nir/spirv: Add support for declaring variables
...
Deref chains and variable load/store operations are still missing.
2015-08-31 16:58:20 -07:00
Jason Ekstrand
2494055631
nir/spirv: Add support for constants
2015-08-31 16:58:20 -07:00
Jason Ekstrand
2a023f30a6
nir/spirv: Add basic support for types
2015-08-31 16:58:20 -07:00
Jason Ekstrand
5bb94c9b12
nir/types: Add more helpers for creating types
2015-08-31 16:58:20 -07:00
Jason Ekstrand
53bff3e445
glsl/types: Expose the function_param and struct_field structs to C
...
Previously, they were hidden behind a #ifdef __cplusplus so C wouldn't find
them. This commit simpliy moves the #ifdef and adds #ifdef's around
constructors.
2015-08-31 16:58:20 -07:00
Jason Ekstrand
0db3e4dd72
glsl/types: Add support for function types
2015-08-31 16:58:20 -07:00
Jason Ekstrand
1169fcdb05
glsl: Add GLSL_TYPE_FUNCTION to the base types enums
2015-08-31 16:58:20 -07:00
Jason Ekstrand
b79916dacc
nir/spirv: Rework the way values are added
...
Instead of having functions to add values and set various things, we just
have a function that does a few asserts and then returns the value. The
caller is then responsible for setting the various fields.
2015-08-31 16:58:20 -07:00
