From 330fc2413c61f0bd9c7bb9f3a0ecd91b09de267a Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 14 Oct 2016 18:11:51 -0700 Subject: glsl: Add "built-in" functions to do 64x64 => 64 multiplication These functions are directly available in shaders. A #define is added to detect the presence. This allows these functions to be tested using piglit regardless of whether the driver uses them for lowering. The GLSL spec says that functions and macros beginning with __ are reserved for use by the implementation... hey, that's us! Signed-off-by: Ian Romanick Reviewed-by: Matt Turner --- src/compiler/glsl/glcpp/glcpp-parse.y | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/compiler/glsl/glcpp/glcpp-parse.y') diff --git a/src/compiler/glsl/glcpp/glcpp-parse.y b/src/compiler/glsl/glcpp/glcpp-parse.y index 63012bc6e52..ee553773670 100644 --- a/src/compiler/glsl/glcpp/glcpp-parse.y +++ b/src/compiler/glsl/glcpp/glcpp-parse.y @@ -1334,7 +1334,8 @@ add_builtin_define(glcpp_parser_t *parser, const char *name, int value) } glcpp_parser_t * -glcpp_parser_create(glcpp_extension_iterator extensions, void *state, gl_api api) +glcpp_parser_create(const struct gl_extensions *extension_list, + glcpp_extension_iterator extensions, void *state, gl_api api) { glcpp_parser_t *parser; @@ -1369,6 +1370,7 @@ glcpp_parser_create(glcpp_extension_iterator extensions, void *state, gl_api api parser->error = 0; parser->extensions = extensions; + parser->extension_list = extension_list; parser->state = state; parser->api = api; parser->version = 0; @@ -2335,6 +2337,16 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio parser->extensions(parser->state, add_builtin_define, parser, version, parser->is_gles); + if (parser->extension_list) { + /* If MESA_shader_integer_functions is supported, then the building + * blocks required for the 64x64 => 64 multiply exist. Add defines for + * those functions so that they can be tested. + */ + if (parser->extension_list->MESA_shader_integer_functions) { + add_builtin_define(parser, "__have_builtin_builtin_umul64", 1); + } + } + if (explicitly_set) { ralloc_asprintf_rewrite_tail(&parser->output, &parser->output_length, "#version %" PRIiMAX "%s%s", version, -- cgit v1.2.3