commit e1f3ad4d886cd997e5c343bb4b940daae7961f13
author Jamie Madill <jmadill@chromium.org> Sat Oct 28 23:00:42 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Nov 02 13:24:44 2017 +0000
tree f93c52530a8f5065e9480264a518ff7edb0c4572
parent 7bd166668f8c90216f8db85254cfd420134503fc

Vulkan: Add vk::GetImpl helper.

Using reflection helpers, we can avoid having to pass the return
type to the GetImpl method.

BUG=angleproject:2200

Change-Id: Id160fbdf0ea8b3de2f219d3cc92394c678189a48
Reviewed-on: https://chromium-review.googlesource.com/742371
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/renderer/vulkan/ContextVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/ContextVk.cpp b/src/libANGLE/renderer/vulkan/ContextVk.cpp
index d7d2503..e93309f 100644
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -257,10 +257,10 @@
     const auto &state     = mState.getState();
     const auto &programGL = state.getProgram();
     const auto &vao       = state.getVertexArray();
-    const auto &programVk = GetImplAs<ProgramVk>(programGL);
     const auto *drawFBO   = state.getDrawFramebuffer();
-    FramebufferVk *vkFBO  = GetImplAs<FramebufferVk>(drawFBO);
-    VertexArrayVk *vkVAO  = GetImplAs<VertexArrayVk>(vao);
+    ProgramVk *programVk  = vk::GetImpl(programGL);
+    FramebufferVk *vkFBO  = vk::GetImpl(drawFBO);
+    VertexArrayVk *vkVAO  = vk::GetImpl(vao);
 
     // Ensure the attribs and bindings are updated.
     vkVAO->updateVertexDescriptions(context);
@@ -309,11 +309,11 @@
 
     const auto &state     = mState.getState();
     const auto &programGL = state.getProgram();
-    ProgramVk *programVk  = GetImplAs<ProgramVk>(programGL);
+    ProgramVk *programVk  = vk::GetImpl(programGL);
     const auto &vao       = state.getVertexArray();
-    VertexArrayVk *vkVAO  = GetImplAs<VertexArrayVk>(vao);
+    VertexArrayVk *vkVAO  = vk::GetImpl(vao);
     const auto *drawFBO   = state.getDrawFramebuffer();
-    FramebufferVk *vkFBO  = GetImplAs<FramebufferVk>(drawFBO);
+    FramebufferVk *vkFBO  = vk::GetImpl(drawFBO);
     Serial queueSerial    = mRenderer->getCurrentQueueSerial();
     uint32_t maxAttrib    = programGL->getState().getMaxActiveAttribLocation();
 
@@ -336,7 +336,7 @@
     vkVAO->updateCurrentBufferSerials(programGL->getActiveAttribLocationsMask(), queueSerial);
 
     // TODO(jmadill): Can probably use more dirty bits here.
-    ContextVk *contextVk = GetImplAs<ContextVk>(context);
+    ContextVk *contextVk = vk::GetImpl(context);
     ANGLE_TRY(programVk->updateUniforms(contextVk));
     programVk->updateTexturesDescriptorSet(contextVk);
 
@@ -406,7 +406,7 @@
         mState.getState().getVertexArray()->getElementArrayBuffer().get();
     ASSERT(elementArrayBuffer);
 
-    BufferVk *elementArrayBufferVk = GetImplAs<BufferVk>(elementArrayBuffer);
+    BufferVk *elementArrayBufferVk = vk::GetImpl(elementArrayBuffer);
 
     commandBuffer->bindIndexBuffer(elementArrayBufferVk->getVkBuffer(), 0, GetVkIndexType(type));
     commandBuffer->drawIndexed(count, 1, 0, 0, 0);
@@ -707,12 +707,12 @@
             case gl::State::DIRTY_BIT_PROGRAM_EXECUTABLE:
             {
                 // { vertex, fragment }
-                ProgramVk *programVk           = GetImplAs<ProgramVk>(glState.getProgram());
+                ProgramVk *programVk           = vk::GetImpl(glState.getProgram());
                 mCurrentShaderStages[0].module = programVk->getLinkedVertexModule().getHandle();
                 mCurrentShaderStages[1].module = programVk->getLinkedFragmentModule().getHandle();
 
                 // Also invalidate the vertex descriptions cache in the Vertex Array.
-                VertexArrayVk *vaoVk = GetImplAs<VertexArrayVk>(glState.getVertexArray());
+                VertexArrayVk *vaoVk = vk::GetImpl(glState.getVertexArray());
                 vaoVk->invalidateVertexDescriptions();
 
                 dirtyTextures = true;
@@ -761,7 +761,7 @@
 
     if (dirtyTextures)
     {
-        ProgramVk *programVk = GetImplAs<ProgramVk>(glState.getProgram());
+        ProgramVk *programVk = vk::GetImpl(glState.getProgram());
         programVk->invalidateTextures();
     }
 }