diff options
| author | Mathias Agopian <mathias@google.com> | 2010-05-26 22:49:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-26 22:49:03 -0700 |
| commit | df0364de6f7be68e003729c262fe2731b82ae10e (patch) | |
| tree | 04bafcb0de46e2f39a8afd89fd999989111a3eea | |
| parent | d908822df0822acefb97cd728cd792a857b3f9d3 (diff) | |
| parent | 0d3c0063aa998bc32e7f22114e38a0f8df61ad65 (diff) | |
| download | frameworks_base-df0364de6f7be68e003729c262fe2731b82ae10e.zip frameworks_base-df0364de6f7be68e003729c262fe2731b82ae10e.tar.gz frameworks_base-df0364de6f7be68e003729c262fe2731b82ae10e.tar.bz2 | |
Merge "minor clean-up GLclampx -> GLclampf" into kraken
| -rw-r--r-- | libs/surfaceflinger/LayerBase.cpp | 8 | ||||
| -rw-r--r-- | libs/surfaceflinger/LayerBase.h | 4 | ||||
| -rw-r--r-- | libs/surfaceflinger/LayerBuffer.cpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libs/surfaceflinger/LayerBase.cpp b/libs/surfaceflinger/LayerBase.cpp index ebce711..76733a9 100644 --- a/libs/surfaceflinger/LayerBase.cpp +++ b/libs/surfaceflinger/LayerBase.cpp @@ -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); diff --git a/libs/surfaceflinger/LayerBase.h b/libs/surfaceflinger/LayerBase.h index 9129e80..a78424e 100644 --- a/libs/surfaceflinger/LayerBase.h +++ b/libs/surfaceflinger/LayerBase.h @@ -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; diff --git a/libs/surfaceflinger/LayerBuffer.cpp b/libs/surfaceflinger/LayerBuffer.cpp index 740b8cd..8a582da 100644 --- a/libs/surfaceflinger/LayerBuffer.cpp +++ b/libs/surfaceflinger/LayerBuffer.cpp @@ -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); } |