diff options
| author | Timothy Arceri <[email protected]> | 2019-08-14 10:25:14 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2019-11-20 05:05:55 +0000 |
| commit | 35108caa71d4da02303335ee52a0833fe650d85a (patch) | |
| tree | e54fe90a360541d096b7c9e57b507565b9db64bd | |
| parent | 906f1a293312ecca60b6187b08a11afffe432796 (diff) | |
glsl: add infrastructure for ARB_shading_language_include
Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Reviewed-by: Witold Baryluk <[email protected]>
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 1 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/extensions_table.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 3d1a31e1ff1..e457d63b988 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -665,6 +665,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = { EXT(ARB_shader_texture_lod), EXT(ARB_shader_viewport_layer_array), EXT(ARB_shading_language_420pack), + EXT(ARB_shading_language_include), EXT(ARB_shading_language_packing), EXT(ARB_tessellation_shader), EXT(ARB_texture_cube_map_array), diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h index 2c64e88414d..33db8b5b656 100644 --- a/src/compiler/glsl/glsl_parser_extras.h +++ b/src/compiler/glsl/glsl_parser_extras.h @@ -727,6 +727,8 @@ struct _mesa_glsl_parse_state { bool ARB_shader_viewport_layer_array_warn; bool ARB_shading_language_420pack_enable; bool ARB_shading_language_420pack_warn; + bool ARB_shading_language_include_enable; + bool ARB_shading_language_include_warn; bool ARB_shading_language_packing_enable; bool ARB_shading_language_packing_warn; bool ARB_tessellation_shader_enable; diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 1ad67444f1c..eb05302d68f 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -137,6 +137,7 @@ EXT(ARB_shader_texture_lod , ARB_shader_texture_lod EXT(ARB_shader_viewport_layer_array , ARB_shader_viewport_layer_array , GLL, GLC, x , x , 2015) EXT(ARB_shading_language_100 , dummy_true , GLL, x , x , x , 2003) EXT(ARB_shading_language_420pack , ARB_shading_language_420pack , GLL, GLC, x , x , 2011) +EXT(ARB_shading_language_include , dummy_false , GLL, GLC, x , x , 2013) EXT(ARB_shading_language_packing , ARB_shading_language_packing , GLL, GLC, x , x , 2011) EXT(ARB_shadow , ARB_shadow , GLL, x , x , x , 2001) EXT(ARB_sparse_buffer , ARB_sparse_buffer , GLL, GLC, x , x , 2014) |