Attachment 127929 Details for Bug 97422 – possible patch

[patch] possible patch

file_97422.txt (text/plain), 1.16 KB, created by Karol Herbst on 2016-11-12 12:00:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karol Herbst

Created: 2016-11-12 12:00:54 UTC

Size: 1.16 KB

patch

obsolete

>diff --git a/src/compiler/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp
>index ac3b52d..fb50e27 100644
>--- a/src/compiler/glsl/ast_function.cpp
>+++ b/src/compiler/glsl/ast_function.cpp
>@@ -2099,13 +2099,20 @@ ast_function_expression::hir(exec_list *instructions,
>       process_parameters(instructions, &actual_parameters, &this->expressions,
>                          state);
> 
>-      if (id->oper == ast_array_index) {
>+      switch (id->oper) {
>+      case ast_array_index:
>          array_idx = generate_array_index(ctx, instructions, state, loc,
>                                           id->subexpressions[0],
>                                           id->subexpressions[1], &func_name,
>                                           &actual_parameters);
>-      } else {
>+         break;
>+      case ast_int_constant:
>+         _mesa_glsl_error(& loc, state, "%i is no valid function name",
>+                          id->primary_expression.identifier);
>+         return ir_rvalue::error_value(ctx);
>+      default:
>          func_name = id->primary_expression.identifier;
>+         break;
>       }
> 
>       /* an error was emitted earlier */

Actions: View | Splinter Review

Attachments on bug 97422: 125922 | 127920 | 127929

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.