Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9aaa3661 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

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

parents a0513574 010fccb0

libs/surfaceflinger/LayerBase.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -338,13 +338,13 @@ void LayerBase::draw(const Region& inClip) const 
    */

    */

}

}





void LayerBase::clearWithOpenGL(const Region& clip, GLclampx red,

void LayerBase::clearWithOpenGL(const Region& clip, GLclampf red,

                                GLclampx green, GLclampx blue,

                                GLclampf green, GLclampf blue,

                                GLclampx alpha) const

                                GLclampf 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(red,green,blue,alpha);

    glColor4f(red,green,blue,alpha);

    glDisable(GL_TEXTURE_2D);

    glDisable(GL_TEXTURE_2D);

    glDisable(GL_BLEND);

    glDisable(GL_BLEND);

    glDisable(GL_DITHER);

    glDisable(GL_DITHER);

libs/surfaceflinger/LayerBase.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -222,8 +222,8 @@ protected: 
    const GraphicPlane& graphicPlane(int dpy) const;

    const GraphicPlane& graphicPlane(int dpy) const;

          GraphicPlane& graphicPlane(int dpy);

          GraphicPlane& graphicPlane(int dpy);





          void clearWithOpenGL(const Region& clip, GLclampx r, GLclampx g,

          void clearWithOpenGL(const Region& clip, GLclampf r, GLclampf g,

                               GLclampx b, GLclampx alpha) const;

                               GLclampf b, GLclampf 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;

libs/surfaceflinger/LayerBuffer.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -622,9 +622,9 @@ LayerBuffer::OverlaySource::~OverlaySource() 
void LayerBuffer::OverlaySource::onDraw(const Region& clip) const

void LayerBuffer::OverlaySource::onDraw(const Region& clip) const

{

{

    // this would be where the color-key would be set, should we need it.

    // this would be where the color-key would be set, should we need it.

    GLclampx red = 0;

    GLclampf red = 0;

    GLclampx green = 0;

    GLclampf green = 0;

    GLclampx blue = 0;

    GLclampf blue = 0;

    mLayer.clearWithOpenGL(clip, red, green, blue, 0);

    mLayer.clearWithOpenGL(clip, red, green, blue, 0);

}

}