Vulkan: Don't store vertex attrib format and stride.

We only use these values in vertex conversion. We can instead pass more info to the convertGPU/CPU functions. In client attribute streaming we can query the format table a second time. This is a bit slower. But the runtime of attribute streaming would usually be dominated by the conversion function time. So it shouldn't regress any real work perf. This saves on a bit of storage and memory overhead in the vertex sync functions in VertexArrayVk. Bug: angleproject:3014 Change-Id: I401eeff024664aa0efeea710503c0f619e6d4f22 Reviewed-on: https://chromium-review.googlesource.com/c/1406889 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>

Vulkan: Don't store vertex attrib format and stride.
a63cc59f · Jamie Madill · Commit Bot · c3abb7f1 · a63cc59f · a63cc59f
Commit a63cc59f authored Jan 16, 2019 by Jamie Madill Committed by Commit Bot Jan 19, 2019
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

VertexArrayVk.cpp src/libANGLE/renderer/vulkan/VertexArrayVk.cpp +0 -0

VertexArrayVk.h src/libANGLE/renderer/vulkan/VertexArrayVk.h +4 -8

No files found.
--- a/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
+++ b/src/libANGLE/renderer/vulkan/VertexArrayVk.cpp
--- a/src/libANGLE/renderer/vulkan/VertexArrayVk.h
+++ b/src/libANGLE/renderer/vulkan/VertexArrayVk.h
@@ -86,10 +86,6 @@ class VertexArrayVk : public VertexArrayImpl
                                         const void *indices);

  private:
-    void setPackedInputInfo(ContextVk *contextVk,
-                            size_t attribIndex,
-                            const gl::VertexAttribute &attrib,
-                            const gl::VertexBinding &binding);
    void setDefaultPackedInput(ContextVk *contextVk, size_t attribIndex);

    angle::Result streamIndexData(ContextVk *contextVk,
@@ -100,11 +96,13 @@ class VertexArrayVk : public VertexArrayImpl
    angle::Result convertVertexBufferGpu(ContextVk *contextVk,
                                         BufferVk *srcBuffer,
                                         const gl::VertexBinding &binding,
-                                         size_t attribIndex);
+                                         size_t attribIndex,
+                                         const vk::Format &vertexFormat);
    angle::Result convertVertexBufferCpu(ContextVk *contextVk,
                                         BufferVk *srcBuffer,
                                         const gl::VertexBinding &binding,
-                                         size_t attribIndex);
+                                         size_t attribIndex,
+                                         const vk::Format &vertexFormat);
    void ensureConversionReleased(RendererVk *renderer, size_t attribIndex);

    angle::Result syncDirtyAttrib(ContextVk *contextVk,
@@ -115,8 +113,6 @@ class VertexArrayVk : public VertexArrayImpl
    gl::AttribArray<VkBuffer> mCurrentArrayBufferHandles;
    gl::AttribArray<VkDeviceSize> mCurrentArrayBufferOffsets;
    gl::AttribArray<vk::BufferHelper *> mCurrentArrayBuffers;
-    gl::AttribArray<const vk::Format *> mCurrentArrayBufferFormats;
-    gl::AttribArray<GLuint> mCurrentArrayBufferStrides;
    gl::AttribArray<vk::DynamicBuffer> mCurrentArrayBufferConversion;
    gl::AttribArray<bool> mCurrentArrayBufferConversionCanRelease;
    VkDeviceSize mCurrentElementArrayBufferOffset;