[Mesa-dev] [PATCH v2] docs: Fix GLSL compiler link

Alejandro Piñeiro apinheiro at igalia.com
Wed Jan 18 14:24:49 UTC 2017


Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>

I will push it now, as you mentioned that you don't have push rights.

Thanks

On 18/01/17 11:50, Elie Tournier wrote:
> The doc wasn't update since we moved the glsl compiler to src/compiler/glsl.
> I also updated the description of the standalone compiler.
>
> v2:
> Mention that just-log argument removes headers/separators.
> Mention that version argument is mandatory.
> Like version argument is mandatory, add --version to the command line exemple.
>
> Signed-off-by: Elie Tournier <tournier.elie at gmail.com>
> ---
>  docs/shading.html | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/docs/shading.html b/docs/shading.html
> index cf989ce902..b0ed249e1d 100644
> --- a/docs/shading.html
> +++ b/docs/shading.html
> @@ -172,7 +172,7 @@ This tool is useful for:
>  </ul>
>  
>  <p>
> -After building Mesa, the compiler can be found at src/glsl/glsl_compiler
> +After building Mesa, the compiler can be found at src/compiler/glsl/glsl_compiler
>  </p>
>  
>  <p>
> @@ -180,7 +180,7 @@ Here's an example of using the compiler to compile a vertex shader and
>  emit GL_ARB_vertex_program-style instructions:
>  </p>
>  <pre>
> -    src/glsl/glsl_compiler --dump-ast myshader.vert
> +    src/compiler/glsl/glsl_compiler --version XXX --dump-ast myshader.vert
>  </pre>
>  
>  Options include
> @@ -188,7 +188,11 @@ Options include
>  <li><b>--dump-ast</b> - dump GPU code
>  <li><b>--dump-hir</b> - dump high-level IR code
>  <li><b>--dump-lir</b> - dump low-level IR code
> -<li><b>--link</b> - ???
> +<li><b>--dump-builder</b> - dump GLSL IR code
> +<li><b>--link</b> - link shaders
> +<li><b>--just-log</b> - display only shader / linker info if exist,
> +without any header or separator
> +<li><b>--version</b> - [Mandatory] define the GLSL version to use
>  </ul>
>  
>  
> @@ -196,7 +200,7 @@ Options include
>  
>  <p>
>  The source code for Mesa's shading language compiler is in the
> -<code>src/glsl/</code> directory.
> +<code>src/compiler/glsl/</code> directory.
>  </p>
>  
>  <p>



More information about the mesa-dev mailing list