diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-12-12 18:45:07 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-12-12 18:45:07 +0000 |
| commit | aa814fe4a148b05f9160a5f77cb4e630406ea62d (patch) | |
| tree | 7c6cabf3451402200f130cdb5b42d5d9bcccaa49 /src/gpu/GrGpuGLShaders.cpp | |
| parent | 4d4f281b28c3db0513ea1a68db4577e2518002b3 (diff) | |
Access sampler matrices directly, cleanup GrSamplerState::reset()s
Review URL: http://codereview.appspot.com/5488048/
git-svn-id: http://skia.googlecode.com/svn/trunk@2854 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrGpuGLShaders.cpp')
| -rw-r--r-- | src/gpu/GrGpuGLShaders.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrGpuGLShaders.cpp b/src/gpu/GrGpuGLShaders.cpp index 5534d050bd..5fe90b8b12 100644 --- a/src/gpu/GrGpuGLShaders.cpp +++ b/src/gpu/GrGpuGLShaders.cpp @@ -374,7 +374,7 @@ void GrGpuGLShaders::recordHWSamplerMatrix(int stage, const GrMatrix& matrix) { GrAssert(fProgramData); if (GrGLProgram::kSetAsAttribute == fProgramData->fUniLocations.fStages[stage].fTextureMatrixUni) { - fHWDrawState.sampler(stage)->setMatrix(matrix); + *fHWDrawState.sampler(stage)->matrix() = matrix; } else { fProgramData->fTextureMatrices[stage] = matrix; } |