diff options
| author | Romain Guy <romainguy@google.com> | 2011-11-30 20:21:23 -0800 |
|---|---|---|
| committer | Romain Guy <romainguy@google.com> | 2011-11-30 20:21:23 -0800 |
| commit | d21b6e1fe337b35f62cf2028e9bd0637fd009a75 (patch) | |
| tree | 8831d34e2dd0335c158c2aa12bee68452745c8c5 /libs/hwui/SkiaShader.cpp | |
| parent | 28147b654bba8ae2b7976e58aa7869255e436b0b (diff) | |
| download | frameworks_base-d21b6e1fe337b35f62cf2028e9bd0637fd009a75.zip frameworks_base-d21b6e1fe337b35f62cf2028e9bd0637fd009a75.tar.gz frameworks_base-d21b6e1fe337b35f62cf2028e9bd0637fd009a75.tar.bz2 | |
Optimize away unnecessary state changes
Change-Id: I0f6816f9f6234853575ecee5033186ad19e76380
Diffstat (limited to 'libs/hwui/SkiaShader.cpp')
| -rw-r--r-- | libs/hwui/SkiaShader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/SkiaShader.cpp b/libs/hwui/SkiaShader.cpp index 2428295..32e7533 100644 --- a/libs/hwui/SkiaShader.cpp +++ b/libs/hwui/SkiaShader.cpp @@ -77,7 +77,7 @@ void SkiaShader::setupProgram(Program* program, const mat4& modelView, const Sna void SkiaShader::bindTexture(Texture* texture, GLenum wrapS, GLenum wrapT) { glBindTexture(GL_TEXTURE_2D, texture->id); - texture->setWrap(wrapS, wrapT); + texture->setWrapST(wrapS, wrapT); } void SkiaShader::computeScreenSpaceMatrix(mat4& screenSpace, const mat4& modelView) { @@ -148,7 +148,7 @@ void SkiaBitmapShader::setupProgram(Program* program, const mat4& modelView, // ::updateTransforms() but we don't have the texture object // available at that point. The optimization is not worth the // effort for now. - texture->setFilter(GL_LINEAR, GL_LINEAR); + texture->setFilter(GL_LINEAR); glUniform1i(program->getUniform("bitmapSampler"), textureSlot); glUniformMatrix4fv(program->getUniform("textureTransform"), 1, |