[Mesa-dev] [PATCH] glsl/linker: Change the format of spec quotation

Tapani Pälli tapani.palli at intel.com
Wed Oct 10 11:05:42 UTC 2018


Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 10/10/18 1:51 PM, Vadym Shovkoplias wrote:
> Also there is no "OpenGL ES Shading Language 4.00" spec,
> so change it to GLSL 4.00 spec.
> 
> Signed-off-by: Vadym Shovkoplias <vadym.shovkoplias at globallogic.com>
> ---
>   src/compiler/glsl/linker.cpp | 11 +++++------
>   1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
> index 2f4c886054..7db34ebf95 100644
> --- a/src/compiler/glsl/linker.cpp
> +++ b/src/compiler/glsl/linker.cpp
> @@ -4648,12 +4648,11 @@ verify_subroutine_associated_funcs(struct gl_shader_program *prog)
>         gl_program *p = prog->_LinkedShaders[i]->Program;
>         glsl_symbol_table *symbols = prog->_LinkedShaders[i]->symbols;
>   
> -      /*
> -       * From OpenGL ES Shading Language 4.00 specification
> -       * (6.1.2 Subroutines):
> -       *     "A program will fail to compile or link if any shader
> -       *     or stage contains two or more functions with the same
> -       *     name if the name is associated with a subroutine type."
> +      /* Section 6.1.2 (Subroutines) of the GLSL 4.00 spec says:
> +       *
> +       *   "A program will fail to compile or link if any shader
> +       *    or stage contains two or more functions with the same
> +       *    name if the name is associated with a subroutine type."
>          */
>         for (unsigned j = 0; j < p->sh.NumSubroutineFunctions; j++) {
>            unsigned definitions = 0;
> 


More information about the mesa-dev mailing list