aboutsummaryrefslogtreecommitdiffhomepage
path: root/site
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-03-20 08:54:16 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-20 13:31:49 +0000
commit6405e71279e99731f89db69325c6763ec62a98e1 (patch)
treef1ce7b3cc37ec3e9f9f4f135655376fd30174753 /site
parent5e21e0991968271ee37f446de7e08620ad1b50bb (diff)
Remove gpu configs that don't have explicit API.
DOCS_PREVIEW= https://skia.org/?cl=9871 Change-Id: I510473cf91d8bee38d1e33424b1ae7b30dc86968 Reviewed-on: https://skia-review.googlesource.com/9871 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'site')
-rw-r--r--site/dev/testing/testing.md33
-rw-r--r--site/user/build.md2
2 files changed, 17 insertions, 18 deletions
diff --git a/site/dev/testing/testing.md b/site/dev/testing/testing.md
index c14ca72f68..d58abfb400 100644
--- a/site/dev/testing/testing.md
+++ b/site/dev/testing/testing.md
@@ -66,16 +66,15 @@ files (from `--skps`, which defaults to "skps"). You can control the types of
sources DM will use with `--src` (default, "tests gm image skp").
DM has found 3 usable ways to draw those 492 sources. This is controlled by
-`--config`, which today defaults to "565 8888 gpu nonrendering angle nvprmsaa4".
-DM has skipped nonrendering, angle, and nvprmssa4, leaving three usable configs:
-565, 8888, and gpu. These three name different ways to draw using Skia:
+`--config`. The defaults are operating system dependent. On Linux they are "8888 gl nonrendering".
+DM has skipped nonrendering leaving two usable configs:
+8888 and gl. These two name different ways to draw using Skia:
- - 565: draw using the software backend into a 16-bit RGB bitmap
- 8888: draw using the software backend into a 32-bit RGBA bitmap
- - gpu: draw using the GPU backend (Ganesh) into a 32-bit RGBA bitmap
+ - gl: draw using the OpenGL backend (Ganesh) into a 32-bit RGBA bitmap
Sometimes DM calls these configs, sometimes sinks. Sorry. There are many
-possible configs but generally we pay most attention to 8888 and gpu.
+possible configs but generally we pay most attention to 8888 and gl.
DM always tries to draw all sources into all sinks, which is why we multiply
492 by 3. The unit tests don't really fit into this source-sink model, so they
@@ -110,19 +109,19 @@ When DM finishes running, you should find a directory with file named dm.json,
and some nested directories filled with lots of images.
~~~
$ ls dm_output
-565 8888 dm.json gpu
+8888 dm.json gl
$ find dm_output -name '*.png'
-dm_output/565/gm/3x3bitmaprect.png
-dm_output/565/gm/aaclip.png
-dm_output/565/gm/aarectmodes.png
-dm_output/565/gm/alphagradients.png
-dm_output/565/gm/arcofzorro.png
-dm_output/565/gm/arithmode.png
-dm_output/565/gm/astcbitmap.png
-dm_output/565/gm/bezier_conic_effects.png
-dm_output/565/gm/bezier_cubic_effects.png
-dm_output/565/gm/bezier_quad_effects.png
+dm_output/8888/gm/3x3bitmaprect.png
+dm_output/8888/gm/aaclip.png
+dm_output/8888/gm/aarectmodes.png
+dm_output/8888/gm/alphagradients.png
+dm_output/8888/gm/arcofzorro.png
+dm_output/8888/gm/arithmode.png
+dm_output/8888/gm/astcbitmap.png
+dm_output/8888/gm/bezier_conic_effects.png
+dm_output/8888/gm/bezier_cubic_effects.png
+dm_output/8888/gm/bezier_quad_effects.png
...
~~~
diff --git a/site/user/build.md b/site/user/build.md
index 36ef63c89d..eaf56c24f1 100644
--- a/site/user/build.md
+++ b/site/user/build.md
@@ -99,7 +99,7 @@ and run it as normal. You may find `bin/droid` convenient.
ninja -C out/arm64
adb push out/arm64/dm /data/local/tmp
adb push resources /data/local/tmp
- adb shell "cd /data/local/tmp; ./dm --src gm --config gpu"
+ adb shell "cd /data/local/tmp; ./dm --src gm --config gl"
Mac
---