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

Commit f286822a authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Extensions must load in ctor"

parents ca3f9383 15401531

libs/hwui/Caches.cpp

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ bool Caches::init() { 
}



void Caches::initExtensions() {

    mExtensions.load();

    if (mExtensions.hasDebugMarker()) {

        eventMark = glInsertEventMarkerEXT;

libs/hwui/DeviceInfo.cpp

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ void DeviceInfo::initialize() { 
}



void DeviceInfo::load() {

    mExtensions.load();

    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);

}

libs/hwui/Extensions.cpp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ namespace uirenderer { 
#endif





void Extensions::load() {

Extensions::Extensions() {

    auto extensions = StringUtils::split((const char*) glGetString(GL_EXTENSIONS));

    mHasNPot = extensions.has("GL_OES_texture_npot");

    mHasFramebufferFetch = extensions.has("GL_NV_shader_framebuffer_fetch");

libs/hwui/Extensions.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ namespace uirenderer { 


class Extensions {

public:

    void load();

    Extensions();



    inline bool hasNPot() const { return mHasNPot; }

    inline bool hasFramebufferFetch() const { return mHasFramebufferFetch; }