diff options
author | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-04 20:18:54 +0000 |
---|---|---|
committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-04 20:18:54 +0000 |
commit | e287c1b49db7045f37fbe9d837fbbb896ca01b88 (patch) | |
tree | 2e8964c07bd11862d0743452fd596948b9817934 | |
parent | d2ae1fad78bbd37d77bd437ea14fb7df22c672d8 (diff) |
Remove cached texture width/height that was used by 4x4 filter
Review URL: http://codereview.appspot.com/6286048
git-svn-id: http://skia.googlecode.com/svn/trunk@4150 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | src/gpu/gl/GrGLProgram.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/GrGLProgram.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index 4f5ea65e2d..8c12ad6c7d 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -1167,8 +1167,6 @@ void GrGLProgram::getUniformLocationsAndInitCache(const GrGLContextInfo& gl, GL_CALL(Uniform1i(programData->fUniLocations.fStages[s].fSamplerUni, s)); } programData->fTextureMatrices[s] = GrMatrix::InvalidMatrix(); - programData->fTextureWidth[s] = -1; - programData->fTextureHeight[s] = -1; programData->fTextureDomain[s].setEmpty(); // this is arbitrary, just initialize to something programData->fTextureOrientation[s] = diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index 026a8548a1..8edb500941 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h @@ -311,9 +311,6 @@ public: GrColor fCoverage; GrColor fColorFilterColor; GrMatrix fTextureMatrices[GrDrawState::kNumStages]; - // width and height used for normalized texel size - int fTextureWidth[GrDrawState::kNumStages]; - int fTextureHeight[GrDrawState::kNumStages]; GrRect fTextureDomain[GrDrawState::kNumStages]; // The texture domain and texture matrix sent to GL depend upon the // orientation. |