diff options
author | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-06 12:09:01 +0000 |
---|---|---|
committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-06 12:09:01 +0000 |
commit | cf6285b89b8820641ffb6871d4b3275bfe783f51 (patch) | |
tree | 6494e0064186c8b01651c45c02f0c64efa6bfc3f /src/gpu/effects | |
parent | 2a2cc2057347553f07d933b021876ba5502e55cd (diff) |
fix warnings on Mac in src/gpu and include/gpu
Fix these class of warnings:
- unused functions
- unused locals
- sign mismatch
- missing function prototypes
- missing newline at end of file
- 64 to 32 bit truncation
The changes prefer to link in dead code in the debug build
with 'if (false)' than to comment it out, but trivial cases
are commented out or sometimes deleted if it appears to be
a copy/paste error.
Review URL: https://codereview.appspot.com/6296044
git-svn-id: http://skia.googlecode.com/svn/trunk@4180 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/effects')
-rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 4 | ||||
-rw-r--r-- | src/gpu/effects/GrMorphologyEffect.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index 9296ecc93e..14e817fcec 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -84,8 +84,8 @@ void GrGLConvolutionEffect::emitFS(GrGLShaderBuilder* state, const char* inputColor, const char* samplerName) { GrStringBuilder* code = &state->fFSCode; - const char* texFunc = "texture2D"; - bool complexCoord = false; + // const char* texFunc = "texture2D"; + // bool complexCoord = false; state->fFSCode.appendf("\t\tvec4 sum = vec4(0, 0, 0, 0);\n"); diff --git a/src/gpu/effects/GrMorphologyEffect.cpp b/src/gpu/effects/GrMorphologyEffect.cpp index 906758d991..991e11b720 100644 --- a/src/gpu/effects/GrMorphologyEffect.cpp +++ b/src/gpu/effects/GrMorphologyEffect.cpp @@ -82,8 +82,8 @@ void GrGLMorphologyEffect ::emitFS(GrGLShaderBuilder* state, const char* inputColor, const char* samplerName) { GrStringBuilder* code = &state->fFSCode; - const char* texFunc = "texture2D"; - bool complexCoord = false; + // const char* texFunc = "texture2D"; + // bool complexCoord = false; const char* func; switch (fType) { |