Mesa (master): docs: Fix GLSL compiler link
Emil Velikov
evelikov at kemper.freedesktop.org
Wed Jan 18 14:18:23 UTC 2017
Module: Mesa
Branch: master
Commit: 5034cf4e35446bf3a4eab0aab7694211dadffae3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5034cf4e35446bf3a4eab0aab7694211dadffae3
Author: Elie TOURNIER <tournier.elie at gmail.com>
Date: Wed Jan 18 13:50:11 2017 +0000
docs: Fix GLSL compiler link
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 <tournier.elie at gmail.com>
Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
---
docs/shading.html | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/docs/shading.html b/docs/shading.html
index cf989ce..b0ed249 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-commit
mailing list