aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Donaldson <afdx@google.com>2020-03-19 15:00:21 +0000
committerGitHub <noreply@github.com>2020-03-19 11:00:21 -0400
commitd4ab26cbc3d53f5dfcb38ede4ea4eadbb6da6be3 (patch)
tree3933e84e6b45047c00d067154211ad52fbb87a08
parentf4ea9d7ffdd88c0ea0fff58470ec521353e5e41c (diff)
downloadamber-d4ab26cbc3d53f5dfcb38ede4ea4eadbb6da6be3.tar.gz
Make topologies upper-case in documentation, and fix count in example (#820)
Amber requires topologies to be upper-case. Furthermore, when processing a triangle list in a DRAW_ARRAY command, Amber expects COUNT to specify the number of triangles, not the number of vertices overall. The documentation and examples featured lower-case topologies and a case where a triangle list's count was being derived from the number of vertices; this change fixes these issues. Fixes #818. Fixes #819.
-rw-r--r--docs/amber_script.md24
1 files changed, 12 insertions, 12 deletions
diff --git a/docs/amber_script.md b/docs/amber_script.md
index 51eac9b..1191d60 100644
--- a/docs/amber_script.md
+++ b/docs/amber_script.md
@@ -423,17 +423,17 @@ buffers for the pipeline populated with the specified data.
```
#### Topologies
- * `point_list`
- * `line_list`
- * `line_list_with_adjacency`
- * `line_strip`
- * `line_strip_with_adjacency`
- * `triangle_list`
- * `triangle_list_with_adjacency`
- * `triangle_strip`
- * `triangle_strip_with_adjacency`
- * `triangle_fan`
- * `patch_list`
+ * `POINT_LIST`
+ * `LINE_LIST`
+ * `LINE_LIST_WITH_ADJACENCY`
+ * `LINE_STRIP`
+ * `LINE_STRIP_WITH_ADJACENCY`
+ * `TRIANGLE_LIST`
+ * `TRIANGLE_LIST_WITH_ADJACENCY`
+ * `TRIANGLE_STRIP`
+ * `TRIANGLE_STRIP_WITH_ADJACENCY`
+ * `TRIANGLE_fan`
+ * `PATCH_LIST`
### Run a pipeline.
@@ -795,7 +795,7 @@ END  # pipeline
CLEAR_COLOR kGraphicsPipeline 255 0 0 255
CLEAR kGraphicsPipeline
-RUN kGraphicsPipeline DRAW_ARRAY AS triangle_list START_IDX 0 COUNT 24
+RUN kGraphicsPipeline DRAW_ARRAY AS TRIANGLE_LIST START_IDX 0 COUNT 24
```
### OpenCL-C Shaders