commit a932b6b51505763b4569d4378e98db7d319df62d
author Luc Ferron <lucferron@chromium.org> Tue May 01 07:53:17 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Wed May 09 19:32:31 2018 +0000
tree 1367a6678be65922f5074b8e09c2d9b0fb4959e2
parent 9568037db4461d85e1875ecbc766dc6a4395cbab

Vulkan: Fix in DynamicBuffer, allocating too many buffers for no reason

-Enables more dEQP tests in functional.texture.filtering
-texture.filtering.cube.* tests don't work yet, another CL will be
targeted at fixing that after this one.

Bug: angleproject:2505
Change-Id: Ic634e0deafa54e8e8ebd0efbdae14263ffdbcef0
Reviewed-on: https://chromium-review.googlesource.com/1037183
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Luc Ferron <lucferron@chromium.org>

src/libANGLE/renderer/vulkan/vk_helpers.cpp

diff --git a/src/libANGLE/renderer/vulkan/vk_helpers.cpp b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
index d9b9579..a8a72e3 100644
--- a/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
@@ -161,8 +161,7 @@
         ANGLE_TRY(mBuffer.init(device, createInfo));
 
         ANGLE_TRY(AllocateBufferMemory(renderer, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &mBuffer,
-                                       &mMemory, &sizeToAllocate));
-        mSize = sizeToAllocate;
+                                       &mMemory, &mSize));
 
         ANGLE_TRY(mMemory.map(device, 0, mSize, 0, &mMappedMemory));
         mNextWriteOffset = 0;
@@ -189,7 +188,6 @@
     *ptrOut    = mMappedMemory + mNextWriteOffset;
     *offsetOut = mNextWriteOffset;
     mNextWriteOffset += static_cast<uint32_t>(sizeToAllocate);
-
     return NoError();
 }
 

src/tests/deqp_support/deqp_gles2_test_expectations.txt

diff --git a/src/tests/deqp_support/deqp_gles2_test_expectations.txt b/src/tests/deqp_support/deqp_gles2_test_expectations.txt
index 15c86d4..17250f5 100644
--- a/src/tests/deqp_support/deqp_gles2_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles2_test_expectations.txt
@@ -191,8 +191,6 @@
 2161 VULKAN : dEQP-GLES2.functional.light_amount.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.shaders.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.texture.filtering.cube.* = SKIP
-2161 VULKAN : dEQP-GLES2.functional.texture.filtering.nearest_mipmap_* = SKIP
-2161 VULKAN : dEQP-GLES2.functional.texture.filtering.linear_mipmap_* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.texture.mipmap.2d.generate.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.texture.mipmap.cube.generate.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.texture.specification.basic_copytex* = SKIP