diff options
author | Dave Airlie <[email protected]> | 2015-04-20 10:16:55 +1000 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2015-07-23 17:25:25 +1000 |
commit | 57f24299b7fe0f7b20c2a3cf1e94c747825b568d (patch) | |
tree | c2de7c35d3d0eefe644110fa5f106d23010ba12b /src/glsl/nir | |
parent | d16ff8ac783874c8ee74ef796b1c853829ff237d (diff) |
glsl/types: add new subroutine type (v3.2)
This type will be used to store the name of subroutine types
as in subroutine void myfunc(void);
will store myfunc into a subroutine type.
This is required to the parser can identify a subroutine
type in a uniform decleration as a valid type, and also for
looking up the type later.
Also add contains_subroutine method.
v2: handle subroutine to int comparisons, needed
for lowering pass.
v3: do subroutine to int with it's own IR
operation to avoid hacking on asserts (Kayden)
v3.1: fix warnings in this patch, fix nir,
fix tgsi
v3.2: fixup tests
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Chris Forbes <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
tests: fix warnings
Diffstat (limited to 'src/glsl/nir')
-rw-r--r-- | src/glsl/nir/nir_lower_io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/nir/nir_lower_io.c b/src/glsl/nir/nir_lower_io.c index a9dd77691b2..f6e5e2beda4 100644 --- a/src/glsl/nir/nir_lower_io.c +++ b/src/glsl/nir/nir_lower_io.c @@ -59,6 +59,8 @@ type_size(const struct glsl_type *type) size += type_size(glsl_get_struct_field(type, i)); } return size; + case GLSL_TYPE_SUBROUTINE: + return 1; case GLSL_TYPE_SAMPLER: return 0; case GLSL_TYPE_ATOMIC_UINT: |