Skip to content

A
angle
Commit a932b6b5 by Luc Ferron Committed by Commit Bot
Options

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/1037183Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Luc Ferron <lucferron@chromium.org>
parent 9568037d
Showing with 1 addition and 5 deletions
src/libANGLE/renderer/vulkan/vk_helpers.cpp
...@@ -161,8 +161,7 @@ Error DynamicBuffer::allocate(RendererVk *renderer, ...@@ -161,8 +161,7 @@ Error DynamicBuffer::allocate(RendererVk *renderer,
ANGLE_TRY(mBuffer.init(device, createInfo)); ANGLE_TRY(mBuffer.init(device, createInfo));
ANGLE_TRY(AllocateBufferMemory(renderer, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &mBuffer, ANGLE_TRY(AllocateBufferMemory(renderer, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &mBuffer,
&mMemory, &sizeToAllocate)); &mMemory, &mSize));
mSize = sizeToAllocate;
ANGLE_TRY(mMemory.map(device, 0, mSize, 0, &mMappedMemory)); ANGLE_TRY(mMemory.map(device, 0, mSize, 0, &mMappedMemory));
mNextWriteOffset = 0; mNextWriteOffset = 0;
...@@ -189,7 +188,6 @@ Error DynamicBuffer::allocate(RendererVk *renderer, ...@@ -189,7 +188,6 @@ Error DynamicBuffer::allocate(RendererVk *renderer,
*ptrOut = mMappedMemory + mNextWriteOffset; *ptrOut = mMappedMemory + mNextWriteOffset;
*offsetOut = mNextWriteOffset; *offsetOut = mNextWriteOffset;
mNextWriteOffset += static_cast<uint32_t>(sizeToAllocate); mNextWriteOffset += static_cast<uint32_t>(sizeToAllocate);
return NoError(); return NoError();
} }
......
src/tests/deqp_support/deqp_gles2_test_expectations.txt
...@@ -191,8 +191,6 @@ ...@@ -191,8 +191,6 @@
2161 VULKAN : dEQP-GLES2.functional.light_amount.* = SKIP 2161 VULKAN : dEQP-GLES2.functional.light_amount.* = SKIP
2161 VULKAN : dEQP-GLES2.functional.shaders.* = SKIP 2161 VULKAN : dEQP-GLES2.functional.shaders.* = SKIP
2161 VULKAN : dEQP-GLES2.functional.texture.filtering.cube.* = 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.2d.generate.* = SKIP
2161 VULKAN : dEQP-GLES2.functional.texture.mipmap.cube.generate.* = SKIP 2161 VULKAN : dEQP-GLES2.functional.texture.mipmap.cube.generate.* = SKIP
2161 VULKAN : dEQP-GLES2.functional.texture.specification.basic_copytex* = SKIP 2161 VULKAN : dEQP-GLES2.functional.texture.specification.basic_copytex* = SKIP
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment