Skip to content

A
angle
Commit b759a748 by Jamie Madill
Options

Fix test class names to reflect their class-ness.

Style guide dictates a camel case scheme for classes. Since the tests are actually classes, update their names to reflect that. Change-Id: Ib7422b6d8c5de8414765439704fc103eae8b2d63 Reviewed-on: https://chromium-review.googlesource.com/208680Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarZhenyao Mo <zmo@chromium.org>
parent 75ec7c5b
Showing with 128 additions and 128 deletions
tests/angle_tests/BlendMinMaxTest.cpp
...@@ -136,19 +136,19 @@ protected: ...@@ -136,19 +136,19 @@ protected:
GLuint mColorRenderbuffer; GLuint mColorRenderbuffer;
}; };
TEST_F(BlendMinMaxTest, rgba8) TEST_F(BlendMinMaxTest, RGBA8)
{ {
SetUpFramebuffer(GL_RGBA8); SetUpFramebuffer(GL_RGBA8);
runTest(); runTest();
} }
TEST_F(BlendMinMaxTest, rgba32f) TEST_F(BlendMinMaxTest, RGBA32f)
{ {
SetUpFramebuffer(GL_RGBA32F); SetUpFramebuffer(GL_RGBA32F);
runTest(); runTest();
} }
TEST_F(BlendMinMaxTest, rgba16f) TEST_F(BlendMinMaxTest, RGBA16F)
{ {
SetUpFramebuffer(GL_RGBA16F); SetUpFramebuffer(GL_RGBA16F);
runTest(); runTest();
......
tests/angle_tests/BlitFramebufferANGLETest.cpp
...@@ -302,7 +302,7 @@ protected: ...@@ -302,7 +302,7 @@ protected:
}; };
// Draw to user-created framebuffer, blit whole-buffer color to original framebuffer. // Draw to user-created framebuffer, blit whole-buffer color to original framebuffer.
TEST_F(BlitFramebufferANGLETest, blit_color_to_default) TEST_F(BlitFramebufferANGLETest, BlitColorToDefault)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO); glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
...@@ -329,7 +329,7 @@ TEST_F(BlitFramebufferANGLETest, blit_color_to_default) ...@@ -329,7 +329,7 @@ TEST_F(BlitFramebufferANGLETest, blit_color_to_default)
} }
// Draw to system framebuffer, blit whole-buffer color to user-created framebuffer. // Draw to system framebuffer, blit whole-buffer color to user-created framebuffer.
TEST_F(BlitFramebufferANGLETest, reverse_color_blit) TEST_F(BlitFramebufferANGLETest, ReverseColorBlit)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO); glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
...@@ -356,7 +356,7 @@ TEST_F(BlitFramebufferANGLETest, reverse_color_blit) ...@@ -356,7 +356,7 @@ TEST_F(BlitFramebufferANGLETest, reverse_color_blit)
} }
// blit from user-created FBO to system framebuffer, with the scissor test enabled. // blit from user-created FBO to system framebuffer, with the scissor test enabled.
TEST_F(BlitFramebufferANGLETest, scissored_blit) TEST_F(BlitFramebufferANGLETest, ScissoredBlit)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO); glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
...@@ -391,7 +391,7 @@ TEST_F(BlitFramebufferANGLETest, scissored_blit) ...@@ -391,7 +391,7 @@ TEST_F(BlitFramebufferANGLETest, scissored_blit)
} }
// blit from system FBO to user-created framebuffer, with the scissor test enabled. // blit from system FBO to user-created framebuffer, with the scissor test enabled.
TEST_F(BlitFramebufferANGLETest, reverse_scissored_blit) TEST_F(BlitFramebufferANGLETest, ReverseScissoredBlit)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO); glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
...@@ -426,7 +426,7 @@ TEST_F(BlitFramebufferANGLETest, reverse_scissored_blit) ...@@ -426,7 +426,7 @@ TEST_F(BlitFramebufferANGLETest, reverse_scissored_blit)
} }
// blit from user-created FBO to system framebuffer, using region larger than buffer. // blit from user-created FBO to system framebuffer, using region larger than buffer.
TEST_F(BlitFramebufferANGLETest, oversized_blit) TEST_F(BlitFramebufferANGLETest, OversizedBlit)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO); glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
...@@ -456,7 +456,7 @@ TEST_F(BlitFramebufferANGLETest, oversized_blit) ...@@ -456,7 +456,7 @@ TEST_F(BlitFramebufferANGLETest, oversized_blit)
} }
// blit from system FBO to user-created framebuffer, using region larger than buffer. // blit from system FBO to user-created framebuffer, using region larger than buffer.
TEST_F(BlitFramebufferANGLETest, reverse_oversized_blit) TEST_F(BlitFramebufferANGLETest, ReverseOversizedBlit)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO); glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
...@@ -485,7 +485,7 @@ TEST_F(BlitFramebufferANGLETest, reverse_oversized_blit) ...@@ -485,7 +485,7 @@ TEST_F(BlitFramebufferANGLETest, reverse_oversized_blit)
} }
// blit from user-created FBO to system framebuffer, with depth buffer. // blit from user-created FBO to system framebuffer, with depth buffer.
TEST_F(BlitFramebufferANGLETest, blit_with_depth) TEST_F(BlitFramebufferANGLETest, BlitWithDepth)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO); glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
...@@ -522,7 +522,7 @@ TEST_F(BlitFramebufferANGLETest, blit_with_depth) ...@@ -522,7 +522,7 @@ TEST_F(BlitFramebufferANGLETest, blit_with_depth)
} }
// blit from system FBO to user-created framebuffer, with depth buffer. // blit from system FBO to user-created framebuffer, with depth buffer.
TEST_F(BlitFramebufferANGLETest, reverse_blit_with_depth) TEST_F(BlitFramebufferANGLETest, ReverseBlitWithDepth)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO); glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
...@@ -559,7 +559,7 @@ TEST_F(BlitFramebufferANGLETest, reverse_blit_with_depth) ...@@ -559,7 +559,7 @@ TEST_F(BlitFramebufferANGLETest, reverse_blit_with_depth)
} }
// blit from one region of the system fbo to another-- this should fail. // blit from one region of the system fbo to another-- this should fail.
TEST_F(BlitFramebufferANGLETest, blit_same_buffer_original) TEST_F(BlitFramebufferANGLETest, BlitSameBufferOriginal)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO); glBindFramebuffer(GL_FRAMEBUFFER, mOriginalFBO);
...@@ -575,7 +575,7 @@ TEST_F(BlitFramebufferANGLETest, blit_same_buffer_original) ...@@ -575,7 +575,7 @@ TEST_F(BlitFramebufferANGLETest, blit_same_buffer_original)
} }
// blit from one region of the system fbo to another. // blit from one region of the system fbo to another.
TEST_F(BlitFramebufferANGLETest, blit_same_buffer_user) TEST_F(BlitFramebufferANGLETest, BlitSameBufferUser)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO); glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
...@@ -590,7 +590,7 @@ TEST_F(BlitFramebufferANGLETest, blit_same_buffer_user) ...@@ -590,7 +590,7 @@ TEST_F(BlitFramebufferANGLETest, blit_same_buffer_user)
EXPECT_GL_ERROR(GL_INVALID_OPERATION); EXPECT_GL_ERROR(GL_INVALID_OPERATION);
} }
TEST_F(BlitFramebufferANGLETest, blit_partial_color) TEST_F(BlitFramebufferANGLETest, BlitPartialColor)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO); glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
...@@ -619,7 +619,7 @@ TEST_F(BlitFramebufferANGLETest, blit_partial_color) ...@@ -619,7 +619,7 @@ TEST_F(BlitFramebufferANGLETest, blit_partial_color)
EXPECT_PIXEL_EQ( getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 0, 0, 255); EXPECT_PIXEL_EQ( getWindowWidth() / 4, 3 * getWindowHeight() / 4, 255, 0, 0, 255);
} }
TEST_F(BlitFramebufferANGLETest, blit_different_sizes) TEST_F(BlitFramebufferANGLETest, BlitDifferentSizes)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO); glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
...@@ -647,7 +647,7 @@ TEST_F(BlitFramebufferANGLETest, blit_different_sizes) ...@@ -647,7 +647,7 @@ TEST_F(BlitFramebufferANGLETest, blit_different_sizes)
EXPECT_GL_NO_ERROR(); EXPECT_GL_NO_ERROR();
} }
TEST_F(BlitFramebufferANGLETest, blit_with_missing_attachments) TEST_F(BlitFramebufferANGLETest, BlitWithMissingAttachments)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mColorOnlyFBO); glBindFramebuffer(GL_FRAMEBUFFER, mColorOnlyFBO);
...@@ -685,7 +685,7 @@ TEST_F(BlitFramebufferANGLETest, blit_with_missing_attachments) ...@@ -685,7 +685,7 @@ TEST_F(BlitFramebufferANGLETest, blit_with_missing_attachments)
EXPECT_PIXEL_EQ( getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 0, 255, 255); EXPECT_PIXEL_EQ( getWindowWidth() / 4, 3 * getWindowHeight() / 4, 0, 0, 255, 255);
} }
TEST_F(BlitFramebufferANGLETest, blit_stencil) TEST_F(BlitFramebufferANGLETest, BlitStencil)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO); glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
...@@ -727,7 +727,7 @@ TEST_F(BlitFramebufferANGLETest, blit_stencil) ...@@ -727,7 +727,7 @@ TEST_F(BlitFramebufferANGLETest, blit_stencil)
} }
// make sure that attempting to blit a partial depth buffer issues an error // make sure that attempting to blit a partial depth buffer issues an error
TEST_F(BlitFramebufferANGLETest, blit_partial_depth_stencil) TEST_F(BlitFramebufferANGLETest, BlitPartialDepthStencil)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO); glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
...@@ -746,7 +746,7 @@ TEST_F(BlitFramebufferANGLETest, blit_partial_depth_stencil) ...@@ -746,7 +746,7 @@ TEST_F(BlitFramebufferANGLETest, blit_partial_depth_stencil)
} }
// Test blit with MRT framebuffers // Test blit with MRT framebuffers
TEST_F(BlitFramebufferANGLETest, blit_mrt) TEST_F(BlitFramebufferANGLETest, BlitMRT)
{ {
if (!extensionEnabled("GL_EXT_draw_buffers")) if (!extensionEnabled("GL_EXT_draw_buffers"))
{ {
...@@ -794,7 +794,7 @@ TEST_F(BlitFramebufferANGLETest, blit_mrt) ...@@ -794,7 +794,7 @@ TEST_F(BlitFramebufferANGLETest, blit_mrt)
} }
// Make sure that attempts to stretch in a blit call issue an error // Make sure that attempts to stretch in a blit call issue an error
TEST_F(BlitFramebufferANGLETest, error_stretching) TEST_F(BlitFramebufferANGLETest, ErrorStretching)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO); glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
...@@ -813,7 +813,7 @@ TEST_F(BlitFramebufferANGLETest, error_stretching) ...@@ -813,7 +813,7 @@ TEST_F(BlitFramebufferANGLETest, error_stretching)
} }
// Make sure that attempts to flip in a blit call issue an error // Make sure that attempts to flip in a blit call issue an error
TEST_F(BlitFramebufferANGLETest, error_flipping) TEST_F(BlitFramebufferANGLETest, ErrorFlipping)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO); glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
...@@ -831,7 +831,7 @@ TEST_F(BlitFramebufferANGLETest, error_flipping) ...@@ -831,7 +831,7 @@ TEST_F(BlitFramebufferANGLETest, error_flipping)
EXPECT_GL_ERROR(GL_INVALID_OPERATION); EXPECT_GL_ERROR(GL_INVALID_OPERATION);
} }
TEST_F(BlitFramebufferANGLETest, errors) TEST_F(BlitFramebufferANGLETest, Errors)
{ {
glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO); glBindFramebuffer(GL_FRAMEBUFFER, mUserFBO);
......
tests/angle_tests/ClearTest.cpp
...@@ -56,7 +56,7 @@ protected: ...@@ -56,7 +56,7 @@ protected:
GLuint mProgram; GLuint mProgram;
}; };
TEST_F(ClearTest, clear_issue) TEST_F(ClearTest, ClearIssue)
{ {
EXPECT_GL_NO_ERROR(); EXPECT_GL_NO_ERROR();
......
tests/angle_tests/CompressedTextureTest.cpp
...@@ -66,7 +66,7 @@ protected: ...@@ -66,7 +66,7 @@ protected:
GLint mTextureUniformLocation; GLint mTextureUniformLocation;
}; };
TEST_F(CompressedTextureTest, compressed_tex_image) TEST_F(CompressedTextureTest, CompressedTexImage)
{ {
if (getClientVersion() < 3 && !extensionEnabled("GL_EXT_texture_compression_dxt1")) if (getClientVersion() < 3 && !extensionEnabled("GL_EXT_texture_compression_dxt1"))
{ {
...@@ -106,7 +106,7 @@ TEST_F(CompressedTextureTest, compressed_tex_image) ...@@ -106,7 +106,7 @@ TEST_F(CompressedTextureTest, compressed_tex_image)
EXPECT_GL_NO_ERROR(); EXPECT_GL_NO_ERROR();
} }
TEST_F(CompressedTextureTest, compressed_tex_storage) TEST_F(CompressedTextureTest, CompressedTexStorage)
{ {
if (getClientVersion() < 3 && !extensionEnabled("GL_EXT_texture_compression_dxt1")) if (getClientVersion() < 3 && !extensionEnabled("GL_EXT_texture_compression_dxt1"))
{ {
......
tests/angle_tests/FramebufferFormatsTest.cpp
...@@ -71,27 +71,27 @@ protected: ...@@ -71,27 +71,27 @@ protected:
} }
}; };
TEST_F(FramebufferFormatsTest, rgba4) TEST_F(FramebufferFormatsTest, RGBA4)
{ {
testTextureFormat(GL_RGBA4, 4, 4, 4, 4); testTextureFormat(GL_RGBA4, 4, 4, 4, 4);
} }
TEST_F(FramebufferFormatsTest, rgb565) TEST_F(FramebufferFormatsTest, RGB565)
{ {
testTextureFormat(GL_RGB565, 5, 6, 5, 0); testTextureFormat(GL_RGB565, 5, 6, 5, 0);
} }
TEST_F(FramebufferFormatsTest, rgb8) TEST_F(FramebufferFormatsTest, RGB8)
{ {
testTextureFormat(GL_RGB8_OES, 8, 8, 8, 0); testTextureFormat(GL_RGB8_OES, 8, 8, 8, 0);
} }
TEST_F(FramebufferFormatsTest, bgra8) TEST_F(FramebufferFormatsTest, BGRA8)
{ {
testTextureFormat(GL_BGRA8_EXT, 8, 8, 8, 8); testTextureFormat(GL_BGRA8_EXT, 8, 8, 8, 8);
} }
TEST_F(FramebufferFormatsTest, rgba8) TEST_F(FramebufferFormatsTest, RGBA8)
{ {
testTextureFormat(GL_RGBA8_OES, 8, 8, 8, 8); testTextureFormat(GL_RGBA8_OES, 8, 8, 8, 8);
} }
......
tests/angle_tests/GLSLTest.cpp
...@@ -30,7 +30,7 @@ protected: ...@@ -30,7 +30,7 @@ protected:
std::string mSimpleVSSource; std::string mSimpleVSSource;
}; };
TEST_F(GLSLTest, nameless_scoped_structs) TEST_F(GLSLTest, NamelessScopedStructs)
{ {
const std::string fragmentShaderSource = SHADER_SOURCE const std::string fragmentShaderSource = SHADER_SOURCE
( (
...@@ -51,7 +51,7 @@ TEST_F(GLSLTest, nameless_scoped_structs) ...@@ -51,7 +51,7 @@ TEST_F(GLSLTest, nameless_scoped_structs)
GLuint program = compileProgram(mSimpleVSSource, fragmentShaderSource); GLuint program = compileProgram(mSimpleVSSource, fragmentShaderSource);
EXPECT_NE(0u, program); EXPECT_NE(0u, program);
} }
TEST_F(GLSLTest, scoped_structs_order_bug) TEST_F(GLSLTest, ScopedStructsOrderBug)
{ {
const std::string fragmentShaderSource = SHADER_SOURCE const std::string fragmentShaderSource = SHADER_SOURCE
( (
...@@ -83,7 +83,7 @@ TEST_F(GLSLTest, scoped_structs_order_bug) ...@@ -83,7 +83,7 @@ TEST_F(GLSLTest, scoped_structs_order_bug)
EXPECT_NE(0u, program); EXPECT_NE(0u, program);
} }
TEST_F(GLSLTest, scoped_structs_bug) TEST_F(GLSLTest, ScopedStructsBug)
{ {
const std::string fragmentShaderSource = SHADER_SOURCE const std::string fragmentShaderSource = SHADER_SOURCE
( (
...@@ -115,7 +115,7 @@ TEST_F(GLSLTest, scoped_structs_bug) ...@@ -115,7 +115,7 @@ TEST_F(GLSLTest, scoped_structs_bug)
EXPECT_NE(0u, program); EXPECT_NE(0u, program);
} }
TEST_F(GLSLTest, dx_position_bug) TEST_F(GLSLTest, DxPositionBug)
{ {
const std::string &vertexShaderSource = SHADER_SOURCE const std::string &vertexShaderSource = SHADER_SOURCE
( (
......
tests/angle_tests/IncompleteTextureTest.cpp
...@@ -76,7 +76,7 @@ protected: ...@@ -76,7 +76,7 @@ protected:
GLint mTextureUniformLocation; GLint mTextureUniformLocation;
}; };
TEST_F(IncompleteTextureTest, incomplete_texture_2d) TEST_F(IncompleteTextureTest, IncompleteTexture2D)
{ {
GLuint tex; GLuint tex;
glGenTextures(1, &tex); glGenTextures(1, &tex);
...@@ -110,7 +110,7 @@ TEST_F(IncompleteTextureTest, incomplete_texture_2d) ...@@ -110,7 +110,7 @@ TEST_F(IncompleteTextureTest, incomplete_texture_2d)
glDeleteTextures(1, &tex); glDeleteTextures(1, &tex);
} }
TEST_F(IncompleteTextureTest, update_texture) TEST_F(IncompleteTextureTest, UpdateTexture)
{ {
GLuint tex; GLuint tex;
glGenTextures(1, &tex); glGenTextures(1, &tex);
......
tests/angle_tests/IndexedPointsTest.cpp
...@@ -125,51 +125,51 @@ protected: ...@@ -125,51 +125,51 @@ protected:
typedef IndexedPointsTest<GLubyte, GL_UNSIGNED_BYTE> IndexedPointsTestUByte; typedef IndexedPointsTest<GLubyte, GL_UNSIGNED_BYTE> IndexedPointsTestUByte;
TEST_F(IndexedPointsTestUByte, unsigned_byte_offset_0) TEST_F(IndexedPointsTestUByte, UnsignedByteOffset0)
{ {
runTest(0); runTest(0);
} }
TEST_F(IndexedPointsTestUByte, unsigned_byte_offset_1) TEST_F(IndexedPointsTestUByte, UnsignedByteOffset1)
{ {
runTest(1); runTest(1);
} }
TEST_F(IndexedPointsTestUByte, unsigned_byte_offset_2) TEST_F(IndexedPointsTestUByte, UnsignedByteOffset2)
{ {
runTest(2); runTest(2);
} }
TEST_F(IndexedPointsTestUByte, unsigned_byte_offset_3) TEST_F(IndexedPointsTestUByte, UnsignedByteOffset3)
{ {
runTest(3); runTest(3);
} }
typedef IndexedPointsTest<GLushort, GL_UNSIGNED_SHORT> IndexedPointsTestUShort; typedef IndexedPointsTest<GLushort, GL_UNSIGNED_SHORT> IndexedPointsTestUShort;
TEST_F(IndexedPointsTestUShort, unsigned_short_offset_0) TEST_F(IndexedPointsTestUShort, UnsignedShortOffset0)
{ {
runTest(0); runTest(0);
} }
TEST_F(IndexedPointsTestUShort, unsigned_short_offset_1) TEST_F(IndexedPointsTestUShort, UnsignedShortOffset1)
{ {
runTest(1); runTest(1);
} }
TEST_F(IndexedPointsTestUShort, unsigned_short_offset_2) TEST_F(IndexedPointsTestUShort, UnsignedShortOffset2)
{ {
runTest(2); runTest(2);
} }
TEST_F(IndexedPointsTestUShort, unsigned_short_offset_3) TEST_F(IndexedPointsTestUShort, UnsignedShortOffset3)
{ {
runTest(3); runTest(3);
} }
typedef IndexedPointsTest<GLuint, GL_UNSIGNED_INT> IndexedPointsTestUInt; typedef IndexedPointsTest<GLuint, GL_UNSIGNED_INT> IndexedPointsTestUInt;
TEST_F(IndexedPointsTestUInt, unsigned_int_offset_0) TEST_F(IndexedPointsTestUInt, UnsignedIntOffset0)
{ {
if (getClientVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint")) if (getClientVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
{ {
...@@ -179,7 +179,7 @@ TEST_F(IndexedPointsTestUInt, unsigned_int_offset_0) ...@@ -179,7 +179,7 @@ TEST_F(IndexedPointsTestUInt, unsigned_int_offset_0)
runTest(0); runTest(0);
} }
TEST_F(IndexedPointsTestUInt, unsigned_int_offset_1) TEST_F(IndexedPointsTestUInt, UnsignedIntOffset1)
{ {
if (getClientVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint")) if (getClientVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
{ {
...@@ -189,7 +189,7 @@ TEST_F(IndexedPointsTestUInt, unsigned_int_offset_1) ...@@ -189,7 +189,7 @@ TEST_F(IndexedPointsTestUInt, unsigned_int_offset_1)
runTest(1); runTest(1);
} }
TEST_F(IndexedPointsTestUInt, unsigned_int_offset_2) TEST_F(IndexedPointsTestUInt, UnsignedIntOffset2)
{ {
if (getClientVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint")) if (getClientVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
{ {
...@@ -199,7 +199,7 @@ TEST_F(IndexedPointsTestUInt, unsigned_int_offset_2) ...@@ -199,7 +199,7 @@ TEST_F(IndexedPointsTestUInt, unsigned_int_offset_2)
runTest(2); runTest(2);
} }
TEST_F(IndexedPointsTestUInt, unsigned_int_offset_3) TEST_F(IndexedPointsTestUInt, UnsignedIntOffset3)
{ {
if (getClientVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint")) if (getClientVersion() < 3 && !extensionEnabled("GL_OES_element_index_uint"))
{ {
......
tests/angle_tests/LineLoopTest.cpp
...@@ -126,19 +126,19 @@ protected: ...@@ -126,19 +126,19 @@ protected:
GLint mColorLocation; GLint mColorLocation;
}; };
TEST_F(LineLoopTest, line_loop_ubyte_indices) TEST_F(LineLoopTest, LineLoopUByteIndices)
{ {
static const GLubyte indices[] = { 0, 7, 6, 9, 8, 0 }; static const GLubyte indices[] = { 0, 7, 6, 9, 8, 0 };
runTest(GL_UNSIGNED_BYTE, 0, indices + 1); runTest(GL_UNSIGNED_BYTE, 0, indices + 1);
} }
TEST_F(LineLoopTest, line_loop_ushort_indices) TEST_F(LineLoopTest, LineLoopUShortIndices)
{ {
static const GLushort indices[] = { 0, 7, 6, 9, 8, 0 }; static const GLushort indices[] = { 0, 7, 6, 9, 8, 0 };
runTest(GL_UNSIGNED_SHORT, 0, indices + 1); runTest(GL_UNSIGNED_SHORT, 0, indices + 1);
} }
TEST_F(LineLoopTest, line_loop_uint_indices) TEST_F(LineLoopTest, LineLoopUIntIndices)
{ {
if (!extensionEnabled("GL_OES_element_index_uint")) if (!extensionEnabled("GL_OES_element_index_uint"))
{ {
...@@ -149,7 +149,7 @@ TEST_F(LineLoopTest, line_loop_uint_indices) ...@@ -149,7 +149,7 @@ TEST_F(LineLoopTest, line_loop_uint_indices)
runTest(GL_UNSIGNED_INT, 0, indices + 1); runTest(GL_UNSIGNED_INT, 0, indices + 1);
} }
TEST_F(LineLoopTest, line_loop_ubyte_index_buffer) TEST_F(LineLoopTest, LineLoopUByteIndexBuffer)
{ {
static const GLubyte indices[] = { 0, 7, 6, 9, 8, 0 }; static const GLubyte indices[] = { 0, 7, 6, 9, 8, 0 };
...@@ -163,7 +163,7 @@ TEST_F(LineLoopTest, line_loop_ubyte_index_buffer) ...@@ -163,7 +163,7 @@ TEST_F(LineLoopTest, line_loop_ubyte_index_buffer)
glDeleteBuffers(1, &buf); glDeleteBuffers(1, &buf);
} }
TEST_F(LineLoopTest, line_loop_ushort_index_buffer) TEST_F(LineLoopTest, LineLoopUShortIndexBuffer)
{ {
static const GLushort indices[] = { 0, 7, 6, 9, 8, 0 }; static const GLushort indices[] = { 0, 7, 6, 9, 8, 0 };
...@@ -177,7 +177,7 @@ TEST_F(LineLoopTest, line_loop_ushort_index_buffer) ...@@ -177,7 +177,7 @@ TEST_F(LineLoopTest, line_loop_ushort_index_buffer)
glDeleteBuffers(1, &buf); glDeleteBuffers(1, &buf);
} }
TEST_F(LineLoopTest, line_loop_uint_index_buffer) TEST_F(LineLoopTest, LineLoopUIntIndexBuffer)
{ {
if (!extensionEnabled("GL_OES_element_index_uint")) if (!extensionEnabled("GL_OES_element_index_uint"))
{ {
......
tests/angle_tests/MaxTextureSizeTest.cpp
...@@ -86,7 +86,7 @@ protected: ...@@ -86,7 +86,7 @@ protected:
GLint mMaxRenderbufferSize; GLint mMaxRenderbufferSize;
}; };
TEST_F(MaxTextureSizeTest, specification_tex_image) TEST_F(MaxTextureSizeTest, SpecificationTexImage)
{ {
GLuint tex; GLuint tex;
glGenTextures(1, &tex); glGenTextures(1, &tex);
...@@ -141,7 +141,7 @@ TEST_F(MaxTextureSizeTest, specification_tex_image) ...@@ -141,7 +141,7 @@ TEST_F(MaxTextureSizeTest, specification_tex_image)
} }
} }
TEST_F(MaxTextureSizeTest, specification_tex_storage) TEST_F(MaxTextureSizeTest, SpecificationTexStorage)
{ {
if (getClientVersion() < 3 && (!extensionEnabled("GL_EXT_texture_storage") || !extensionEnabled("GL_OES_rgb8_rgba8"))) if (getClientVersion() < 3 && (!extensionEnabled("GL_EXT_texture_storage") || !extensionEnabled("GL_OES_rgb8_rgba8")))
{ {
...@@ -211,7 +211,7 @@ TEST_F(MaxTextureSizeTest, specification_tex_storage) ...@@ -211,7 +211,7 @@ TEST_F(MaxTextureSizeTest, specification_tex_storage)
} }
} }
TEST_F(MaxTextureSizeTest, render_to_texture) TEST_F(MaxTextureSizeTest, RenderToTexture)
{ {
GLuint fbo = 0; GLuint fbo = 0;
GLuint textureId = 0; GLuint textureId = 0;
......
tests/angle_tests/OcclusionQueriesTest.cpp
...@@ -55,7 +55,7 @@ protected: ...@@ -55,7 +55,7 @@ protected:
GLuint mProgram; GLuint mProgram;
}; };
TEST_F(OcclusionQueriesTest, is_occuluded) TEST_F(OcclusionQueriesTest, IsOccluded)
{ {
glDepthMask(GL_TRUE); glDepthMask(GL_TRUE);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
...@@ -95,7 +95,7 @@ TEST_F(OcclusionQueriesTest, is_occuluded) ...@@ -95,7 +95,7 @@ TEST_F(OcclusionQueriesTest, is_occuluded)
EXPECT_EQ(result, GL_FALSE); EXPECT_EQ(result, GL_FALSE);
} }
TEST_F(OcclusionQueriesTest, is_not_occuluded) TEST_F(OcclusionQueriesTest, IsNotOccluded)
{ {
glDepthMask(GL_TRUE); glDepthMask(GL_TRUE);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
...@@ -122,7 +122,7 @@ TEST_F(OcclusionQueriesTest, is_not_occuluded) ...@@ -122,7 +122,7 @@ TEST_F(OcclusionQueriesTest, is_not_occuluded)
EXPECT_EQ(result, GL_TRUE); EXPECT_EQ(result, GL_TRUE);
} }
TEST_F(OcclusionQueriesTest, errors) TEST_F(OcclusionQueriesTest, Errors)
{ {
glDepthMask(GL_TRUE); glDepthMask(GL_TRUE);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
......
tests/angle_tests/PBOExtensionTest.cpp
...@@ -73,7 +73,7 @@ protected: ...@@ -73,7 +73,7 @@ protected:
GLuint mPositionVBO; GLuint mPositionVBO;
}; };
TEST_F(PBOExtensionTest, pbo_with_other_target) TEST_F(PBOExtensionTest, PBOWithOtherTarget)
{ {
if (extensionEnabled("NV_pixel_buffer_object")) if (extensionEnabled("NV_pixel_buffer_object"))
{ {
...@@ -101,7 +101,7 @@ TEST_F(PBOExtensionTest, pbo_with_other_target) ...@@ -101,7 +101,7 @@ TEST_F(PBOExtensionTest, pbo_with_other_target)
EXPECT_GL_NO_ERROR(); EXPECT_GL_NO_ERROR();
} }
TEST_F(PBOExtensionTest, pbo_with_existing_data) TEST_F(PBOExtensionTest, PBOWithExistingData)
{ {
if (extensionEnabled("NV_pixel_buffer_object")) if (extensionEnabled("NV_pixel_buffer_object"))
{ {
......
tests/angle_tests/ProgramBinaryTest.cpp
...@@ -62,7 +62,7 @@ protected: ...@@ -62,7 +62,7 @@ protected:
// This tests the assumption that float attribs of different size // This tests the assumption that float attribs of different size
// should not internally cause a vertex shader recompile (for conversion). // should not internally cause a vertex shader recompile (for conversion).
TEST_F(ProgramBinaryTest, float_dynamic_shader_size) TEST_F(ProgramBinaryTest, FloatDynamicShaderSize)
{ {
glUseProgram(mProgram); glUseProgram(mProgram);
glBindBuffer(GL_ARRAY_BUFFER, mBuffer); glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
......
tests/angle_tests/ReadPixelsTest.cpp
...@@ -84,7 +84,7 @@ protected: ...@@ -84,7 +84,7 @@ protected:
GLuint mPositionVBO; GLuint mPositionVBO;
}; };
TEST_F(ReadPixelsTest, out_of_bounds) TEST_F(ReadPixelsTest, OutOfBounds)
{ {
glClearColor(1.0f, 0.0f, 0.0f, 1.0f); glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
...@@ -117,7 +117,7 @@ TEST_F(ReadPixelsTest, out_of_bounds) ...@@ -117,7 +117,7 @@ TEST_F(ReadPixelsTest, out_of_bounds)
} }
} }
TEST_F(ReadPixelsTest, pbo_with_other_target) TEST_F(ReadPixelsTest, PBOWithOtherTarget)
{ {
glClearColor(1.0f, 0.0f, 0.0f, 1.0f); glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
...@@ -142,7 +142,7 @@ TEST_F(ReadPixelsTest, pbo_with_other_target) ...@@ -142,7 +142,7 @@ TEST_F(ReadPixelsTest, pbo_with_other_target)
EXPECT_GL_NO_ERROR(); EXPECT_GL_NO_ERROR();
} }
TEST_F(ReadPixelsTest, pbo_with_existing_data) TEST_F(ReadPixelsTest, PBOWithExistingData)
{ {
// Clear backbuffer to red // Clear backbuffer to red
glClearColor(1.0f, 0.0f, 0.0f, 1.0f); glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
...@@ -180,7 +180,7 @@ TEST_F(ReadPixelsTest, pbo_with_existing_data) ...@@ -180,7 +180,7 @@ TEST_F(ReadPixelsTest, pbo_with_existing_data)
EXPECT_GL_NO_ERROR(); EXPECT_GL_NO_ERROR();
} }
TEST_F(ReadPixelsTest, pbo_and_sub_data) TEST_F(ReadPixelsTest, PBOAndSubData)
{ {
glClearColor(1.0f, 0.0f, 0.0f, 1.0f); glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
...@@ -208,7 +208,7 @@ TEST_F(ReadPixelsTest, pbo_and_sub_data) ...@@ -208,7 +208,7 @@ TEST_F(ReadPixelsTest, pbo_and_sub_data)
EXPECT_GL_NO_ERROR(); EXPECT_GL_NO_ERROR();
} }
TEST_F(ReadPixelsTest, pbo_and_sub_data_offset) TEST_F(ReadPixelsTest, PBOAndSubDataOffset)
{ {
glClearColor(1.0f, 0.0f, 0.0f, 1.0f); glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
...@@ -241,7 +241,7 @@ TEST_F(ReadPixelsTest, pbo_and_sub_data_offset) ...@@ -241,7 +241,7 @@ TEST_F(ReadPixelsTest, pbo_and_sub_data_offset)
EXPECT_GL_NO_ERROR(); EXPECT_GL_NO_ERROR();
} }
TEST_F(ReadPixelsTest, draw_with_pbo) TEST_F(ReadPixelsTest, DrawWithPBO)
{ {
unsigned char data[4] = { 1, 2, 3, 4 }; unsigned char data[4] = { 1, 2, 3, 4 };
......
tests/angle_tests/SRGBTextureTest.cpp
...@@ -24,7 +24,7 @@ protected: ...@@ -24,7 +24,7 @@ protected:
} }
}; };
TEST_F(SRGBTextureTest, srgb_validation) TEST_F(SRGBTextureTest, SRGBValidation)
{ {
bool supported = extensionEnabled("GL_EXT_sRGB") || getClientVersion() == 3; bool supported = extensionEnabled("GL_EXT_sRGB") || getClientVersion() == 3;
...@@ -52,7 +52,7 @@ TEST_F(SRGBTextureTest, srgb_validation) ...@@ -52,7 +52,7 @@ TEST_F(SRGBTextureTest, srgb_validation)
glDeleteTextures(1, &tex); glDeleteTextures(1, &tex);
} }
TEST_F(SRGBTextureTest, srgba_validation) TEST_F(SRGBTextureTest, SRGBAValidation)
{ {
bool supported = extensionEnabled("GL_EXT_sRGB") || getClientVersion() == 3; bool supported = extensionEnabled("GL_EXT_sRGB") || getClientVersion() == 3;
...@@ -87,7 +87,7 @@ TEST_F(SRGBTextureTest, srgba_validation) ...@@ -87,7 +87,7 @@ TEST_F(SRGBTextureTest, srgba_validation)
glDeleteTextures(1, &tex); glDeleteTextures(1, &tex);
} }
TEST_F(SRGBTextureTest, srgba_renderbuffer) TEST_F(SRGBTextureTest, SRGBARenderbuffer)
{ {
bool supported = extensionEnabled("GL_EXT_sRGB") || getClientVersion() == 3; bool supported = extensionEnabled("GL_EXT_sRGB") || getClientVersion() == 3;
......
tests/angle_tests/SwizzleTest.cpp
...@@ -181,77 +181,77 @@ protected: ...@@ -181,77 +181,77 @@ protected:
std::vector<swizzlePermutation> mPermutations; std::vector<swizzlePermutation> mPermutations;
}; };
TEST_F(SwizzleTest, rgba8_2d) TEST_F(SwizzleTest, RGBA8_2D)
{ {
GLubyte data[] = { 1, 64, 128, 200 }; GLubyte data[] = { 1, 64, 128, 200 };
init2DTexture(GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, data); init2DTexture(GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, data);
runTest2D(); runTest2D();
} }
TEST_F(SwizzleTest, rgb8_2d) TEST_F(SwizzleTest, RGB8_2D)
{ {
GLubyte data[] = { 77, 66, 55 }; GLubyte data[] = { 77, 66, 55 };
init2DTexture(GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE, data); init2DTexture(GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE, data);
runTest2D(); runTest2D();
} }
TEST_F(SwizzleTest, rg8_2d) TEST_F(SwizzleTest, RG8_2D)
{ {
GLubyte data[] = { 11, 99 }; GLubyte data[] = { 11, 99 };
init2DTexture(GL_RG8, GL_RG, GL_UNSIGNED_BYTE, data); init2DTexture(GL_RG8, GL_RG, GL_UNSIGNED_BYTE, data);
runTest2D(); runTest2D();
} }
TEST_F(SwizzleTest, r8_2d) TEST_F(SwizzleTest, R8_2D)
{ {
GLubyte data[] = { 2 }; GLubyte data[] = { 2 };
init2DTexture<GLubyte>(GL_R8, GL_RED, GL_UNSIGNED_BYTE, data); init2DTexture<GLubyte>(GL_R8, GL_RED, GL_UNSIGNED_BYTE, data);
runTest2D(); runTest2D();
} }
TEST_F(SwizzleTest, rgba32f_2d) TEST_F(SwizzleTest, RGBA32F_2D)
{ {
GLfloat data[] = { 0.25f, 0.5f, 0.75f, 0.8f }; GLfloat data[] = { 0.25f, 0.5f, 0.75f, 0.8f };
init2DTexture(GL_RGBA32F, GL_RGBA, GL_FLOAT, data); init2DTexture(GL_RGBA32F, GL_RGBA, GL_FLOAT, data);
runTest2D(); runTest2D();
} }
TEST_F(SwizzleTest, rgb32f_2d) TEST_F(SwizzleTest, RGB32F_2D)
{ {
GLfloat data[] = { 0.1f, 0.2f, 0.3f }; GLfloat data[] = { 0.1f, 0.2f, 0.3f };
init2DTexture(GL_RGB32F, GL_RGB, GL_FLOAT, data); init2DTexture(GL_RGB32F, GL_RGB, GL_FLOAT, data);
runTest2D(); runTest2D();
} }
TEST_F(SwizzleTest, rg32f_2d) TEST_F(SwizzleTest, RG32F_2D)
{ {
GLfloat data[] = { 0.9f, 0.1f }; GLfloat data[] = { 0.9f, 0.1f };
init2DTexture(GL_RG32F, GL_RG, GL_FLOAT, data); init2DTexture(GL_RG32F, GL_RG, GL_FLOAT, data);
runTest2D(); runTest2D();
} }
TEST_F(SwizzleTest, r32f_2d) TEST_F(SwizzleTest, R32F_2D)
{ {
GLfloat data[] = { 0.5f }; GLfloat data[] = { 0.5f };
init2DTexture(GL_R32F, GL_RED, GL_FLOAT, data); init2DTexture(GL_R32F, GL_RED, GL_FLOAT, data);
runTest2D(); runTest2D();
} }
TEST_F(SwizzleTest, d32f_2d) TEST_F(SwizzleTest, D32F_2D)
{ {
GLfloat data[] = { 0.5f }; GLfloat data[] = { 0.5f };
init2DTexture(GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT, data); init2DTexture(GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT, data);
runTest2D(); runTest2D();
} }
TEST_F(SwizzleTest, d16_2d) TEST_F(SwizzleTest, D16_2D)
{ {
GLushort data[] = { 0xFF }; GLushort data[] = { 0xFF };
init2DTexture(GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, data); init2DTexture(GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, data);
runTest2D(); runTest2D();
} }
TEST_F(SwizzleTest, d24_2d) TEST_F(SwizzleTest, D24_2D)
{ {
GLuint data[] = { 0xFFFF }; GLuint data[] = { 0xFFFF };
init2DTexture(GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, data); init2DTexture(GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, data);
...@@ -260,7 +260,7 @@ TEST_F(SwizzleTest, d24_2d) ...@@ -260,7 +260,7 @@ TEST_F(SwizzleTest, d24_2d)
#include "media/pixel.inl" #include "media/pixel.inl"
TEST_F(SwizzleTest, compressed_dxt_2d) TEST_F(SwizzleTest, CompressedDXT_2D)
{ {
init2DCompressedTexture(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_width, pixel_0_height, pixel_0_size, pixel_0_data); init2DCompressedTexture(GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, pixel_0_width, pixel_0_height, pixel_0_size, pixel_0_data);
runTest2D(); runTest2D();
......
tests/angle_tests/TextureTest.cpp
...@@ -96,7 +96,7 @@ protected: ...@@ -96,7 +96,7 @@ protected:
GLint mTexture2DUniformLocation; GLint mTexture2DUniformLocation;
}; };
TEST_F(TextureTest, negative_api_subimage) TEST_F(TextureTest, NegativeAPISubImage)
{ {
glBindTexture(GL_TEXTURE_2D, mTexture2D); glBindTexture(GL_TEXTURE_2D, mTexture2D);
EXPECT_GL_ERROR(GL_NO_ERROR); EXPECT_GL_ERROR(GL_NO_ERROR);
...@@ -106,7 +106,7 @@ TEST_F(TextureTest, negative_api_subimage) ...@@ -106,7 +106,7 @@ TEST_F(TextureTest, negative_api_subimage)
EXPECT_GL_ERROR(GL_INVALID_VALUE); EXPECT_GL_ERROR(GL_INVALID_VALUE);
} }
TEST_F(TextureTest, zero_sized_uploads) TEST_F(TextureTest, ZeroSizedUploads)
{ {
glBindTexture(GL_TEXTURE_2D, mTexture2D); glBindTexture(GL_TEXTURE_2D, mTexture2D);
EXPECT_GL_ERROR(GL_NO_ERROR); EXPECT_GL_ERROR(GL_NO_ERROR);
...@@ -129,7 +129,7 @@ TEST_F(TextureTest, zero_sized_uploads) ...@@ -129,7 +129,7 @@ TEST_F(TextureTest, zero_sized_uploads)
} }
// Test drawing with two texture types, to trigger an ANGLE bug in validation // Test drawing with two texture types, to trigger an ANGLE bug in validation
TEST_F(TextureTest, cube_map_bug) TEST_F(TextureTest, CubeMapBug)
{ {
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, mTexture2D); glBindTexture(GL_TEXTURE_2D, mTexture2D);
......
tests/angle_tests/UnpackAlignmentTest.cpp
...@@ -133,7 +133,7 @@ protected: ...@@ -133,7 +133,7 @@ protected:
GLuint mProgram; GLuint mProgram;
}; };
TEST_F(UnpackAlignmentTest, default_alignment) TEST_F(UnpackAlignmentTest, DefaultAlignment)
{ {
GLint defaultAlignment; GLint defaultAlignment;
glGetIntegerv(GL_UNPACK_ALIGNMENT, &defaultAlignment); glGetIntegerv(GL_UNPACK_ALIGNMENT, &defaultAlignment);
...@@ -141,165 +141,165 @@ TEST_F(UnpackAlignmentTest, default_alignment) ...@@ -141,165 +141,165 @@ TEST_F(UnpackAlignmentTest, default_alignment)
} }
TEST_F(UnpackAlignmentTest, alignment_1_rgba_ubyte) TEST_F(UnpackAlignmentTest, Alignment1RGBAUByte)
{ {
testAlignment(1, 7 * 4, GL_RGBA, GL_UNSIGNED_BYTE); testAlignment(1, 7 * 4, GL_RGBA, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_1_rgb_ubyte) TEST_F(UnpackAlignmentTest, Alignment1RGBUByte)
{ {
testAlignment(1, 7 * 3, GL_RGB, GL_UNSIGNED_BYTE); testAlignment(1, 7 * 3, GL_RGB, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_1_rgba_ushort4444) TEST_F(UnpackAlignmentTest, Alignment1RGBAUShort4444)
{ {
testAlignment(1, 7 * 2, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4); testAlignment(1, 7 * 2, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4);
} }
TEST_F(UnpackAlignmentTest, alignment_1_rgba_ushort5551) TEST_F(UnpackAlignmentTest, Alignment1RGBAUShort5551)
{ {
testAlignment(1, 7 * 2, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1); testAlignment(1, 7 * 2, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1);
} }
TEST_F(UnpackAlignmentTest, alignment_1_rgb_ushort565) TEST_F(UnpackAlignmentTest, Alignment1RGBAUShort565)
{ {
testAlignment(1, 7 * 2, GL_RGB, GL_UNSIGNED_SHORT_5_6_5); testAlignment(1, 7 * 2, GL_RGB, GL_UNSIGNED_SHORT_5_6_5);
} }
TEST_F(UnpackAlignmentTest, alignment_1_la_ubyte) TEST_F(UnpackAlignmentTest, Alignment1LAUByte)
{ {
testAlignment(1, 7 * 2, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE); testAlignment(1, 7 * 2, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_1_l_ubyte) TEST_F(UnpackAlignmentTest, Alignment1LUByte)
{ {
testAlignment(1, 7, GL_LUMINANCE, GL_UNSIGNED_BYTE); testAlignment(1, 7, GL_LUMINANCE, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_1_a_ubyte) TEST_F(UnpackAlignmentTest, Alignment1AUByte)
{ {
testAlignment(1, 7, GL_ALPHA, GL_UNSIGNED_BYTE); testAlignment(1, 7, GL_ALPHA, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_2_rgba_ubyte) TEST_F(UnpackAlignmentTest, Alignment2RGBAUByte)
{ {
testAlignment(2, 7 * 4, GL_RGBA, GL_UNSIGNED_BYTE); testAlignment(2, 7 * 4, GL_RGBA, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_2_rgb_ubyte) TEST_F(UnpackAlignmentTest, Alignment2RGBUByte)
{ {
testAlignment(2, 7 * 3 + 1, GL_RGB, GL_UNSIGNED_BYTE); testAlignment(2, 7 * 3 + 1, GL_RGB, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_2_rgba_ushort4444) TEST_F(UnpackAlignmentTest, Alignment2RGBAUShort4444)
{ {
testAlignment(2, 7 * 2, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4); testAlignment(2, 7 * 2, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4);
} }
TEST_F(UnpackAlignmentTest, alignment_2_rgba_ushort5551) TEST_F(UnpackAlignmentTest, Alignment2RGBAUShort5551)
{ {
testAlignment(2, 7 * 2, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1); testAlignment(2, 7 * 2, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1);
} }
TEST_F(UnpackAlignmentTest, alignment_2_rgb_ushort565) TEST_F(UnpackAlignmentTest, Alignment2RGBAUShort565)
{ {
testAlignment(2, 7 * 2, GL_RGB, GL_UNSIGNED_SHORT_5_6_5); testAlignment(2, 7 * 2, GL_RGB, GL_UNSIGNED_SHORT_5_6_5);
} }
TEST_F(UnpackAlignmentTest, alignment_2_la_ubyte) TEST_F(UnpackAlignmentTest, Alignment2LAUByte)
{ {
testAlignment(2, 7 * 2, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE); testAlignment(2, 7 * 2, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_2_l_ubyte) TEST_F(UnpackAlignmentTest, Alignment2LAByte)
{ {
testAlignment(2, 7 + 1, GL_LUMINANCE, GL_UNSIGNED_BYTE); testAlignment(2, 7 + 1, GL_LUMINANCE, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_2_a_ubyte) TEST_F(UnpackAlignmentTest, Alignment2AUByte)
{ {
testAlignment(2, 7 + 1, GL_ALPHA, GL_UNSIGNED_BYTE); testAlignment(2, 7 + 1, GL_ALPHA, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_4_rgba_ubyte) TEST_F(UnpackAlignmentTest, Alignment4RGBAUByte)
{ {
testAlignment(4, 7 * 4, GL_RGBA, GL_UNSIGNED_BYTE); testAlignment(4, 7 * 4, GL_RGBA, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_4_rgb_ubyte) TEST_F(UnpackAlignmentTest, Alignment4RGBUByte)
{ {
testAlignment(4, 7 * 3 + 3, GL_RGB, GL_UNSIGNED_BYTE); testAlignment(4, 7 * 3 + 3, GL_RGB, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_4_rgba_ushort4444) TEST_F(UnpackAlignmentTest, Alignment4RGBAUShort4444)
{ {
testAlignment(4, 7 * 2 + 2, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4); testAlignment(4, 7 * 2 + 2, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4);
} }
TEST_F(UnpackAlignmentTest, alignment_4_rgba_ushort5551) TEST_F(UnpackAlignmentTest, Alignment4RGBAUShort5551)
{ {
testAlignment(4, 7 * 2 + 2, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1); testAlignment(4, 7 * 2 + 2, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1);
} }
TEST_F(UnpackAlignmentTest, alignment_4_rgb_ushort565) TEST_F(UnpackAlignmentTest, Alignment4RGBAUShort565)
{ {
testAlignment(4, 7 * 2 + 2, GL_RGB, GL_UNSIGNED_SHORT_5_6_5); testAlignment(4, 7 * 2 + 2, GL_RGB, GL_UNSIGNED_SHORT_5_6_5);
} }
TEST_F(UnpackAlignmentTest, alignment_4_la_ubyte) TEST_F(UnpackAlignmentTest, Alignment4LAUByte)
{ {
testAlignment(4, 7 * 2 + 2, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE); testAlignment(4, 7 * 2 + 2, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_4_l_ubyte) TEST_F(UnpackAlignmentTest, Alignment4LUByte)
{ {
testAlignment(4, 7 + 1, GL_LUMINANCE, GL_UNSIGNED_BYTE); testAlignment(4, 7 + 1, GL_LUMINANCE, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_4_a_ubyte) TEST_F(UnpackAlignmentTest, Alignment4AUByte)
{ {
testAlignment(4, 7 + 1, GL_ALPHA, GL_UNSIGNED_BYTE); testAlignment(4, 7 + 1, GL_ALPHA, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_8_rgba_ubyte) TEST_F(UnpackAlignmentTest, Alignment8RGBAUByte)
{ {
testAlignment(8, 7 * 4 + 4, GL_RGBA, GL_UNSIGNED_BYTE); testAlignment(8, 7 * 4 + 4, GL_RGBA, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_8_rgb_ubyte) TEST_F(UnpackAlignmentTest, Alignment8RGBUByte)
{ {
testAlignment(8, 7 * 3 + 3, GL_RGB, GL_UNSIGNED_BYTE); testAlignment(8, 7 * 3 + 3, GL_RGB, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_8_rgba_ushort4444) TEST_F(UnpackAlignmentTest, Alignment8RGBAUShort4444)
{ {
testAlignment(8, 7 * 2 + 2, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4); testAlignment(8, 7 * 2 + 2, GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4);
} }
TEST_F(UnpackAlignmentTest, alignment_8_rgba_ushort5551) TEST_F(UnpackAlignmentTest, Alignment8RGBAUShort5551)
{ {
testAlignment(8, 7 * 2 + 2, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1); testAlignment(8, 7 * 2 + 2, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1);
} }
TEST_F(UnpackAlignmentTest, alignment_8_rgb_ushort565) TEST_F(UnpackAlignmentTest, Alignment8RGBAUShort565)
{ {
testAlignment(8, 7 * 2 + 2, GL_RGB, GL_UNSIGNED_SHORT_5_6_5); testAlignment(8, 7 * 2 + 2, GL_RGB, GL_UNSIGNED_SHORT_5_6_5);
} }
TEST_F(UnpackAlignmentTest, alignment_8_la_ubyte) TEST_F(UnpackAlignmentTest, Alignment8LAUByte)
{ {
testAlignment(8, 7 * 2 + 2, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE); testAlignment(8, 7 * 2 + 2, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_8_l_ubyte) TEST_F(UnpackAlignmentTest, Alignment8LUByte)
{ {
testAlignment(8, 7 + 1, GL_LUMINANCE, GL_UNSIGNED_BYTE); testAlignment(8, 7 + 1, GL_LUMINANCE, GL_UNSIGNED_BYTE);
} }
TEST_F(UnpackAlignmentTest, alignment_8_a_ubyte) TEST_F(UnpackAlignmentTest, Alignment8AUByte)
{ {
testAlignment(8, 7 + 1, GL_ALPHA, GL_UNSIGNED_BYTE); testAlignment(8, 7 + 1, GL_ALPHA, GL_UNSIGNED_BYTE);
} }
tests/angle_tests/VertexAttributeTest.cpp
...@@ -118,7 +118,7 @@ protected: ...@@ -118,7 +118,7 @@ protected:
GLint mExpectedAttrib; GLint mExpectedAttrib;
}; };
TEST_F(VertexAttributeTest, unsigned_byte_unormalized) TEST_F(VertexAttributeTest, UnsignedByteUnnormalized)
{ {
GLubyte inputData[mVertexCount] = { 0, 1, 2, 3, 4, 5, 6, 7, 125, 126, 127, 128, 129, 250, 251, 252, 253, 254, 255 }; GLubyte inputData[mVertexCount] = { 0, 1, 2, 3, 4, 5, 6, 7, 125, 126, 127, 128, 129, 250, 251, 252, 253, 254, 255 };
GLfloat expectedData[mVertexCount]; GLfloat expectedData[mVertexCount];
...@@ -131,7 +131,7 @@ TEST_F(VertexAttributeTest, unsigned_byte_unormalized) ...@@ -131,7 +131,7 @@ TEST_F(VertexAttributeTest, unsigned_byte_unormalized)
runTest(data); runTest(data);
} }
TEST_F(VertexAttributeTest, unsigned_byte_normalized) TEST_F(VertexAttributeTest, UnsignedByteNormalized)
{ {
GLubyte inputData[mVertexCount] = { 0, 1, 2, 3, 4, 5, 6, 7, 125, 126, 127, 128, 129, 250, 251, 252, 253, 254, 255 }; GLubyte inputData[mVertexCount] = { 0, 1, 2, 3, 4, 5, 6, 7, 125, 126, 127, 128, 129, 250, 251, 252, 253, 254, 255 };
GLfloat expectedData[mVertexCount]; GLfloat expectedData[mVertexCount];
...@@ -144,7 +144,7 @@ TEST_F(VertexAttributeTest, unsigned_byte_normalized) ...@@ -144,7 +144,7 @@ TEST_F(VertexAttributeTest, unsigned_byte_normalized)
runTest(data); runTest(data);
} }
TEST_F(VertexAttributeTest, byte_unnormalized) TEST_F(VertexAttributeTest, ByteUnnormalized)
{ {
GLbyte inputData[mVertexCount] = { 0, 1, 2, 3, 4, -1, -2, -3, -4, 125, 126, 127, -128, -127, -126 }; GLbyte inputData[mVertexCount] = { 0, 1, 2, 3, 4, -1, -2, -3, -4, 125, 126, 127, -128, -127, -126 };
GLfloat expectedData[mVertexCount]; GLfloat expectedData[mVertexCount];
...@@ -157,7 +157,7 @@ TEST_F(VertexAttributeTest, byte_unnormalized) ...@@ -157,7 +157,7 @@ TEST_F(VertexAttributeTest, byte_unnormalized)
runTest(data); runTest(data);
} }
TEST_F(VertexAttributeTest, byte_normalized) TEST_F(VertexAttributeTest, ByteNormalized)
{ {
GLbyte inputData[mVertexCount] = { 0, 1, 2, 3, 4, -1, -2, -3, -4, 125, 126, 127, -128, -127, -126 }; GLbyte inputData[mVertexCount] = { 0, 1, 2, 3, 4, -1, -2, -3, -4, 125, 126, 127, -128, -127, -126 };
GLfloat expectedData[mVertexCount]; GLfloat expectedData[mVertexCount];
...@@ -170,7 +170,7 @@ TEST_F(VertexAttributeTest, byte_normalized) ...@@ -170,7 +170,7 @@ TEST_F(VertexAttributeTest, byte_normalized)
runTest(data); runTest(data);
} }
TEST_F(VertexAttributeTest, unsigned_short_unormalized) TEST_F(VertexAttributeTest, UnsignedShortUnnormalized)
{ {
GLushort inputData[mVertexCount] = { 0, 1, 2, 3, 254, 255, 256, 32766, 32767, 32768, 65533, 65534, 65535 }; GLushort inputData[mVertexCount] = { 0, 1, 2, 3, 254, 255, 256, 32766, 32767, 32768, 65533, 65534, 65535 };
GLfloat expectedData[mVertexCount]; GLfloat expectedData[mVertexCount];
...@@ -183,7 +183,7 @@ TEST_F(VertexAttributeTest, unsigned_short_unormalized) ...@@ -183,7 +183,7 @@ TEST_F(VertexAttributeTest, unsigned_short_unormalized)
runTest(data); runTest(data);
} }
TEST_F(VertexAttributeTest, unsigned_short_normalized) TEST_F(VertexAttributeTest, UnsignedShortNormalized)
{ {
GLushort inputData[mVertexCount] = { 0, 1, 2, 3, 254, 255, 256, 32766, 32767, 32768, 65533, 65534, 65535 }; GLushort inputData[mVertexCount] = { 0, 1, 2, 3, 254, 255, 256, 32766, 32767, 32768, 65533, 65534, 65535 };
GLfloat expectedData[mVertexCount]; GLfloat expectedData[mVertexCount];
...@@ -196,7 +196,7 @@ TEST_F(VertexAttributeTest, unsigned_short_normalized) ...@@ -196,7 +196,7 @@ TEST_F(VertexAttributeTest, unsigned_short_normalized)
runTest(data); runTest(data);
} }
TEST_F(VertexAttributeTest, short_unnormalized) TEST_F(VertexAttributeTest, ShortUnnormalized)
{ {
GLshort inputData[mVertexCount] = { 0, 1, 2, 3, -1, -2, -3, -4, 32766, 32767, -32768, -32767, -32766 }; GLshort inputData[mVertexCount] = { 0, 1, 2, 3, -1, -2, -3, -4, 32766, 32767, -32768, -32767, -32766 };
GLfloat expectedData[mVertexCount]; GLfloat expectedData[mVertexCount];
...@@ -209,7 +209,7 @@ TEST_F(VertexAttributeTest, short_unnormalized) ...@@ -209,7 +209,7 @@ TEST_F(VertexAttributeTest, short_unnormalized)
runTest(data); runTest(data);
} }
TEST_F(VertexAttributeTest, short_normalized) TEST_F(VertexAttributeTest, ShortNormalized)
{ {
GLshort inputData[mVertexCount] = { 0, 1, 2, 3, -1, -2, -3, -4, 32766, 32767, -32768, -32767, -32766 }; GLshort inputData[mVertexCount] = { 0, 1, 2, 3, -1, -2, -3, -4, 32766, 32767, -32768, -32767, -32766 };
GLfloat expectedData[mVertexCount]; GLfloat expectedData[mVertexCount];
......
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