diff options
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/GrTextureAccess.cpp | 1 | ||||
-rw-r--r-- | src/gpu/SkGpuDevice.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/GrGLSL.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 3 |
4 files changed, 1 insertions, 7 deletions
diff --git a/src/gpu/GrTextureAccess.cpp b/src/gpu/GrTextureAccess.cpp index 1156ec2158..5c3a36dce3 100644 --- a/src/gpu/GrTextureAccess.cpp +++ b/src/gpu/GrTextureAccess.cpp @@ -84,7 +84,6 @@ void GrTextureAccess::reset(GrTexture* texture, void GrTextureAccess::setSwizzle(const char* swizzle) { fSwizzleMask = 0; memset(fSwizzle, '\0', 5); - int i = 0; for (int i = 0; i < 4 && '\0' != swizzle[i]; ++i) { fSwizzle[i] = swizzle[i]; switch (swizzle[i]) { diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index e7fd8c4205..2149d11a24 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -1662,8 +1662,6 @@ bool SkGpuDevice::filterImage(SkImageFilter* filter, const SkBitmap& src, GrPaint paint; paint.reset(); - GrSamplerState* sampler = paint.textureSampler(kBitmapTextureIdx); - GrTexture* texture; // We assume here that the filter will not attempt to tile the src. Otherwise, this cache lookup // must be pushed upstack. diff --git a/src/gpu/gl/GrGLSL.cpp b/src/gpu/gl/GrGLSL.cpp index 079c08232f..420af03a79 100644 --- a/src/gpu/gl/GrGLSL.cpp +++ b/src/gpu/gl/GrGLSL.cpp @@ -91,7 +91,7 @@ const char* GrGLSLVectorNonhomogCoords(int count) { return NONHOMOGS[count]; } -const char* GrGLSLVectorNonhomogCoord(GrSLType type) { +const char* GrGLSLVectorNonhomogCoords(GrSLType type) { return GrGLSLVectorNonhomogCoords(GrSLTypeToVecLength(type)); } diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index d9988c42e2..157d9bc2ec 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -1073,8 +1073,6 @@ bool GrGpuGL::createStencilBufferForRenderTarget(GrRenderTarget* rt, return false; } - GrGLStencilBuffer* sb = NULL; - int stencilFmtCnt = this->glCaps().stencilFormats().count(); for (int i = 0; i < stencilFmtCnt; ++i) { GL_CALL(BindRenderbuffer(GR_GL_RENDERBUFFER, sbID)); @@ -2032,7 +2030,6 @@ void GrGpuGL::flushBoundTextureAndParams(int stage) { void GrGpuGL::flushBoundTextureAndParams(int stage, const GrTextureParams& params, GrGLTexture* nextTexture) { - GrDrawState* drawState = this->drawState(); // true for now, but maybe not with GrEffect. GrAssert(NULL != nextTexture); |