summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElie TOURNIER <tournier.elie@gmail.com>2017-01-18 13:50:11 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2017-01-18 14:15:31 +0000
commit5034cf4e35446bf3a4eab0aab7694211dadffae3 (patch)
treeb7ecd07dd1caf740631fadc1cf79047fbcdec1cf
parent8d1712a065d5e55310a5c39a8914d714d845f6ce (diff)
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@gmail.com> Reviewed-by: Alejandro PiƱeiro <apinheiro@igalia.com>
-rw-r--r--docs/shading.html12
1 files 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>