ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

am cbb1a958: SurfaceFlinger: tell SurfaceTex about filtering

Browse Source 
* commit 'cbb1a95819ec302ae15e4a1162a8b1349ae5c33e':
  SurfaceFlinger: tell SurfaceTex about filtering
This commit is contained in:
Jamie Gennis 2012-05-09 13:21:17 -07:00 committed by Android Git Automerger
commit 2abfb3efdb
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
services/surfaceflinger/Layer.cpp
View File

@ -317,16 +317,24 @@ void Layer::onDraw(const Region& clip) const
} }
if (!isProtected()) { if (!isProtected()) {
// TODO: we could be more subtle with isFixedSize()
const bool useFiltering = getFiltering() || needsFiltering() || isFixedSize();
// Query the texture matrix given our current filtering mode.
float textureMatrix[16];
mSurfaceTexture->setFilteringEnabled(useFiltering);
mSurfaceTexture->getTransformMatrix(textureMatrix);
// Set things up for texturing.
glBindTexture(GL_TEXTURE_EXTERNAL_OES, mTextureName); glBindTexture(GL_TEXTURE_EXTERNAL_OES, mTextureName);
GLenum filter = GL_NEAREST; GLenum filter = GL_NEAREST;
if (getFiltering() || needsFiltering() || isFixedSize() || isCropped()) { if (useFiltering) {
// TODO: we could be more subtle with isFixedSize()
filter = GL_LINEAR; filter = GL_LINEAR;
} }
glTexParameterx(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, filter); glTexParameterx(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, filter);
glTexParameterx(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, filter); glTexParameterx(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, filter);
glMatrixMode(GL_TEXTURE); glMatrixMode(GL_TEXTURE);
glLoadMatrixf(mTextureMatrix); glLoadMatrixf(textureMatrix);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glEnable(GL_TEXTURE_EXTERNAL_OES); glEnable(GL_TEXTURE_EXTERNAL_OES);
@ -494,13 +502,6 @@ void Layer::lockPageFlip(bool& recomputeVisibleRegions)
mFlinger->invalidateHwcGeometry(); mFlinger->invalidateHwcGeometry();
} }
GLfloat textureMatrix[16];
mSurfaceTexture->getTransformMatrix(textureMatrix);
if (memcmp(textureMatrix, mTextureMatrix, sizeof(textureMatrix))) {
memcpy(mTextureMatrix, textureMatrix, sizeof(textureMatrix));
mFlinger->invalidateHwcGeometry();
}
uint32_t bufWidth = mActiveBuffer->getWidth(); uint32_t bufWidth = mActiveBuffer->getWidth();
uint32_t bufHeight = mActiveBuffer->getHeight(); uint32_t bufHeight = mActiveBuffer->getHeight();
if (oldActiveBuffer != NULL) { if (oldActiveBuffer != NULL) {

1
services/surfaceflinger/Layer.h
View File

@ -114,7 +114,6 @@ private:
// main thread // main thread
sp<GraphicBuffer> mActiveBuffer; sp<GraphicBuffer> mActiveBuffer;
GLfloat mTextureMatrix[16];
Rect mCurrentCrop; Rect mCurrentCrop;
uint32_t mCurrentTransform; uint32_t mCurrentTransform;
uint32_t mCurrentScalingMode; uint32_t mCurrentScalingMode;