Hash :
f197ebac
Author :
Date :
2020-11-16T15:16:56
Vulkan: Add EXT_external_buffer support Addition of buffer support for external memory Also adds new end2end tests for these usecases * SubData update * map/unmap buffer * dispatch compute with external buffer Bug: angleproject:5073 Test: ExternalBufferTestES31.*Vulkan Change-Id: Ib3cccaca77b76830effe49d3731782552e7424ec Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2525105 Commit-Queue: Mohan Maiya <m.maiya@samsung.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228
//
// Copyright 2020 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// ExternalBufferTest:
// Tests the correctness of external buffer ext extension.
//
#include "test_utils/ANGLETest.h"
#include "test_utils/gl_raii.h"
#include "util/EGLWindow.h"
#include "common/android_util.h"
#if defined(ANGLE_PLATFORM_ANDROID) && __ANDROID_API__ >= 26
# define ANGLE_AHARDWARE_BUFFER_SUPPORT
// NDK header file for access to Android Hardware Buffers
# include <android/hardware_buffer.h>
#endif
namespace angle
{
class ExternalBufferTestES31 : public ANGLETest
{
protected:
ExternalBufferTestES31()
{
setWindowWidth(16);
setWindowHeight(16);
setConfigRedBits(8);
setConfigGreenBits(8);
setConfigBlueBits(8);
setConfigAlphaBits(8);
setConfigDepthBits(24);
}
AHardwareBuffer *createAndroidHardwareBuffer(size_t size, const GLubyte *data)
{
#if defined(ANGLE_AHARDWARE_BUFFER_SUPPORT)
// The height and width are number of pixels of size format
AHardwareBuffer_Desc aHardwareBufferDescription = {};
aHardwareBufferDescription.width = size;
aHardwareBufferDescription.height = 1;
aHardwareBufferDescription.layers = 1;
aHardwareBufferDescription.format = AHARDWAREBUFFER_FORMAT_BLOB;
aHardwareBufferDescription.usage =
AHARDWAREBUFFER_USAGE_CPU_READ_RARELY | AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER;
aHardwareBufferDescription.stride = 0;
// Allocate memory from Android Hardware Buffer
AHardwareBuffer *aHardwareBuffer = nullptr;
EXPECT_EQ(0, AHardwareBuffer_allocate(&aHardwareBufferDescription, &aHardwareBuffer));
void *mappedMemory = nullptr;
EXPECT_EQ(0, AHardwareBuffer_lock(aHardwareBuffer, AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY,
-1, nullptr, &mappedMemory));
// Need to grab the stride the implementation might have enforced
AHardwareBuffer_describe(aHardwareBuffer, &aHardwareBufferDescription);
memcpy(mappedMemory, data, size);
EXPECT_EQ(0, AHardwareBuffer_unlock(aHardwareBuffer, nullptr));
return aHardwareBuffer;
#else
return nullptr;
#endif // ANGLE_PLATFORM_ANDROID
}
void destroyAndroidHardwareBuffer(AHardwareBuffer *aHardwareBuffer)
{
#if defined(ANGLE_AHARDWARE_BUFFER_SUPPORT)
AHardwareBuffer_release(aHardwareBuffer);
#endif
}
void *lockAndroidHardwareBuffer(AHardwareBuffer *aHardwareBuffer)
{
void *data = nullptr;
#if defined(ANGLE_AHARDWARE_BUFFER_SUPPORT)
EXPECT_EQ(0, AHardwareBuffer_lock(aHardwareBuffer, AHARDWAREBUFFER_USAGE_CPU_READ_RARELY,
-1, nullptr, &data));
#endif
return data;
}
void unlockAndroidHardwareBuffer(AHardwareBuffer *aHardwareBuffer)
{
#if defined(ANGLE_AHARDWARE_BUFFER_SUPPORT)
AHardwareBuffer_unlock(aHardwareBuffer, nullptr);
#endif
}
};
// Testing subdata update with external buffer from AHB
TEST_P(ExternalBufferTestES31, BufferSubData)
{
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_external_buffer") ||
!IsGLExtensionEnabled("GL_EXT_buffer_storage"));
constexpr uint8_t kBufferSize = 16;
std::vector<GLubyte> initData(kBufferSize, 0xA);
// Create the Image
AHardwareBuffer *aHardwareBuffer;
constexpr GLbitfield kFlags = GL_DYNAMIC_STORAGE_BIT_EXT;
aHardwareBuffer = createAndroidHardwareBuffer(kBufferSize, initData.data());
GLBuffer buffer;
glBindBuffer(GL_SHADER_STORAGE_BUFFER, buffer);
glBufferStorageExternalEXT(GL_SHADER_STORAGE_BUFFER, 0, kBufferSize,
eglGetNativeClientBufferANDROID(aHardwareBuffer), kFlags);
ASSERT_GL_NO_ERROR();
std::vector<GLubyte> expectedData(kBufferSize, 0xFF);
glBufferSubData(GL_SHADER_STORAGE_BUFFER, 0, kBufferSize, expectedData.data());
glFinish();
ASSERT_GL_NO_ERROR();
// Inspect the data written into the buffer using CPU access.
uint8_t *data = static_cast<uint8_t *>(lockAndroidHardwareBuffer(aHardwareBuffer));
for (uint32_t i = 0; i < kBufferSize; ++i)
{
EXPECT_EQ(data[i], 0xFF);
}
unlockAndroidHardwareBuffer(aHardwareBuffer);
// Delete the source AHB when in use
destroyAndroidHardwareBuffer(aHardwareBuffer);
}
// Testing dispatch compute shader external from source AHB
TEST_P(ExternalBufferTestES31, DispatchCompute)
{
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_external_buffer") ||
!IsGLExtensionEnabled("GL_EXT_buffer_storage"));
constexpr char kCS[] = R"(#version 310 es
layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
layout(std430, binding=0) buffer Output {
uint data[];
} bOutput;
void main() {
bOutput.data[gl_GlobalInvocationID.x] =
gl_GlobalInvocationID.x * 3u;
}
)";
constexpr uint8_t kBufferSize = 16 * 4;
std::vector<GLubyte> initData(kBufferSize, 0xA);
// Create the Image
AHardwareBuffer *aHardwareBuffer;
constexpr GLbitfield kFlags = GL_MAP_READ_BIT;
aHardwareBuffer = createAndroidHardwareBuffer(kBufferSize, initData.data());
GLBuffer buffer;
glBindBuffer(GL_SHADER_STORAGE_BUFFER, buffer);
glBufferStorageExternalEXT(GL_SHADER_STORAGE_BUFFER, 0, kBufferSize,
eglGetNativeClientBufferANDROID(aHardwareBuffer), kFlags);
ASSERT_GL_NO_ERROR();
GLProgram program;
program.makeCompute(kCS);
ASSERT_NE(program.get(), 0U);
ASSERT_GL_NO_ERROR();
glUseProgram(program);
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 0, buffer);
glDispatchCompute(kBufferSize, 1, 1);
glFinish();
ASSERT_GL_NO_ERROR();
// Inspect the data written into the buffer using CPU access.
uint32_t *data = static_cast<uint32_t *>(lockAndroidHardwareBuffer(aHardwareBuffer));
for (uint32_t i = 0; i < (kBufferSize / sizeof(uint32_t)); ++i)
{
EXPECT_EQ(data[i], static_cast<uint32_t>(i * 3));
}
unlockAndroidHardwareBuffer(aHardwareBuffer);
// Delete the source AHB when in use
destroyAndroidHardwareBuffer(aHardwareBuffer);
}
// Test interaction between GL_OES_mapbuffer and GL_EXT_external_buffer extensions.
TEST_P(ExternalBufferTestES31, MapBuffer)
{
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_external_buffer") ||
!IsGLExtensionEnabled("GL_EXT_buffer_storage") ||
!IsGLExtensionEnabled("GL_EXT_map_buffer_range"));
constexpr uint8_t kBufferSize = 16;
std::vector<GLubyte> initData(kBufferSize, 0xFF);
// Create the Image
AHardwareBuffer *aHardwareBuffer;
constexpr GLbitfield kFlags = (GL_MAP_READ_BIT_EXT | GL_MAP_WRITE_BIT_EXT);
aHardwareBuffer = createAndroidHardwareBuffer(kBufferSize, initData.data());
GLBuffer buffer;
glBindBuffer(GL_SHADER_STORAGE_BUFFER, buffer);
glBufferStorageExternalEXT(GL_SHADER_STORAGE_BUFFER, 0, kBufferSize,
eglGetNativeClientBufferANDROID(aHardwareBuffer), kFlags);
ASSERT_GL_NO_ERROR();
// Inspect the data written into the buffer using CPU access.
uint8_t *data = static_cast<uint8_t *>(
glMapBufferRangeEXT(GL_SHADER_STORAGE_BUFFER, 0, kBufferSize, GL_MAP_READ_BIT_EXT));
ASSERT_GL_NO_ERROR();
for (uint32_t i = 0; i < kBufferSize; ++i)
{
EXPECT_EQ(data[i], 0xFF);
}
glUnmapBufferOES(GL_SHADER_STORAGE_BUFFER);
// Delete the source AHB when in use
destroyAndroidHardwareBuffer(aHardwareBuffer);
}
ANGLE_INSTANTIATE_TEST_ES31(ExternalBufferTestES31);
} // namespace angle