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

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

Merge "fix memory corruption when retriving GL_MAX_VIEWPORT_DIMS"

parents 7e0e702f c94dce52

services/surfaceflinger/DisplayHardware/DisplayHardware.cpp

+7 −3
Original line number Diff line number Diff line
@@ -93,7 +93,11 @@ int DisplayHardware::getWidth() const { return mWidth; } 
int DisplayHardware::getHeight() const          { return mHeight; }

PixelFormat DisplayHardware::getFormat() const  { return mFormat; }

uint32_t DisplayHardware::getMaxTextureSize() const { return mMaxTextureSize; }

uint32_t DisplayHardware::getMaxViewportDims() const { return mMaxViewportDims; }



uint32_t DisplayHardware::getMaxViewportDims() const {

    return mMaxViewportDims[0] < mMaxViewportDims[1] ?

            mMaxViewportDims[0] : mMaxViewportDims[1];

}



void DisplayHardware::init(uint32_t dpy)

{
@@ -228,7 +232,7 @@ void DisplayHardware::init(uint32_t dpy) 
            eglQueryString(display, EGL_EXTENSIONS));



    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);

    glGetIntegerv(GL_MAX_VIEWPORT_DIMS, &mMaxViewportDims);

    glGetIntegerv(GL_MAX_VIEWPORT_DIMS, mMaxViewportDims);





#ifdef EGL_ANDROID_swap_rectangle
@@ -260,7 +264,7 @@ void DisplayHardware::init(uint32_t dpy) 
    LOGI("version   : %s", extensions.getVersion());

    LOGI("extensions: %s", extensions.getExtension());

    LOGI("GL_MAX_TEXTURE_SIZE = %d", mMaxTextureSize);

    LOGI("GL_MAX_VIEWPORT_DIMS = %d", mMaxViewportDims);

    LOGI("GL_MAX_VIEWPORT_DIMS = %d x %d", mMaxViewportDims[0], mMaxViewportDims[1]);

    LOGI("flags = %08x", mFlags);



    // Unbind the context from this thread

services/surfaceflinger/DisplayHardware/DisplayHardware.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ private: 
    PixelFormat     mFormat;

    uint32_t        mFlags;

    mutable uint32_t mPageFlipCount;

    GLint           mMaxViewportDims;

    GLint           mMaxViewportDims[2];

    GLint           mMaxTextureSize;

    

    HWComposer*     mHwc;