Cache gl::Data in Context to speed up validation.

src/libANGLE/Context.cpp

@@ -37,7 +37,8 @@ namespace gl
 {
 
 Context::Context(const egl::Config *config, int clientVersion, const Context *shareContext, rx::Renderer *renderer, bool notifyResets, bool robustAccess)
-    : mRenderer(renderer)
+    : mRenderer(renderer),
+      mData(clientVersion, mState, mCaps, mTextureCaps, mExtensions, nullptr)
 {
     ASSERT(robustAccess == false);   // Unimplemented
 
@@ -62,6 +63,8 @@ Context::Context(const egl::Config *config, int clientVersion, const Context *sh
         mResourceManager = new ResourceManager(mRenderer);
     }
 
+    mData.resourceManager = mResourceManager;
+
     // [OpenGL ES 2.0.24] section 3.7 page 83:
     // In the initial state, TEXTURE_2D and TEXTURE_CUBE_MAP have twodimensional
     // and cube map texture state vectors respectively associated with them.
@@ -1578,9 +1581,4 @@ void Context::initCaps(GLuint clientVersion)
     }
 }
 
-Data Context::getData() const
-{
-    return Data(mClientVersion, mState, mCaps, mTextureCaps, mExtensions, mResourceManager);
-}
-
 }

src/libANGLE/Context.h

@@ -200,7 +200,7 @@ class Context final : angle::NonCopyable
     State &getState() { return mState; }
     const State &getState() const { return mState; }
 
-    Data getData() const;
+    const Data &getData() const { return mData; }
 
   private:
     void detachBuffer(GLuint buffer);
@@ -272,7 +272,11 @@ class Context final : angle::NonCopyable
     bool mRobustAccess;
 
     ResourceManager *mResourceManager;
+
+    // Cache the Data object to avoid re-calling the constructor
+    Data mData;
 };
+
 }
 
 #endif   // LIBANGLE_CONTEXT_H_

src/libANGLE/State.cpp

@@ -30,7 +30,7 @@ State::~State()
     reset();
 }
 
-void State::initialize(const Caps& caps, GLuint clientVersion)
+void State::initialize(const Caps &caps, GLuint clientVersion)
 {
     mMaxDrawBuffers = caps.maxDrawBuffers;
     mMaxCombinedTextureImageUnits = caps.maxCombinedTextureImageUnits;