diff options
| -rw-r--r-- | bench/TimerData.cpp | 2 | ||||
| -rw-r--r-- | bench/TimerData.h | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLProgram.h | 4 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLShaderBuilder.cpp | 2 | ||||
| -rw-r--r-- | tests/DrawBitmapRectTest.cpp | 2 | ||||
| -rw-r--r-- | tools/PictureBenchmark.cpp | 6 | ||||
| -rw-r--r-- | tools/PictureResultsWriter.h | 24 |
7 files changed, 21 insertions, 21 deletions
diff --git a/bench/TimerData.cpp b/bench/TimerData.cpp index ba682f0e24..d3dbf28524 100644 --- a/bench/TimerData.cpp +++ b/bench/TimerData.cpp @@ -141,7 +141,7 @@ SkString TimerData::getResult(const char* doubleFormat, } #ifdef SK_BUILD_JSON_WRITER -Json::Value TimerData::getJSON(uint32_t timerFlags, +Json::Value TimerData::getJSON(uint32_t timerFlags, Result result, int itersPerTiming) { SkASSERT(itersPerTiming >= 1); diff --git a/bench/TimerData.h b/bench/TimerData.h index 8f6a7194ab..be6158bbd8 100644 --- a/bench/TimerData.h +++ b/bench/TimerData.h @@ -69,7 +69,7 @@ public: uint32_t timerFlags, int itersPerTiming = 1); #ifdef SK_BUILD_JSON_WRITER - Json::Value getJSON(uint32_t timerFlags, + Json::Value getJSON(uint32_t timerFlags, Result result, int itersPerTiming = 1); #endif // SK_BUILD_JSON_WRITER diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index 68bb8ff2d4..88fc02201e 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h @@ -194,9 +194,9 @@ private: SkAutoTDelete<GrGLProgramEffects> fColorEffects; SkAutoTDelete<GrGLProgramEffects> fCoverageEffects; - + GrGLProgramDesc fDesc; - + GrGpuGL* fGpu; SkAutoTUnref<GrGLUniformManager> fUniformManager; diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp index 93364e1640..d2e49a9f6c 100644 --- a/src/gpu/gl/GrGLShaderBuilder.cpp +++ b/src/gpu/gl/GrGLShaderBuilder.cpp @@ -139,7 +139,7 @@ bool GrGLShaderBuilder::genProgram(const GrEffectStage* colorStages[], if (GrGLProgramDesc::kSecondaryCoverageISA_CoverageOutput == header.fCoverageOutput) { // Get (1-A) into coeff coeff = GrGLSLExpr4::VectorCast(GrGLSLExpr1(1) - inColor.a()); - } else if (GrGLProgramDesc::kSecondaryCoverageISC_CoverageOutput == + } else if (GrGLProgramDesc::kSecondaryCoverageISC_CoverageOutput == header.fCoverageOutput){ // Get (1-RGBA) into coeff coeff = GrGLSLExpr4(1) - inColor; diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp index aa69de4bd4..6dca98b527 100644 --- a/tests/DrawBitmapRectTest.cpp +++ b/tests/DrawBitmapRectTest.cpp @@ -22,7 +22,7 @@ class FailureImageGenerator : public SkImageGenerator { public: FailureImageGenerator() { } virtual ~FailureImageGenerator() { } - + protected: virtual bool onGetInfo(SkImageInfo* info) SK_OVERRIDE { info->fWidth = 100; diff --git a/tools/PictureBenchmark.cpp b/tools/PictureBenchmark.cpp index f1d00035cc..30967c7381 100644 --- a/tools/PictureBenchmark.cpp +++ b/tools/PictureBenchmark.cpp @@ -183,8 +183,8 @@ void PictureBenchmark::run(SkPicture* pict) { // longer generating SVG graphs. #if 0 fWriter->tileData( - &perTileTimerData, - timeFormat.c_str(), + &perTileTimerData, + timeFormat.c_str(), fTimerResult, timerTypes); #endif @@ -194,7 +194,7 @@ void PictureBenchmark::run(SkPicture* pict) { } fWriter->addTileFlag(PictureResultsWriter::kAvg); fWriter->tileData( - &longRunningTimerData, + &longRunningTimerData, tiledRenderer->getNormalTimeFormat().c_str(), TimerData::kAvg_Result, timerTypes, diff --git a/tools/PictureResultsWriter.h b/tools/PictureResultsWriter.h index 0571e80d05..9aa33b52ec 100644 --- a/tools/PictureResultsWriter.h +++ b/tools/PictureResultsWriter.h @@ -31,8 +31,8 @@ public: virtual void tileMeta(int x, int y, int tx, int ty) = 0; virtual void addTileFlag(PictureResultsWriter::TileFlags flag) = 0; virtual void tileData( - TimerData* data, - const char format[], + TimerData* data, + const char format[], const TimerData::Result result, uint32_t timerTypes, int numInnerLoops = 1) = 0; @@ -46,7 +46,7 @@ public: * passed to PictureResultsMultiWriter */ class PictureResultsMultiWriter : public PictureResultsWriter { public: - PictureResultsMultiWriter() + PictureResultsMultiWriter() : fWriters() {} void add(PictureResultsWriter* newWriter) { fWriters.push_back(newWriter); @@ -73,13 +73,13 @@ public: } } virtual void tileData( - TimerData* data, - const char format[], + TimerData* data, + const char format[], const TimerData::Result result, uint32_t timerTypes, int numInnerLoops = 1) { for(int i=0; i<fWriters.count(); ++i) { - fWriters[i]->tileData(data, format, result, timerTypes, + fWriters[i]->tileData(data, format, result, timerTypes, numInnerLoops); } } @@ -95,7 +95,7 @@ private: /** * Writes to SkBenchLogger to mimic original behavior */ -class PictureResultsLoggerWriter : public PictureResultsWriter { +class PictureResultsLoggerWriter : public PictureResultsWriter { private: void logProgress(const char str[]) { if(fLogger != NULL) { @@ -124,8 +124,8 @@ public: } } virtual void tileData( - TimerData* data, - const char format[], + TimerData* data, + const char format[], const TimerData::Result result, uint32_t timerTypes, int numInnerLoops = 1) { @@ -173,7 +173,7 @@ class PictureJSONResultsWriter : public PictureResultsWriter { public: PictureJSONResultsWriter(const char filename[]) : fFilename(filename), - fRoot(), + fRoot(), fCurrentBench(NULL), fCurrentTileSet(NULL), fCurrentTile(NULL) {} @@ -207,8 +207,8 @@ public: } } virtual void tileData( - TimerData* data, - const char format[], + TimerData* data, + const char format[], const TimerData::Result result, uint32_t timerTypes, int numInnerLoops = 1) { |