Address some more valgrind issues

tests/BlurTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
@@ skipping 255 matching lines @@
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, resultCount, 30);
     bitmap.allocPixels();
     SkCanvas canvas(bitmap);
 
     blur_path(&canvas, path, gaussianSigma);
     readback(&canvas, result, resultCount);
 }
 
 #if SK_SUPPORT_GPU
-static void gpu_blur_path(GrContextFactory* factory, const SkPath& path,
+static bool gpu_blur_path(GrContextFactory* factory, const SkPath& path,
                           SkScalar gaussianSigma,
                           int* result, int resultCount) {
 
     GrContext* grContext = factory->get(GrContextFactory::kNative_GLContextType);
     if (NULL == grContext) {
-        return;
+        return false;
     }
 
     GrTextureDesc desc;
     desc.fConfig = kSkia8888_GrPixelConfig;
     desc.fFlags = kRenderTarget_GrTextureFlagBit;
     desc.fWidth = resultCount;
     desc.fHeight = 30;
     desc.fSampleCnt = 0;
 
     SkAutoTUnref<GrTexture> texture(grContext->createUncachedTexture(desc, NULL, 0));
     SkAutoTUnref<SkGpuDevice> device(SkNEW_ARGS(SkGpuDevice, (grContext, texture.get())));
     SkCanvas canvas(device.get());
 
     blur_path(&canvas, path, gaussianSigma);
     readback(&canvas, result, resultCount);
+    return true;
 }
 #endif
 
 #if WRITE_CSV
 static void write_as_csv(const char* label, SkScalar scale, int* data, int count) {
     SkDebugf("%s_%.2f,", label, scale);
     for (int i = 0; i < count-1; ++i) {
         SkDebugf("%d,", data[i]);
     }
     SkDebugf("%d\n", data[count-1]);
@@ skipping 40 matching lines @@
     int groundTruthResult[kSize];
     int bruteForce1DResult[kSize];
 
     SkScalar sigma = SkFloatToScalar(10.0f);
 
     for (int i = 0; i < 4; ++i, sigma /= 10) {
 
         cpu_blur_path(rectPath, sigma, rectSpecialCaseResult, kSize);
         cpu_blur_path(polyPath, sigma, generalCaseResult, kSize);
 #if SK_SUPPORT_GPU
-        gpu_blur_path(factory, rectPath, sigma, gpuResult, kSize);
+        bool haveGPUResult = gpu_blur_path(factory, rectPath, sigma, gpuResult, kSize);
 #endif
         ground_truth_2d(100, 100, sigma, groundTruthResult, kSize);
         brute_force_1d(-50.0f, 50.0f, sigma, bruteForce1DResult, kSize);
 
         REPORTER_ASSERT(reporter, match(rectSpecialCaseResult, bruteForce1DResult, kSize, 5));
         REPORTER_ASSERT(reporter, match(generalCaseResult, bruteForce1DResult, kSize, 15));
 #if SK_SUPPORT_GPU

[robertphillips, 2013/11/14 14:21:41]

This addresses (since gpuResult wasn't getting filled in):

Conditional jump or move depends on uninitialised value(s)
at 0x410237: match(int*, int*, int, int) (BlurTest.cpp:315)
by 0x4114F3: test_sigma_range(skiatest::Reporter*, GrContextFactory*)
(BlurTest.cpp:367)
by 0x4117CB: skiatest::BlurTestClass::onRun(skiatest::Reporter*)
(BlurTest.cpp:387)
by 0x49670A: skiatest::Test::run() (Test.cpp:109)
by 0x48FDA0: SkTestRunnable::run() (skia_test.cpp:155)
by 0x48F746: tool_main(int, char**) (skia_test.cpp:246)
by 0x48F922: main (skia_test.cpp:276)
Uninitialised value was created by a stack allocation
at 0x410CAC: test_sigma_range(skiatest::Reporter*, GrContextFactory*)
(BlurTest.cpp:324)

-        // 1 works everywhere but: Ubuntu13 & Nexus4
-        REPORTER_ASSERT(reporter, match(gpuResult, bruteForce1DResult, kSize, 10));
+        if (haveGPUResult) {
+            // 1 works everywhere but: Ubuntu13 & Nexus4
+            REPORTER_ASSERT(reporter, match(gpuResult, bruteForce1DResult, kSize, 10));
+        }
 #endif
         REPORTER_ASSERT(reporter, match(groundTruthResult, bruteForce1DResult, kSize, 1));
 
 #if WRITE_CSV
         write_as_csv("RectSpecialCase", sigma, rectSpecialCaseResult, kSize);
         write_as_csv("GeneralCase", sigma, generalCaseResult, kSize);
 #if SK_SUPPORT_GPU
         write_as_csv("GPU", sigma, gpuResult, kSize);
 #endif
         write_as_csv("GroundTruth2D", sigma, groundTruthResult, kSize);
         write_as_csv("BruteForce1D", sigma, bruteForce1DResult, kSize);
 #endif
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static void test_blur(skiatest::Reporter* reporter, GrContextFactory* factory) {
     test_blur_drawing(reporter);
     test_sigma_range(reporter, factory);
 }
 
 #include "TestClassDef.h"
 DEFINE_GPUTESTCLASS("BlurMaskFilter", BlurTestClass, test_blur)