Hash :
6b4962e8
Author :
Date :
2020-09-22T16:37:16
Allow GL_UNSIGNED_BYTE as a type for glColorPointer
Previously glColorPointer would reject GL_UNSIGNED_BYTE.
This should be allowed in both the gles 1 and 1.1 specifications.
See page 6 of the gles 1 specification and page 20 of the gles 1.1
specification.
This change allows doodle jump to work on angle on both the gl
and vulkan backend
Bug: angleproject:4308
Tests: angle_end2end_tests
--gtest_filter=VertexPointerTest.AssignRetrieveColorUnsignedByte*
Change-Id: I35f41b28d94cb34bc36256420b57793691b78cff
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2424465
Commit-Queue: Mohan Maiya <m.maiya@samsung.com>
Reviewed-by: Cody Northrop <cnorthrop@google.com>
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
//
// 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.
//
// VertexPointerTest.cpp: Tests basic usage of built-in vertex attributes of GLES1.
#include "test_utils/ANGLETest.h"
#include "test_utils/gl_raii.h"
using namespace angle;
class VertexPointerTest : public ANGLETest
{
protected:
VertexPointerTest()
{
setWindowWidth(32);
setWindowHeight(32);
setConfigRedBits(8);
setConfigGreenBits(8);
setConfigBlueBits(8);
setConfigAlphaBits(8);
setConfigDepthBits(24);
}
};
// Checks that we can assign to client side vertex arrays
TEST_P(VertexPointerTest, AssignRetrieve)
{
std::vector<float> testVertexAttribute = {
1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
};
glVertexPointer(4, GL_FLOAT, 0, testVertexAttribute.data());
EXPECT_GL_NO_ERROR();
void *ptr = nullptr;
glGetPointerv(GL_VERTEX_ARRAY_POINTER, &ptr);
EXPECT_EQ(testVertexAttribute.data(), ptr);
glColorPointer(4, GL_FLOAT, 0, testVertexAttribute.data() + 4);
glGetPointerv(GL_COLOR_ARRAY_POINTER, &ptr);
EXPECT_EQ(testVertexAttribute.data() + 4, ptr);
glNormalPointer(GL_FLOAT, 0, testVertexAttribute.data() + 8);
glGetPointerv(GL_NORMAL_ARRAY_POINTER, &ptr);
EXPECT_EQ(testVertexAttribute.data() + 8, ptr);
glPointSizePointerOES(GL_FLOAT, 0, testVertexAttribute.data() + 8);
glGetPointerv(GL_POINT_SIZE_ARRAY_POINTER_OES, &ptr);
EXPECT_EQ(testVertexAttribute.data() + 8, ptr);
GLint maxTextureUnits;
glGetIntegerv(GL_MAX_TEXTURE_UNITS, &maxTextureUnits);
for (int i = 0; i < maxTextureUnits; i++)
{
glClientActiveTexture(GL_TEXTURE0 + i);
glTexCoordPointer(4, GL_FLOAT, 0, testVertexAttribute.data() + i * 4);
glGetPointerv(GL_TEXTURE_COORD_ARRAY_POINTER, &ptr);
EXPECT_EQ(testVertexAttribute.data() + i * 4, ptr);
}
}
// Checks that we can assign to client side vertex arrays with color vertex attributes of type
// GLubyte
TEST_P(VertexPointerTest, AssignRetrieveColorUnsignedByte)
{
std::vector<float> testVertexAttribute = {
1.0f,
1.0f,
1.0f,
1.0f,
};
std::vector<GLubyte> testColorAttribute = {
1,
1,
1,
1,
};
glVertexPointer(4, GL_FLOAT, 0, testVertexAttribute.data());
EXPECT_GL_NO_ERROR();
void *ptr = nullptr;
glGetPointerv(GL_VERTEX_ARRAY_POINTER, &ptr);
EXPECT_EQ(testVertexAttribute.data(), ptr);
glColorPointer(4, GL_UNSIGNED_BYTE, 0, testColorAttribute.data());
glGetPointerv(GL_COLOR_ARRAY_POINTER, &ptr);
EXPECT_EQ(testColorAttribute.data(), ptr);
ASSERT_GL_NO_ERROR();
}
ANGLE_INSTANTIATE_TEST_ES1(VertexPointerTest);