Reviewed-by: Chris Forbes <[email protected]> On Mon, May 23, 2016 at 2:15 PM, Dave Airlie <[email protected]> wrote:
> From: Dave Airlie <[email protected]> > > These types can't be returned. > > This fixes: > > GL43-CTS.shader_subroutine.subroutines_not_allowed_as_variables_constructors_and_argument_or_return_types > for the return type case. > > Signed-off-by: Dave Airlie <[email protected]> > --- > src/compiler/glsl/ast_to_hir.cpp | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/src/compiler/glsl/ast_to_hir.cpp > b/src/compiler/glsl/ast_to_hir.cpp > index aa8e810..0ec5b70 100644 > --- a/src/compiler/glsl/ast_to_hir.cpp > +++ b/src/compiler/glsl/ast_to_hir.cpp > @@ -5402,6 +5402,15 @@ ast_function::hir(exec_list *instructions, > name); > } > > + /**/ > + if (return_type->is_subroutine()) { > + YYLTYPE loc = this->get_location(); > + _mesa_glsl_error(&loc, state, > + "function `%s' return type can't be a subroutine > type", > + name); > + } > + > + > /* Create an ir_function if one doesn't already exist. */ > f = state->symbols->get_function(name); > if (f == NULL) { > -- > 2.5.5 > > _______________________________________________ > mesa-dev mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
