Hash :
a53d0e18
Author :
Date :
2018-02-13T00:06:06
Vulkan: support indices in client memory. glDrawElements will now work with indices and/or vertex data in client memory, as well as in a buffer object. Enable corresponding tests. BUG=angleproject:1683 Change-Id: Iefb9796a48b21ed6f9a837b08b0ad3218ff6dd6b Reviewed-on: https://chromium-review.googlesource.com/915721 Commit-Queue: Frank Henigman <fjhenigman@chromium.org> Reviewed-by: Jamie Madill <jmadill@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 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452
//
// Copyright 2018 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.
//
// AttributeLayoutTest:
// Test various layouts of vertex attribute data:
// - in memory, in buffer object, or combination of both
// - float, integer, or combination of both
// - sequential or interleaved
#include <array>
#include <vector>
#include "test_utils/ANGLETest.h"
#include "test_utils/gl_raii.h"
using namespace angle;
namespace
{
// Test will draw these four triangles.
// clang-format off
const GLfloat triangleData[] = {
// xy rgb
0,0, 1,1,0,
-1,+1, 1,1,0,
+1,+1, 1,1,0,
0,0, 0,1,0,
+1,+1, 0,1,0,
+1,-1, 0,1,0,
0,0, 0,1,1,
+1,-1, 0,1,1,
-1,-1, 0,1,1,
0,0, 1,0,1,
-1,-1, 1,0,1,
-1,+1, 1,0,1,
};
// clang-format on
constexpr size_t kNumVertices = ArraySize(triangleData) / 5;
// A container for one or more vertex attributes.
class Container
{
public:
static constexpr size_t kSize = 1024;
void open(void) { memset(mMemory, 0xff, kSize); }
void fill(size_t numItem, size_t itemSize, const char *src, unsigned offset, unsigned stride)
{
while (numItem--)
{
ASSERT(offset + itemSize <= kSize);
memcpy(mMemory + offset, src, itemSize);
src += itemSize;
offset += stride;
}
}
virtual void close(void) {}
virtual ~Container() {}
virtual const char *getAddress() = 0;
virtual GLuint getBuffer() = 0;
protected:
char mMemory[kSize];
};
// Vertex attribute data in client memory.
class Memory : public Container
{
public:
const char *getAddress() override { return mMemory; }
GLuint getBuffer() override { return 0; }
};
// Vertex attribute data in buffer object.
class Buffer : public Container
{
public:
void close(void) override
{
glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
glBufferData(GL_ARRAY_BUFFER, sizeof(mMemory), mMemory, GL_STATIC_DRAW);
}
const char *getAddress() override { return nullptr; }
GLuint getBuffer() override { return mBuffer; }
protected:
GLBuffer mBuffer;
};
// clang-format off
template<class Type> struct GLType {};
template<> struct GLType<GLbyte > { static constexpr GLenum kGLType = GL_BYTE; };
template<> struct GLType<GLubyte > { static constexpr GLenum kGLType = GL_UNSIGNED_BYTE; };
template<> struct GLType<GLshort > { static constexpr GLenum kGLType = GL_SHORT; };
template<> struct GLType<GLushort> { static constexpr GLenum kGLType = GL_UNSIGNED_SHORT; };
template<> struct GLType<GLfloat > { static constexpr GLenum kGLType = GL_FLOAT; };
// clang-format on
// Encapsulates the data for one vertex attribute, where it lives, and how it is layed out.
class Attrib
{
public:
template <class T>
Attrib(std::shared_ptr<Container> container, unsigned offset, unsigned stride, const T &data)
: mContainer(container),
mOffset(offset),
mStride(stride),
mData(reinterpret_cast<const char *>(data.data())),
mDimension(data.size() / kNumVertices),
mAttribSize(mDimension * sizeof(typename T::value_type)),
mGLType(GLType<typename T::value_type>::kGLType)
{
// Compiler complains about unused variable without these.
(void)GLType<GLbyte>::kGLType;
(void)GLType<GLubyte>::kGLType;
(void)GLType<GLshort>::kGLType;
(void)GLType<GLushort>::kGLType;
(void)GLType<GLfloat>::kGLType;
}
void openContainer(void) const { mContainer->open(); }
void fillContainer(void) const
{
mContainer->fill(kNumVertices, mAttribSize, mData, mOffset, mStride);
}
void closeContainer(void) const { mContainer->close(); }
void enable(unsigned index) const
{
glBindBuffer(GL_ARRAY_BUFFER, mContainer->getBuffer());
glVertexAttribPointer(index, static_cast<int>(mDimension), mGLType, GL_FALSE, mStride,
mContainer->getAddress() + mOffset);
glEnableVertexAttribArray(index);
}
bool inClientMemory(void) const { return mContainer->getAddress() != nullptr; }
protected:
std::shared_ptr<Container> mContainer;
unsigned mOffset;
unsigned mStride;
const char *mData;
size_t mDimension;
size_t mAttribSize;
GLenum mGLType;
};
typedef std::vector<Attrib> TestCase;
void PrepareTestCase(const TestCase &tc)
{
for (const Attrib &a : tc)
{
a.openContainer();
}
for (const Attrib &a : tc)
{
a.fillContainer();
}
for (const Attrib &a : tc)
{
a.closeContainer();
}
unsigned i = 0;
for (const Attrib &a : tc)
{
a.enable(i++);
}
}
template <class Type, size_t Dimension>
using VertexData = std::array<Type, Dimension * kNumVertices>;
class AttributeLayoutTest : public ANGLETest
{
protected:
AttributeLayoutTest() : mProgram(0)
{
setWindowWidth(128);
setWindowHeight(128);
setConfigRedBits(8);
setConfigGreenBits(8);
setConfigBlueBits(8);
setConfigAlphaBits(8);
}
void PrepareVertexData(void);
void GetTestCases(void);
void SetUp() override
{
ANGLETest::SetUp();
glClearColor(.2f, .2f, .2f, .0f);
glClear(GL_COLOR_BUFFER_BIT);
glDisable(GL_DEPTH_TEST);
const std::string vertexSource =
"attribute mediump vec2 coord;\n"
"attribute mediump vec3 color;\n"
"varying mediump vec3 vcolor;\n"
"void main(void)\n"
"{\n"
" gl_Position = vec4(coord, 0, 1);\n"
" vcolor = color;\n"
"}\n";
const std::string fragmentSource =
"varying mediump vec3 vcolor;\n"
"void main(void)\n"
"{\n"
" gl_FragColor = vec4(vcolor, 0);\n"
"}\n";
mProgram = CompileProgram(vertexSource, fragmentSource);
ASSERT_NE(0u, mProgram);
glUseProgram(mProgram);
glGenBuffers(1, &mIndexBuffer);
PrepareVertexData();
GetTestCases();
}
void TearDown() override
{
mTestCases.clear();
glDeleteProgram(mProgram);
glDeleteBuffers(1, &mIndexBuffer);
ANGLETest::TearDown();
}
virtual bool Skip(const TestCase &) { return false; }
virtual void Draw(int firstVertex, unsigned vertexCount, const GLushort *indices) = 0;
void Run(bool drawFirstTriangle)
{
glViewport(0, 0, getWindowWidth(), getWindowHeight());
glUseProgram(mProgram);
for (unsigned i = 0; i < mTestCases.size(); ++i)
{
if (Skip(mTestCases[i]))
continue;
PrepareTestCase(mTestCases[i]);
glClear(GL_COLOR_BUFFER_BIT);
std::string testCase;
if (drawFirstTriangle)
{
Draw(0, kNumVertices, mIndices);
testCase = "draw";
}
else
{
Draw(3, kNumVertices - 3, mIndices + 3);
testCase = "skip";
}
testCase += " first triangle case ";
int w = getWindowWidth() / 4;
int h = getWindowHeight() / 4;
if (drawFirstTriangle)
{
EXPECT_PIXEL_EQ(w * 2, h * 3, 255, 255, 0, 0) << testCase << i;
}
else
{
EXPECT_PIXEL_EQ(w * 2, h * 3, 51, 51, 51, 0) << testCase << i;
}
EXPECT_PIXEL_EQ(w * 3, h * 2, 0, 255, 0, 0) << testCase << i;
EXPECT_PIXEL_EQ(w * 2, h * 1, 0, 255, 255, 0) << testCase << i;
EXPECT_PIXEL_EQ(w * 1, h * 2, 255, 0, 255, 0) << testCase << i;
}
}
static const GLushort mIndices[kNumVertices];
GLuint mProgram;
GLuint mIndexBuffer;
std::vector<TestCase> mTestCases;
VertexData<GLfloat, 2> mCoord;
VertexData<GLfloat, 3> mColor;
VertexData<GLbyte, 3> mBColor;
};
const GLushort AttributeLayoutTest::mIndices[kNumVertices] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
void AttributeLayoutTest::PrepareVertexData(void)
{
mCoord.fill(0);
mColor.fill(0);
mBColor.fill(0);
for (unsigned i = 0; i < kNumVertices; ++i)
{
GLfloat x = triangleData[i * 5 + 0];
GLfloat y = triangleData[i * 5 + 1];
GLfloat r = triangleData[i * 5 + 2];
GLfloat g = triangleData[i * 5 + 3];
GLfloat b = triangleData[i * 5 + 4];
mCoord[i * 2 + 0] = x;
mCoord[i * 2 + 1] = y;
mColor[i * 3 + 0] = r;
mColor[i * 3 + 1] = g;
mColor[i * 3 + 2] = b;
mBColor[i * 3 + 0] = r;
mBColor[i * 3 + 1] = g;
mBColor[i * 3 + 2] = b;
}
}
void AttributeLayoutTest::GetTestCases(void)
{
std::shared_ptr<Container> M0 = std::make_shared<Memory>();
std::shared_ptr<Container> M1 = std::make_shared<Memory>();
std::shared_ptr<Container> B0 = std::make_shared<Buffer>();
std::shared_ptr<Container> B1 = std::make_shared<Buffer>();
// 0. two buffers
mTestCases.push_back({Attrib(B0, 0, 8, mCoord), Attrib(B1, 0, 12, mColor)});
// 1. two memory
mTestCases.push_back({Attrib(M0, 0, 8, mCoord), Attrib(M1, 0, 12, mColor)});
// 2. one memory, sequential
mTestCases.push_back({Attrib(M0, 0, 8, mCoord), Attrib(M0, 96, 12, mColor)});
// 3. one memory, interleaved
mTestCases.push_back({Attrib(M0, 0, 20, mCoord), Attrib(M0, 8, 20, mColor)});
// 4. buffer and memory
mTestCases.push_back({Attrib(B0, 0, 8, mCoord), Attrib(M0, 0, 12, mColor)});
// 5. stride != size
mTestCases.push_back({Attrib(B0, 0, 16, mCoord), Attrib(B1, 0, 12, mColor)});
if (IsVulkan())
{
std::cout << "cases skipped on Vulkan: integer data, non-zero buffer offsets" << std::endl;
return;
}
// 6. one buffer, sequential
mTestCases.push_back({Attrib(B0, 0, 8, mCoord), Attrib(B0, 96, 12, mColor)});
// 7. one buffer, interleaved
mTestCases.push_back({Attrib(B0, 0, 20, mCoord), Attrib(B0, 8, 20, mColor)});
// 8. memory and buffer, float and integer
mTestCases.push_back({Attrib(M0, 0, 8, mCoord), Attrib(B0, 0, 12, mBColor)});
// 9. buffer and memory, unusual offset and stride
mTestCases.push_back({Attrib(B0, 11, 13, mCoord), Attrib(M0, 23, 17, mColor)});
}
class AttributeLayoutNonIndexed : public AttributeLayoutTest
{
void Draw(int firstVertex, unsigned vertexCount, const GLushort *indices) override
{
glDrawArrays(GL_TRIANGLES, firstVertex, vertexCount);
}
};
class AttributeLayoutMemoryIndexed : public AttributeLayoutTest
{
void Draw(int firstVertex, unsigned vertexCount, const GLushort *indices) override
{
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
glDrawElements(GL_TRIANGLES, vertexCount, GL_UNSIGNED_SHORT, indices);
}
};
class AttributeLayoutBufferIndexed : public AttributeLayoutTest
{
void Draw(int firstVertex, unsigned vertexCount, const GLushort *indices) override
{
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(*mIndices) * vertexCount, indices,
GL_STATIC_DRAW);
glDrawElements(GL_TRIANGLES, vertexCount, GL_UNSIGNED_SHORT, nullptr);
}
};
TEST_P(AttributeLayoutNonIndexed, Test)
{
Run(true);
if (IsWindows() && IsAMD() && IsOpenGL())
{
std::cout << "test skipped on Windows ATI OpenGL: non-indexed non-zero vertex start"
<< std::endl;
return;
}
Run(false);
}
TEST_P(AttributeLayoutMemoryIndexed, Test)
{
Run(true);
if (IsWindows() && IsAMD() && (IsOpenGL() || GetParam() == ES2_D3D11_FL9_3()))
{
std::cout << "test skipped on Windows ATI OpenGL and D3D11_9_3: indexed non-zero vertex start"
<< std::endl;
return;
}
Run(false);
}
TEST_P(AttributeLayoutBufferIndexed, Test)
{
Run(true);
if (IsWindows() && IsAMD() && (IsOpenGL() || GetParam() == ES2_D3D11_FL9_3()))
{
std::cout << "test skipped on Windows ATI OpenGL and D3D11_9_3: indexed non-zero vertex start"
<< std::endl;
return;
}
Run(false);
}
#define PARAMS \
ES2_VULKAN(), ES2_OPENGL(), ES2_D3D9(), ES2_D3D11(), ES2_D3D11_FL9_3(), ES3_OPENGL(), \
ES2_OPENGLES(), ES3_OPENGLES()
ANGLE_INSTANTIATE_TEST(AttributeLayoutNonIndexed, PARAMS);
ANGLE_INSTANTIATE_TEST(AttributeLayoutMemoryIndexed, PARAMS);
ANGLE_INSTANTIATE_TEST(AttributeLayoutBufferIndexed, PARAMS);
} // anonymous namespace