diff options
| author |  Hal Canary <halcanary@google.com> | 2015-11-10 13:25:12 -0500 |
|---|---|---|
| committer | Hal Canary <halcanary@google.com> | 2015-11-10 13:25:12 -0500 |
| commit | 824f46ca2cf0a7c2e95ae747b020f4a321e72d66 (patch) | |
| tree | ecc87f79d4fb2d15f2918f7907db0d1eed3ba62c | |
| parent | 1f0e350af690044b2ba807893ac470800f8914a2 (diff) | |
GYP: remove stale skia_scalar gyp variable
DOCS_PREVIEW= https://skia.org/?cl=1417703013
Review URL: https://codereview.chromium.org/1417703013 .
| -rw-r--r-- | gyp/common_variables.gypi | 2 | ||||
| -rw-r--r-- | make.py | 2 | ||||
| -rw-r--r-- | site/user/quick/linux.md | 17 |
3 files changed, 10 insertions, 11 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 52563ae8a3..64bc29f002 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -125,7 +125,6 @@ 'skia_embedded_fonts%': '0', 'skia_sanitizer%': '', - 'skia_scalar%': 'float', 'skia_mesa%': 0, 'skia_gpu_extra_dependency_path%': '', 'skia_gpu_extra_tests_path%': '', @@ -204,7 +203,6 @@ 'skia_no_fontconfig%': '<(skia_no_fontconfig)', 'skia_embedded_fonts%': '<(skia_embedded_fonts)', 'skia_sanitizer%': '<(skia_sanitizer)', - 'skia_scalar%': '<(skia_scalar)', 'skia_mesa%': '<(skia_mesa)', 'skia_gpu_extra_dependency_path%': '<(skia_gpu_extra_dependency_path)', 'skia_gpu_extra_tests_path%': '<(skia_gpu_extra_tests_path)', @@ -10,7 +10,7 @@ # make clean
# make dm
# make bench BUILDTYPE=Release
-# make gm GYP_DEFINES=skia_scalar=fixed BUILDTYPE=Release
+# make gm GYP_DEFINES='skia_gpu=0' BUILDTYPE=Release
# make all
import os
diff --git a/site/user/quick/linux.md b/site/user/quick/linux.md index 900150dd03..a9c00bd48c 100644 --- a/site/user/quick/linux.md +++ b/site/user/quick/linux.md @@ -136,19 +136,20 @@ To move through the sample app, use the following keypresses: * left-arrow key: cycle through rendering methods for each test page * other keys are defined in SampleApp.cpp’s SampleWindow::onHandleKey() and SampleWindow::onHandleChar() methods -Build and run gm ("golden master") tests +Build and run DM ("diamond master") tests ---------------------------------------- -This will display the return value (0 = success) after running the tests... +[DM is Skia's unit/correctness test harness](../../dev/testing/testing). - make -j gm - out/Debug/gm -r gm/base-linux ; echo $? + make -j dm + out/Debug/dm -You can also adjust the type used to represent SkScalar. By default, we use a -float. To change that, run it as follows: +The `GYP_DEFINES` environment variable can be used to change Skia's +compile-time settings. For example, to disable the Skia GPU backend, +run it as follows: - GYP_DEFINES="skia_scalar=fixed" make -j gm - out/Debug/gm -r gm/base-linux-fixed ; echo $? + GYP_DEFINES='skia_gpu=0' make -j dm + out/Debug/dm Build and run bench (performance testbench) ------------------------------------------- |