Vulkan: Use RenderTargetCache in FramebufferVk.

src/libANGLE/Framebuffer.h

@@ -133,7 +133,7 @@ class FramebufferState final : angle::NonCopyable
     angle::BitSet<IMPLEMENTATION_MAX_FRAMEBUFFER_ATTACHMENTS + 2> mResourceNeedsInit;
 };
 
-class Framebuffer final : public LabeledObject, public angle::ObserverInterface
+class Framebuffer final : public angle::ObserverInterface, public LabeledObject
 {
   public:
     // Constructor to build application-defined framebuffers

src/libANGLE/renderer/RenderTargetCache.h

@@ -35,6 +35,8 @@ class RenderTargetCache final : angle::NonCopyable
     const RenderTargetArray &getColors() const;
     RenderTargetT *getDepthStencil() const;
 
+    RenderTargetT *getColorRead(const gl::FramebufferState &state) const;
+
   private:
     void updateCachedRenderTarget(const gl::Context *context,
                                   const gl::FramebufferAttachment *attachment,
@@ -142,6 +144,15 @@ void RenderTargetCache<RenderTargetT>::updateCachedRenderTarget(
     *cachedRenderTarget = newRenderTarget;
 }
 
+template <typename RenderTargetT>
+RenderTargetT *RenderTargetCache<RenderTargetT>::getColorRead(
+    const gl::FramebufferState &state) const
+{
+    ASSERT(mColorRenderTargets[state.getReadIndex()] &&
+           state.getReadIndex() < mColorRenderTargets.size());
+    return mColorRenderTargets[state.getReadIndex()];
+}
+
 }  // namespace rx
 
 #endif  // LIBANGLE_RENDERER_RENDER_TARGET_CACHE_H_

src/libANGLE/renderer/d3d/d3d11/VertexArray11.h

@@ -19,7 +19,7 @@ namespace rx
 {
 class Renderer11;
 
-class VertexArray11 : public VertexArrayImpl, public angle::ObserverInterface
+class VertexArray11 : public angle::ObserverInterface, public VertexArrayImpl
 {
   public:
     VertexArray11(const gl::VertexArrayState &data);

src/libANGLE/renderer/vulkan/FramebufferVk.h

@@ -11,6 +11,7 @@
 #define LIBANGLE_RENDERER_VULKAN_FRAMEBUFFERVK_H_
 
 #include "libANGLE/renderer/FramebufferImpl.h"
+#include "libANGLE/renderer/RenderTargetCache.h"
 #include "libANGLE/renderer/vulkan/vk_cache_utils.h"
 
 namespace rx
@@ -102,6 +103,7 @@ class FramebufferVk : public FramebufferImpl, public ResourceVk
     Optional<vk::RenderPassDesc> mRenderPassDesc;
     vk::Framebuffer mFramebuffer;
     Serial mLastRenderNodeSerial;
+    RenderTargetCache<RenderTargetVk> mRenderTargetCache;
 };
 
 }  // namespace rx