Context: init impl before creating objects.

This eliminates a potential invalid access that would turn up in the Vulkan back-end. Also init a couple uninitialized variables. Should fix an ASSERT in the Vulkan back-end when running WebGL tests. Bug: chromium:1085627 Change-Id: I153f8dd83f567345b964b68784940d11712e7804 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2212498 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>

Context: init impl before creating objects.
6789018a · Jamie Madill · Commit Bot · cbbfde6c · 6789018a · 6789018a
Commit 6789018a authored May 25, 2020 by Jamie Madill Committed by Commit Bot May 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Context.cpp src/libANGLE/Context.cpp +2 -2

ContextVk.cpp src/libANGLE/renderer/vulkan/ContextVk.cpp +3 -0

No files found.
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -405,6 +405,8 @@ void Context::initialize()

    mState.initializeZeroTextures(this, mZeroTextures);

+    ANGLE_CONTEXT_TRY(mImplementation->initialize());
+
    bindVertexArray({0});

    if (getClientVersion() >= Version(3, 0))
@@ -497,8 +499,6 @@ void Context::initialize()
    mCopyImageDirtyBits.set(State::DIRTY_BIT_READ_FRAMEBUFFER_BINDING);
    mCopyImageDirtyObjects.set(State::DIRTY_OBJECT_READ_FRAMEBUFFER);

-    ANGLE_CONTEXT_TRY(mImplementation->initialize());
-
    // Initialize overlay after implementation is initialized.
    ANGLE_CONTEXT_TRY(mOverlay.init(this));
 }

--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -640,6 +640,8 @@ ContextVk::ContextVk(const gl::State &state, gl::ErrorSet *errorSet, RendererVk 
      mEmulateSeamfulCubeMapSampling(false),
      mUseOldRewriteStructSamplers(false),
      mPoolAllocator(kDefaultPoolAllocatorPageSize, 1),
+      mOutsideRenderPassCommands(nullptr),
+      mRenderPassCommands(nullptr),
      mHasPrimaryCommands(false),
      mGpuEventsEnabled(false),
      mGpuClockSync{std::numeric_limits<double>::max(), std::numeric_limits<double>::max()},
@@ -3683,6 +3685,7 @@ bool ContextVk::shouldFlush()

 bool ContextVk::hasRecordedCommands()
 {
+    ASSERT(mOutsideRenderPassCommands && mRenderPassCommands);
    return !mOutsideRenderPassCommands->empty() || !mRenderPassCommands->empty() ||
           mHasPrimaryCommands;
 }