Move the EGL-based initial state to the gl::State constructor.

src/libANGLE/Context.cpp

@@ -281,6 +281,11 @@ Context::Context(rx::EGLImplFactory *implFactory,
       mSavedArgsType(nullptr),
       mImplementation(implFactory->createContext(mState)),
       mCompiler(),
+      mGLState(GetDebug(attribs),
+               GetBindGeneratesResource(attribs),
+               GetClientArraysEnabled(attribs),
+               GetRobustResourceInit(attribs),
+               memoryProgramCache != nullptr),
       mConfig(config),
       mClientType(EGL_OPENGL_ES_API),
       mHasBeenCurrent(false),
@@ -307,9 +312,7 @@ Context::Context(rx::EGLImplFactory *implFactory,
     initCaps(displayExtensions, clientExtensions, robustResourceInit);
     initWorkarounds();
 
-    mGLState.initialize(this, GetDebug(attribs), GetBindGeneratesResource(attribs),
-                        GetClientArraysEnabled(attribs), robustResourceInit,
-                        mMemoryProgramCache != nullptr);
+    mGLState.initialize(this);
 
     mFenceNVHandleAllocator.setBaseHandle(0);
 

src/libANGLE/Debug.cpp

@@ -36,8 +36,8 @@ Debug::Group::~Group()
 
 Debug::Group::Group(const Group &other) = default;
 
-Debug::Debug()
-    : mOutputEnabled(false),
+Debug::Debug(bool initialDebugState)
+    : mOutputEnabled(initialDebugState),
       mCallbackFunction(nullptr),
       mCallbackUserParam(nullptr),
       mMessages(),

src/libANGLE/Debug.h

@@ -30,7 +30,7 @@ class LabeledObject
 class Debug : angle::NonCopyable
 {
   public:
-    Debug();
+    Debug(bool initialDebugState);
     ~Debug();
 
     void setMaxLoggedMessages(GLuint maxLoggedMessages);

src/libANGLE/State.cpp

@@ -75,7 +75,11 @@ void UpdateBufferBinding(const Context *context,
         (*binding)->onBindingChanged(context, true, target);
 }
 
-State::State()
+State::State(bool debug,
+             bool bindGeneratesResource,
+             bool clientArraysEnabled,
+             bool robustResourceInit,
+             bool programBinaryCacheEnabled)
     : mMaxDrawBuffers(0),
       mMaxCombinedTextureImageUnits(0),
       mDepthClearValue(0),
@@ -91,8 +95,8 @@ State::State()
       mLineWidth(0),
       mGenerateMipmapHint(GL_NONE),
       mFragmentShaderDerivativeHint(GL_NONE),
-      mBindGeneratesResource(true),
-      mClientArraysEnabled(true),
+      mBindGeneratesResource(bindGeneratesResource),
+      mClientArraysEnabled(clientArraysEnabled),
       mNearZ(0),
       mFarZ(0),
       mReadFramebuffer(nullptr),
@@ -101,11 +105,12 @@ State::State()
       mVertexArray(nullptr),
       mActiveSampler(0),
       mPrimitiveRestart(false),
+      mDebug(debug),
       mMultiSampling(false),
       mSampleAlphaToOne(false),
       mFramebufferSRGB(true),
-      mRobustResourceInit(false),
-      mProgramBinaryCacheEnabled(false)
+      mRobustResourceInit(robustResourceInit),
+      mProgramBinaryCacheEnabled(programBinaryCacheEnabled)
 {
 }
 
@@ -113,12 +118,7 @@ State::~State()
 {
 }
 
-void State::initialize(const Context *context,
-                       bool debug,
-                       bool bindGeneratesResource,
-                       bool clientArraysEnabled,
-                       bool robustResourceInit,
-                       bool programBinaryCacheEnabled)
+void State::initialize(const Context *context)
 {
     const Caps &caps                   = context->getCaps();
     const Extensions &extensions       = context->getExtensions();
@@ -158,9 +158,6 @@ void State::initialize(const Context *context,
     mGenerateMipmapHint           = GL_DONT_CARE;
     mFragmentShaderDerivativeHint = GL_DONT_CARE;
 
-    mBindGeneratesResource = bindGeneratesResource;
-    mClientArraysEnabled   = clientArraysEnabled;
-
     mLineWidth = 1.0f;
 
     mViewport.x      = 0;
@@ -234,7 +231,6 @@ void State::initialize(const Context *context,
 
     mPrimitiveRestart = false;
 
-    mDebug.setOutputEnabled(debug);
     mDebug.setMaxLoggedMessages(extensions.maxDebugLoggedMessages);
 
     mMultiSampling    = true;
@@ -248,9 +244,6 @@ void State::initialize(const Context *context,
     mPathStencilRef  = 0;
     mPathStencilMask = std::numeric_limits<GLuint>::max();
 
-    mRobustResourceInit        = robustResourceInit;
-    mProgramBinaryCacheEnabled = programBinaryCacheEnabled;
-
     // GLES1 emulation: Initialize state for GLES1 if version
     // applies
     if (clientVersion < Version(2, 0))

src/libANGLE/State.h

@@ -38,15 +38,14 @@ struct Caps;
 class State : public angle::ObserverInterface, angle::NonCopyable
 {
   public:
-    State();
+    State(bool debug,
+          bool bindGeneratesResource,
+          bool clientArraysEnabled,
+          bool robustResourceInit,
+          bool programBinaryCacheEnabled);
     ~State() override;
 
-    void initialize(const Context *context,
-                    bool debug,
-                    bool bindGeneratesResource,
-                    bool clientArraysEnabled,
-                    bool robustResourceInit,
-                    bool programBinaryCacheEnabled);
+    void initialize(const Context *context);
     void reset(const Context *context);
 
     // State chunk getters
@@ -517,8 +516,8 @@ class State : public angle::ObserverInterface, angle::NonCopyable
     GLenum mGenerateMipmapHint;
     GLenum mFragmentShaderDerivativeHint;
 
-    bool mBindGeneratesResource;
-    bool mClientArraysEnabled;
+    const bool mBindGeneratesResource;
+    const bool mClientArraysEnabled;
 
     Rectangle mViewport;
     float mNearZ;
@@ -607,10 +606,10 @@ class State : public angle::ObserverInterface, angle::NonCopyable
     bool mFramebufferSRGB;
 
     // GL_ANGLE_robust_resource_intialization
-    bool mRobustResourceInit;
+    const bool mRobustResourceInit;
 
     // GL_ANGLE_program_cache_control
-    bool mProgramBinaryCacheEnabled;
+    const bool mProgramBinaryCacheEnabled;
 
     // GLES1 emulation: state specific to GLES1
     GLES1State mGLES1State;