Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 458e9186: Merge change 23720 into eclair

Browse Source 
Merge commit '458e9186c175f87c420b7f82e91c0afa695c8ebb' into eclair-plus-aosp

* commit '458e9186c175f87c420b7f82e91c0afa695c8ebb':
  Add colorkey to gl clear operation
This commit is contained in:
Rebecca Schultz Zavin
2009-09-02 17:07:41 -07:00
committed by Android Git Automerger
parent 61f87bcbd6 458e9186c1
commit 2f84bd1042
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/surfaceflinger/LayerBase.cpp
View File

@@ -354,11 +354,13 @@ GLuint LayerBase::createTexture() const
return textureName; return textureName;
} }
void LayerBase::clearWithOpenGL(const Region& clip) const void LayerBase::clearWithOpenGL(const Region& clip, GLclampx red,
GLclampx green, GLclampx blue,
GLclampx alpha) const
{ {
const DisplayHardware& hw(graphicPlane(0).displayHardware()); const DisplayHardware& hw(graphicPlane(0).displayHardware());
const uint32_t fbHeight = hw.getHeight(); const uint32_t fbHeight = hw.getHeight();
glColor4x(0,0,0,0); glColor4x(red,green,blue,alpha);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND); glDisable(GL_BLEND);
glDisable(GL_DITHER); glDisable(GL_DITHER);
@@ -377,6 +379,11 @@ void LayerBase::clearWithOpenGL(const Region& clip) const
} }
} }
void LayerBase::clearWithOpenGL(const Region& clip) const
{
clearWithOpenGL(clip,0,0,0,0);
}
void LayerBase::drawWithOpenGL(const Region& clip, const Texture& texture) const void LayerBase::drawWithOpenGL(const Region& clip, const Texture& texture) const
{ {
const DisplayHardware& hw(graphicPlane(0).displayHardware()); const DisplayHardware& hw(graphicPlane(0).displayHardware());

4
libs/surfaceflinger/LayerBase.h
View File

@@ -251,7 +251,9 @@ protected:
uint32_t transform; uint32_t transform;
bool dirty; bool dirty;
}; };
void clearWithOpenGL(const Region& clip, GLclampx r, GLclampx g,
GLclampx b, GLclampx alpha) const;
void clearWithOpenGL(const Region& clip) const; void clearWithOpenGL(const Region& clip) const;
void drawWithOpenGL(const Region& clip, const Texture& texture) const; void drawWithOpenGL(const Region& clip, const Texture& texture) const;
void loadTexture(Texture* texture, GLint textureName, void loadTexture(Texture* texture, GLint textureName,

6
libs/surfaceflinger/LayerBuffer.cpp
View File

@@ -600,7 +600,11 @@ LayerBuffer::OverlaySource::~OverlaySource()
void LayerBuffer::OverlaySource::onDraw(const Region& clip) const void LayerBuffer::OverlaySource::onDraw(const Region& clip) const
{ {
mLayer.clearWithOpenGL(clip); GLclampx color = 0x000018; //dark blue
GLclampx red = 0;
GLclampx green = 0;
GLclampx blue = 0x1818;
mLayer.clearWithOpenGL(clip, red, green, blue, 0);
} }
void LayerBuffer::OverlaySource::onTransaction(uint32_t flags) void LayerBuffer::OverlaySource::onTransaction(uint32_t flags)