From 5034cf4e35446bf3a4eab0aab7694211dadffae3 Mon Sep 17 00:00:00 2001 From: Elie TOURNIER Date: Wed, 18 Jan 2017 13:50:11 +0000 Subject: [PATCH] docs: Fix GLSL compiler link MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. Since version argument is mandatory, add --version to the command line example. Signed-off-by: Elie Tournier Reviewed-by: Alejandro Piñeiro --- docs/shading.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/shading.html b/docs/shading.html index cf989ce9029..b0ed249e1dd 100644 --- a/docs/shading.html +++ b/docs/shading.html @@ -172,7 +172,7 @@ This tool is useful for:

-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

@@ -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: 

-    src/glsl/glsl_compiler --dump-ast myshader.vert
+    src/compiler/glsl/glsl_compiler --version XXX --dump-ast myshader.vert
Options include @@ -188,7 +188,11 @@ Options include
  • --dump-ast - dump GPU code
  • --dump-hir - dump high-level IR code
  • --dump-lir - dump low-level IR code -
  • --link - ??? +
  • --dump-builder - dump GLSL IR code +
  • --link - link shaders +
  • --just-log - display only shader / linker info if exist, +without any header or separator +
  • --version - [Mandatory] define the GLSL version to use @@ -196,7 +200,7 @@ Options include

    The source code for Mesa's shading language compiler is in the -src/glsl/ directory. +src/compiler/glsl/ directory.

    -- 2.30.2