From 100abf49e10544bc4f436bf1f38e6929779621f4 Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Wed, 5 Sep 2012 17:40:04 +0000 Subject: [PATCH] Shut up some Mac (xcode 3) warnings Review URL: http://codereview.appspot.com/6503053/ git-svn-id: http://skia.googlecode.com/svn/trunk@5402 2bbb7eff-a529-9590-31e7-b0007b416f81 --- experimental/Debugger/DebuggerContentView.cpp | 4 ++++ gm/gradtext.cpp | 2 -- src/animator/SkScriptTokenizer.cpp | 4 ++-- src/core/SkBitmapProcState_shaderproc.h | 3 +++ src/core/SkPixelRef.cpp | 2 ++ src/effects/gradients/SkTwoPointConicalGradient.cpp | 4 +--- src/gpu/GrClipMaskManager.cpp | 2 +- src/gpu/gl/GrGLProgram.cpp | 2 +- src/gpu/gl/GrGpuGL.cpp | 6 ++++-- src/utils/SkDeferredCanvas.cpp | 2 +- tests/ClipStackTest.cpp | 2 +- tests/DeferredCanvasTest.cpp | 10 +++++----- tools/skdiff_main.cpp | 4 ++-- 13 files changed, 27 insertions(+), 20 deletions(-) diff --git a/experimental/Debugger/DebuggerContentView.cpp b/experimental/Debugger/DebuggerContentView.cpp index 02ea404..8039e57 100644 --- a/experimental/Debugger/DebuggerContentView.cpp +++ b/experimental/Debugger/DebuggerContentView.cpp @@ -258,10 +258,14 @@ private: /////////////////////////////////////////////////////////////////////////////// +SkView* create_debugger(const char* data, size_t size); + SkView* create_debugger(const char* data, size_t size) { return SkNEW_ARGS(DebuggerView, (data, size)); }; +bool is_debugger(SkView* view); + bool is_debugger(SkView* view) { SkEvent isDebugger(gIsDebuggerQuery); return view->doQuery(&isDebugger); diff --git a/gm/gradtext.cpp b/gm/gradtext.cpp index f26222a..d080e3e 100644 --- a/gm/gradtext.cpp +++ b/gm/gradtext.cpp @@ -47,7 +47,6 @@ protected: virtual SkISize onISize() { return make_isize(500, 480); } virtual void onDraw(SkCanvas* canvas) { SkPaint paint; - const SkISize& size = this->getISize(); SkRect r = SkRect::MakeWH(SkIntToScalar(100), SkIntToScalar(100)); canvas->clipRect(r); @@ -76,7 +75,6 @@ protected: virtual SkISize onISize() { return make_isize(500, 480); } virtual void onDraw(SkCanvas* canvas) { SkPaint paint; - const SkISize& size = this->getISize(); SkRect r = SkRect::MakeWH(SkIntToScalar(100), SkIntToScalar(100)); diff --git a/src/animator/SkScriptTokenizer.cpp b/src/animator/SkScriptTokenizer.cpp index 9547a98..a1de5e5 100644 --- a/src/animator/SkScriptTokenizer.cpp +++ b/src/animator/SkScriptTokenizer.cpp @@ -1276,8 +1276,8 @@ bool SkScriptEngine2::ValueToString(const SkScriptValue2& value, SkString* strin #define testInt(expression) { #expression, SkOperand2::kS32, expression, 0, NULL } #ifdef SK_SCALAR_IS_FLOAT -#define testScalar(expression) { #expression, SkOperand2::kScalar, 0, (float) expression, NULL } -#define testRemainder(exp1, exp2) { #exp1 "%" #exp2, SkOperand2::kScalar, 0, fmodf(exp1, exp2), NULL } +#define testScalar(expression) { #expression, SkOperand2::kScalar, 0, (float) (expression), NULL } +#define testRemainder(exp1, exp2) { #exp1 "%" #exp2, SkOperand2::kScalar, 0, fmodf((float) exp1, (float) exp2), NULL } #else #define testScalar(expression) { #expression, SkOperand2::kScalar, 0, (int) ((expression) * 65536.0f), NULL } #define testRemainder(exp1, exp2) { #exp1 "%" #exp2, SkOperand2::kScalar, 0, (int) (fmod(exp1, exp2) * 65536.0f), NULL } diff --git a/src/core/SkBitmapProcState_shaderproc.h b/src/core/SkBitmapProcState_shaderproc.h index 6f2bbe7..cf15a50 100644 --- a/src/core/SkBitmapProcState_shaderproc.h +++ b/src/core/SkBitmapProcState_shaderproc.h @@ -13,6 +13,9 @@ // Can't be static in the general case because some of these implementations // will be defined and referenced in different object files. void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y, + DSTTYPE* SK_RESTRICT colors, int count); + +void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y, DSTTYPE* SK_RESTRICT colors, int count) { SkASSERT((s.fInvType & ~(SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask)) == 0); diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp index f71458b..69bbad7 100644 --- a/src/core/SkPixelRef.cpp +++ b/src/core/SkPixelRef.cpp @@ -34,6 +34,8 @@ static SkBaseMutex* get_default_mutex() { /////////////////////////////////////////////////////////////////////////////// +int32_t SkNextPixelRefGenerationID(); + int32_t SkNextPixelRefGenerationID() { static int32_t gPixelRefGenerationID; // do a loop in case our global wraps around, as we never want to diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index c84989b..38733f3 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -188,7 +188,7 @@ void SkTwoPointConicalGradient::shadeSpan(int x, int y, SkPMColor* dstCParam, SkPMColor* SK_RESTRICT dstC = dstCParam; SkMatrix::MapXYProc dstProc = fDstToIndexProc; - TileProc proc = fTileProc; + const SkPMColor* SK_RESTRICT cache = this->getCache32(); TwoPointRadialProc shadeProc = twopoint_repeat; @@ -254,8 +254,6 @@ bool SkTwoPointConicalGradient::setContext(const SkBitmap& device, SkShader::BitmapType SkTwoPointConicalGradient::asABitmap( SkBitmap* bitmap, SkMatrix* matrix, SkShader::TileMode* xy) const { SkPoint diff = fCenter2 - fCenter1; - SkScalar diffRadius = fRadius2 - fRadius1; - SkScalar startRadius = fRadius1; SkScalar diffLen = 0; if (bitmap) { diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp index c4c2edf..5e1bd36 100644 --- a/src/gpu/GrClipMaskManager.cpp +++ b/src/gpu/GrClipMaskManager.cpp @@ -159,9 +159,9 @@ bool GrClipMaskManager::setupClipping(const GrClipData* clipDataIn) { return false; } +#if GR_SW_CLIP bool requiresAA = requires_AA(*clipDataIn->fClipStack); -#if GR_SW_CLIP // If MSAA is enabled we can do everything in the stencil buffer. // Otherwise check if we should just create the entire clip mask // in software (this will only happen if the clip mask is anti-aliased diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index ff29bd4..664f1c0 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -947,7 +947,7 @@ void GrGLProgram::genStageCode(int stageNum, } else { uniforms.fTextureMatrixUni = builder->addUniform(GrGLShaderBuilder::kVertex_ShaderType, kMat33f_GrSLType, "TexM", &matName); - const GrGLShaderVar& mat = builder->getUniformVariable(uniforms.fTextureMatrixUni); + builder->getUniformVariable(uniforms.fTextureMatrixUni); if (desc.fOptFlags & StageDesc::kNoPerspective_OptFlagBit) { texCoordVaryingType = kVec2f_GrSLType; diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 33c79b4..8d55abb 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -1655,12 +1655,14 @@ void GrGpuGL::onGpuDrawNonIndexed(GrPrimitiveType type, } namespace { + +static const uint16_t kOnes16 = static_cast(~0); const GrStencilSettings& winding_nv_path_stencil_settings() { GR_STATIC_CONST_SAME_STENCIL_STRUCT(gSettings, kIncClamp_StencilOp, kIncClamp_StencilOp, kAlwaysIfInClip_StencilFunc, - ~0, ~0, ~0); + kOnes16, kOnes16, kOnes16); return *GR_CONST_STENCIL_SETTINGS_PTR_FROM_STRUCT_PTR(&gSettings); } const GrStencilSettings& even_odd_nv_path_stencil_settings() { @@ -1668,7 +1670,7 @@ const GrStencilSettings& even_odd_nv_path_stencil_settings() { kInvert_StencilOp, kInvert_StencilOp, kAlwaysIfInClip_StencilFunc, - ~0, ~0, ~0); + kOnes16, kOnes16, kOnes16); return *GR_CONST_STENCIL_SETTINGS_PTR_FROM_STRUCT_PTR(&gSettings); } } diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp index 81ebcbd..bbd3ae8 100644 --- a/src/utils/SkDeferredCanvas.cpp +++ b/src/utils/SkDeferredCanvas.cpp @@ -470,7 +470,7 @@ void DeferredDevice::recordedDrawCommand() { this->flushPending(); // Free as much as possible to avoid oscillating around fMaxRecordingStorageBytes // which could cause a high flushing frequency. - this->freeMemoryIfPossible(~0); + this->freeMemoryIfPossible(~0U); } storageAllocated = this->storageAllocatedForRecording(); } diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp index 19e28ad..8a74dc8 100644 --- a/tests/ClipStackTest.cpp +++ b/tests/ClipStackTest.cpp @@ -354,7 +354,7 @@ static void test_isWideOpen(skiatest::Reporter* reporter) { } } -int count(const SkClipStack& stack) { +static int count(const SkClipStack& stack) { SkClipStack::Iter iter(stack, SkClipStack::Iter::kTop_IterStart); diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp index 5eda568..95b3f73 100644 --- a/tests/DeferredCanvasTest.cpp +++ b/tests/DeferredCanvasTest.cpp @@ -260,7 +260,7 @@ static void TestDeferredCanvasBitmapCaching(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, canvas.storageAllocatedForRecording() > bitmapSize); // verify that nothing can be freed at this point - REPORTER_ASSERT(reporter, 0 == canvas.freeMemoryIfPossible(~0)); + REPORTER_ASSERT(reporter, 0 == canvas.freeMemoryIfPossible(~0U)); // verify that flush leaves image in cache REPORTER_ASSERT(reporter, 0 == notificationCounter.fFlushedDrawCommandsCount); @@ -271,7 +271,7 @@ static void TestDeferredCanvasBitmapCaching(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, canvas.storageAllocatedForRecording() >= bitmapSize); // verify that after a flush, cached image can be freed - REPORTER_ASSERT(reporter, canvas.freeMemoryIfPossible(~0) >= bitmapSize); + REPORTER_ASSERT(reporter, canvas.freeMemoryIfPossible(~0U) >= bitmapSize); // Verify that caching works for avoiding multiple copies of the same bitmap canvas.drawBitmap(sourceImages[0], 0, 0, NULL); @@ -294,18 +294,18 @@ static void TestDeferredCanvasBitmapCaching(skiatest::Reporter* reporter) { // Verifiy that partial purge works, image zero is in cache but not reffed by // a pending draw, while image 1 is locked-in. - canvas.freeMemoryIfPossible(~0); + canvas.freeMemoryIfPossible(~0U); REPORTER_ASSERT(reporter, 2 == notificationCounter.fFlushedDrawCommandsCount); canvas.drawBitmap(sourceImages[0], 0, 0, NULL); canvas.flush(); canvas.drawBitmap(sourceImages[1], 0, 0, NULL); - bytesFreed = canvas.freeMemoryIfPossible(~0); + bytesFreed = canvas.freeMemoryIfPossible(~0U); // only one bitmap should have been freed. REPORTER_ASSERT(reporter, bytesFreed >= bitmapSize); REPORTER_ASSERT(reporter, bytesFreed < 2*bitmapSize); // Clear for next test canvas.flush(); - canvas.freeMemoryIfPossible(~0); + canvas.freeMemoryIfPossible(~0U); REPORTER_ASSERT(reporter, canvas.storageAllocatedForRecording() < bitmapSize); // Verify the image cache is sensitive to genID bumps diff --git a/tools/skdiff_main.cpp b/tools/skdiff_main.cpp index aa31ec9..5fbf3ff 100644 --- a/tools/skdiff_main.cpp +++ b/tools/skdiff_main.cpp @@ -57,7 +57,7 @@ enum Result { // Returns the Result with this name. // If there is no Result with this name, returns kNumResultTypes. // TODO: Is there a better return value for the fall-through case? -Result getResultByName(const char *name) { +static Result getResultByName(const char *name) { if (0 == strcmp("EqualBits", name)) { return kEqualBits; } @@ -86,7 +86,7 @@ Result getResultByName(const char *name) { } // Returns a text description of the given Result type. -const char *getResultDescription(Result result) { +static const char *getResultDescription(Result result) { switch (result) { case kEqualBits: return "contain exactly the same bits"; -- 2.7.4