SkQP: remove model slack, README

Change-Id: Ifd258ccd633fba11a13ac3ffc92fb684789d3e57
Reviewed-on: https://skia-review.googlesource.com/102205
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

2 files changed, 29 insertions, 131 deletions

diff --git a/tools/skqp/README.md b/tools/skqp/README.md
index cd3f0cdf3d..8d8810b514 100644
--- a/tools/skqp/README.md
+++ b/tools/skqp/README.md
@@ -1,37 +1,46 @@
-
 SkQP
 ====
 
+SkQP (Skia Quality Program) is a component of the Android CTS (Compatablity
+Test Suite) that tests an Android device's GPU and OpenGLES & Vulkan drivers
+using Skia's existing unit & rendering tests.
+
 How to run the SkQP tests
 -------------------------
 
-1.  Install Chromium's depot\_tools
+1.  Get the dependencies:
+
+    -   You will need `git` and `python`.
+
+    -   Install Chromium's [depot\_tools](http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html).  Add it to your `PATH`.
+
+            git clone 'https://chromium.googlesource.com/chromium/tools/depot_tools.git'
+            export PATH="${PWD}/depot_tools:${PATH}"
 
-        git clone 'https://chromium.googlesource.com/chromium/tools/depot_tools.git'
-        export PATH="${PWD}/depot_tools:${PATH}"
+    -   Install the [Android NDK](https://developer.android.com/ndk/downloads/).
 
-2.  Install the [Android NDK](https://developer.android.com/ndk/downloads/).
+            ( cd ~; unzip ~/Downloads/android-ndk-*.zip )
+            ANDROID_NDK=$(ls ~/android-ndk-*)   # Or wherever you installed the Android NDK.
 
-        cd ~
-        unzip ~/Downloads/android-ndk-*.zip
-        ANDROID_NDK=~/android-ndk-*        # Or wherever you installed the Android NDK.
+    -   Install the [Android SDK](https://developer.android.com/studio/#command-tools).
+        Set the `ANDROID_HOME` environment variable.
 
-3.  Install the [Android SDK](https://developer.android.com/studio/#command-tools)
+            mkdir ~/android-sdk
+            ( cd ~/android-sdk; unzip ~/Downloads/sdk-tools-*.zip )
+            yes | ~/android-sdk/tools/bin/sdkmanager --licenses
+            export ANDROID_HOME=~/android-sdk  # Or wherever you installed the Android SDK.
 
-        mkdir ~/android-sdk
-        ( cd ~/android-sdk; unzip ~/Downloads/sdk-tools-*.zip )
-        yes | ~/android-sdk/tools/bin/sdkmanager --licenses
-        export ANDROID_HOME=~/android-sdk  # Or wherever you installed the Android SDK.
+        Put `adb` in your `PATH`.
 
-    Put `adb` in your `PATH`.
+            export PATH="${PATH}:${ANDROID_HOME}/platform-tools"
 
-4.  Get the right version of Skia:
+2.  Get the right version of Skia:
 
         git clone https://skia.googlesource.com/skia.git
         cd skia
         git checkout origin/skqp/dev  # or whatever release tag you need
 
-5.  Download dependencies, the model, and configure the build.  (If you want to
+3.  Download dependencies, the model, and configure the build.  (If you want to
     test another architecture, replace `arm` with `x86`, `x64`, or `arm64`.)
 
         python tools/skqp/download_model
@@ -40,14 +49,14 @@ How to run the SkQP tests
         python tools/skqp/generate_gn_args out/skqp-arm "$ANDROID_NDK" arm
         bin/gn gen out/skqp-arm
 
-6.  Build, install, and run.
+4.  Build, install, and run.
 
         platform_tools/android/bin/android_build_app -C out/skqp-arm skqp
         adb install -r out/skqp-arm/skqp.apk
         adb logcat -c
         adb shell am instrument -w org.skia.skqp/android.support.test.runner.AndroidJUnitRunner
 
-7.  Monitor the output with:
+5.  Monitor the output with:
 
         adb logcat org.skia.skqp skia "*:S"
 
@@ -56,7 +65,7 @@ How to run the SkQP tests
         01-23 15:22:12.688 27158 27173 I org.skia.skqp:
         output written to "/storage/emulated/0/Android/data/org.skia.skqp/files/output"
 
-8.  Retrieve and view the report with:
+6.  Retrieve and view the report with:
 
         OUTPUT_LOCATION="/storage/emulated/0/Android/data/org.skia.skqp/files/output"
         adb pull $OUTPUT_LOCATION /tmp/
@@ -65,7 +74,7 @@ How to run the SkQP tests
 Run as a non-APK executable
 ---------------------------
 
-1.  Follow steps 1-5 as above.
+1.  Follow steps 1-3 as above.
 
 2.  Build the SkQP program, load files on the device, and run skqp:
 
diff --git a/tools/skqp/make_gmkb.go b/tools/skqp/make_gmkb.go
index 10400f7ec8..a445f6df80 100644
--- a/tools/skqp/make_gmkb.go
+++ b/tools/skqp/make_gmkb.go
@@ -29,109 +29,6 @@ const (
 	max_png = "max.png"
 )
 
-// `slack` is an amount to add to the max and subtract from the minimim channel
-// value for each pixel for the given test.  By default, slack is 0.
-var slack = map[string]int{
-	"addarc":                                       1,
-	"animated-image-blurs":                         1,
-	"anisotropic_hq":                               1,
-	"bitmapfilters":                                1,
-	"bleed":                                        1,
-	"bleed_alpha_bmp":                              1,
-	"bleed_alpha_bmp_shader":                       1,
-	"bleed_alpha_image":                            1,
-	"bleed_alpha_image_shader":                     1,
-	"bleed_image":                                  1,
-	"blur2rectsnonninepatch":                       1,
-	"blurcircles2":                                 1,
-	"blurimagevmask":                               1,
-	"blurs":                                        1,
-	"bmp_filter_quality_repeat":                    1,
-	"circular_arcs_stroke_butt":                    1,
-	"circular_arcs_stroke_square":                  1,
-	"cliperror":                                    1,
-	"colormatrix":                                  1,
-	"complexclip_aa_invert":                        1,
-	"complexclip_aa_layer_invert":                  1,
-	"concavepaths":                                 1,
-	"const_color_processor":                        1,
-	"convex-polygon-inset":                         1,
-	"dashcircle":                                   1,
-	"dash_line_zero_off_interval":                  1,
-	"downsamplebitmap_image_high":                  1,
-	"downsamplebitmap_image_low":                   1,
-	"downsamplebitmap_image_medium":                1,
-	"downsamplebitmap_text_high_72.00pt":           1,
-	"downsamplebitmap_text_low_72.00pt":            1,
-	"downsamplebitmap_text_medium_72.00pt":         1,
-	"drawregionmodes":                              1,
-	"dstreadshuffle":                               1,
-	"extractalpha":                                 1,
-	"fillcircle":                                   1,
-	"filterbitmap_checkerboard_192_192":            1,
-	"filterbitmap_checkerboard_32_2":               1,
-	"filterbitmap_checkerboard_32_32":              1,
-	"filterbitmap_checkerboard_32_32_g8":           1,
-	"filterbitmap_checkerboard_32_8":               1,
-	"filterbitmap_checkerboard_4_4":                1,
-	"filterbitmap_image_color_wheel.png":           1,
-	"filterbitmap_image_mandrill_16.png":           1,
-	"filterbitmap_image_mandrill_32.png":           1,
-	"filterbitmap_image_mandrill_64.png":           1,
-	"filterbitmap_image_mandrill_64.png_g8":        1,
-	"filterbitmap_text_10.00pt":                    1,
-	"filterbitmap_text_3.00pt":                     1,
-	"filterbitmap_text_7.00pt":                     1,
-	"fontmgr_bounds":                               1,
-	"fontmgr_bounds_1_-0.25":                       1,
-	"glyph_pos_h_s":                                1,
-	"gradients_2pt_conical_edge":                   1,
-	"gradients_many":                               1,
-	"gradients_no_texture":                         1,
-	"gradients_no_texture_nodither":                1,
-	"imageblur":                                    1,
-	"imageblurclampmode":                           1,
-	"imageblurrepeatmode":                          1,
-	"imagefiltersbase":                             1,
-	"imagefiltersclipped":                          1,
-	"imagefilterscropexpand":                       1,
-	"imagefilterscropped":                          1,
-	"imagefiltersscaled":                           1,
-	"imagefiltersstroked":                          1,
-	"linear_gradient":                              1,
-	"manycircles":                                  1,
-	"nested_aa":                                    1,
-	"nested_flipY_aa":                              1,
-	"ninepatch-stretch":                            1,
-	"nonclosedpaths":                               1,
-	"parsedpaths":                                  1,
-	"pathfill":                                     1,
-	"polygons":                                     1,
-	"rects":                                        1,
-	"savelayer_with_backdrop":                      1,
-	"scaled_tilemodes_npot":                        1,
-	"shadertext2":                                  1,
-	"shadertext3":                                  1,
-	"shadow_utils_occl":                            1,
-	"smallpaths":                                   1,
-	"spritebitmap":                                 1,
-	"strokecircle":                                 1,
-	"stroke-fill":                                  1,
-	"strokerects":                                  1,
-	"strokes3":                                     1,
-	"strokes_round":                                1,
-	"tall_stretched_bitmaps":                       1,
-	"thinconcavepaths":                             1,
-	"tilemodes_npot":                               1,
-	"varied_text_clipped_no_lcd":                   1,
-	"varied_text_ignorable_clip_no_lcd":            1,
-	"xfermodes":                                    1,
-	"xfermodes2":                                   1,
-	"xfermodes3":                                   1,
-	"yuv_to_rgb_effect":                            1,
-	"zeroPath":                                     1,
-}
-
 type ExportTestRecordArray []search.ExportTestRecord
 
 func (a ExportTestRecordArray) Len() int           { return len(a) }
@@ -196,14 +93,6 @@ func processTest(testName string, imgUrls []string, output string) error {
 	if img_max.Rect.Max.X == 0 {
 		return nil
 	}
-	if delta, ok := slack[testName]; ok {
-		for i, v := range img_min.Pix {
-			img_min.Pix[i] = clampU8(int(v) - delta)
-		}
-		for i, v := range img_max.Pix {
-			img_max.Pix[i] = clampU8(int(v) + delta)
-		}
-	}
 
 	if err := os.Mkdir(output_directory, os.ModePerm); err != nil && !os.IsExist(err) {
 		return err