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

Merge "minor clean-up GLclampx -> GLclampf" into kraken

Browse Source
This commit is contained in:
Mathias Agopian 2010-05-26 22:49:03 -07:00 committed by Android (Google) Code Review
commit 9aaa3661ee
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/surfaceflinger/LayerBase.cpp
View File

@ -338,13 +338,13 @@ void LayerBase::draw(const Region& inClip) const
*/
}
void LayerBase::clearWithOpenGL(const Region& clip, GLclampx red,
GLclampx green, GLclampx blue,
GLclampx alpha) const
void LayerBase::clearWithOpenGL(const Region& clip, GLclampf red,
GLclampf green, GLclampf blue,
GLclampf alpha) const
{
const DisplayHardware& hw(graphicPlane(0).displayHardware());
const uint32_t fbHeight = hw.getHeight();
glColor4x(red,green,blue,alpha);
glColor4f(red,green,blue,alpha);
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
glDisable(GL_DITHER);

4
libs/surfaceflinger/LayerBase.h
View File

@ -222,8 +222,8 @@ protected:
const GraphicPlane& graphicPlane(int dpy) const;
GraphicPlane& graphicPlane(int dpy);
void clearWithOpenGL(const Region& clip, GLclampx r, GLclampx g,
GLclampx b, GLclampx alpha) const;
void clearWithOpenGL(const Region& clip, GLclampf r, GLclampf g,
GLclampf b, GLclampf alpha) const;
void clearWithOpenGL(const Region& clip) const;
void drawWithOpenGL(const Region& clip, const Texture& texture) const;

6
libs/surfaceflinger/LayerBuffer.cpp
View File

@ -622,9 +622,9 @@ LayerBuffer::OverlaySource::~OverlaySource()
void LayerBuffer::OverlaySource::onDraw(const Region& clip) const
{
// this would be where the color-key would be set, should we need it.
GLclampx red = 0;
GLclampx green = 0;
GLclampx blue = 0;
GLclampf red = 0;
GLclampf green = 0;
GLclampf blue = 0;
mLayer.clearWithOpenGL(clip, red, green, blue, 0);
}