Merge "Extensions must load in ctor"

4 files changed, 2 insertions, 4 deletions

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index a327614a50ef..94a11f131229 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -79,7 +79,6 @@ bool Caches::init() {
 }
 
 void Caches::initExtensions() {
-    mExtensions.load();
     if (mExtensions.hasDebugMarker()) {
         eventMark = glInsertEventMarkerEXT;
 
diff --git a/libs/hwui/DeviceInfo.cpp b/libs/hwui/DeviceInfo.cpp
index 03b1706faa49..39b7ecb9a914 100644
--- a/libs/hwui/DeviceInfo.cpp
+++ b/libs/hwui/DeviceInfo.cpp
@@ -40,7 +40,6 @@ void DeviceInfo::initialize() {
 }
 
 void DeviceInfo::load() {
-    mExtensions.load();
     glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);
 }
 
diff --git a/libs/hwui/Extensions.cpp b/libs/hwui/Extensions.cpp
index e257715acaeb..02caaa49e99c 100644
--- a/libs/hwui/Extensions.cpp
+++ b/libs/hwui/Extensions.cpp
@@ -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");
diff --git a/libs/hwui/Extensions.h b/libs/hwui/Extensions.h
index 8ccfabdd2450..67cc747015e0 100644
--- a/libs/hwui/Extensions.h
+++ b/libs/hwui/Extensions.h
@@ -31,7 +31,7 @@ namespace uirenderer {
 
 class Extensions {
 public:
-    void load();
+    Extensions();
 
     inline bool hasNPot() const { return mHasNPot; }
     inline bool hasFramebufferFetch() const { return mHasFramebufferFetch; }