Commit 50cf2be0 by Jamie Madill Committed by Commit Bot

Reformat some style in touched files.

This was triggered by running the code generation script. Bug: angleproject:2665 Change-Id: Id639c78eb618182ee1859678590cf0f559b572c2 Reviewed-on: https://chromium-review.googlesource.com/1101564Reviewed-by: 's avatarOlli Etuaho <oetuaho@nvidia.com> Reviewed-by: 's avatarLuc Ferron <lucferron@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 57707e5f
......@@ -22,7 +22,7 @@ class TSymbolUniqueId
POOL_ALLOCATOR_NEW_DELETE();
explicit TSymbolUniqueId(const TSymbol &symbol);
constexpr TSymbolUniqueId(const TSymbolUniqueId &) = default;
TSymbolUniqueId &operator=(const TSymbolUniqueId &);
TSymbolUniqueId &operator =(const TSymbolUniqueId &);
bool operator==(const TSymbolUniqueId &) const;
constexpr int get() const { return mId; }
......
......@@ -191,7 +191,8 @@ class TType
const TVector<unsigned int> *getArraySizes() const { return mArraySizes; }
unsigned int getArraySizeProduct() const;
bool isUnsizedArray() const;
unsigned int getOutermostArraySize() const {
unsigned int getOutermostArraySize() const
{
ASSERT(isArray());
return mArraySizes->back();
}
......
......@@ -99,7 +99,7 @@ LinkedUniform::LinkedUniform(const LinkedUniform &uniform)
LinkedUniform &LinkedUniform::operator=(const LinkedUniform &uniform)
{
sh::Uniform::operator=(uniform);
sh::Uniform::operator =(uniform);
ActiveVariable::operator=(uniform);
typeInfo = uniform.typeInfo;
bufferIndex = uniform.bufferIndex;
......
......@@ -13,8 +13,8 @@
#include <ShaderLang.h>
// Other glslang includes.
#include <StandAlone/ResourceLimits.h>
#include <SPIRV/GlslangToSpv.h>
#include <StandAlone/ResourceLimits.h>
#include <array>
......
......@@ -10,8 +10,8 @@
#ifndef LIBANGLE_RENDERER_VULKAN_RENDERERVK_H_
#define LIBANGLE_RENDERER_VULKAN_RENDERERVK_H_
#include <memory>
#include <vulkan/vulkan.h>
#include <memory>
#include "common/angleutils.h"
#include "libANGLE/Caps.h"
......
......@@ -26,10 +26,7 @@ class GLSLTest : public ANGLETest
setConfigAlphaBits(8);
}
virtual void SetUp()
{
ANGLETest::SetUp();
}
virtual void SetUp() { ANGLETest::SetUp(); }
std::string GenerateVaryingType(GLint vectorSize)
{
......@@ -57,7 +54,8 @@ class GLSLTest : public ANGLETest
}
else
{
sprintf(buff, "varying %s v%d[%d];\n", GenerateVaryingType(vectorSize).c_str(), id, arraySize);
sprintf(buff, "varying %s v%d[%d];\n", GenerateVaryingType(vectorSize).c_str(), id,
arraySize);
}
return std::string(buff);
......@@ -77,7 +75,8 @@ class GLSLTest : public ANGLETest
{
for (int i = 0; i < arraySize; i++)
{
sprintf(buff, "\t v%d[%d] = %s(1.0);\n", id, i, GenerateVaryingType(vectorSize).c_str());
sprintf(buff, "\t v%d[%d] = %s(1.0);\n", id, i,
GenerateVaryingType(vectorSize).c_str());
returnString += buff;
}
}
......@@ -106,11 +105,22 @@ class GLSLTest : public ANGLETest
}
}
void GenerateGLSLWithVaryings(GLint floatCount, GLint floatArrayCount, GLint vec2Count, GLint vec2ArrayCount, GLint vec3Count, GLint vec3ArrayCount,
GLint vec4Count, GLint vec4ArrayCount, bool useFragCoord, bool usePointCoord, bool usePointSize,
std::string* fragmentShader, std::string* vertexShader)
void GenerateGLSLWithVaryings(GLint floatCount,
GLint floatArrayCount,
GLint vec2Count,
GLint vec2ArrayCount,
GLint vec3Count,
GLint vec3ArrayCount,
GLint vec4Count,
GLint vec4ArrayCount,
bool useFragCoord,
bool usePointCoord,
bool usePointSize,
std::string *fragmentShader,
std::string *vertexShader)
{
// Generate a string declaring the varyings, to share between the fragment shader and the vertex shader.
// Generate a string declaring the varyings, to share between the fragment shader and the
// vertex shader.
std::string varyingDeclaration;
unsigned int varyingCount = 0;
......@@ -317,15 +327,26 @@ class GLSLTest : public ANGLETest
fragmentShader->append(";\n}");
}
void VaryingTestBase(GLint floatCount, GLint floatArrayCount, GLint vec2Count, GLint vec2ArrayCount, GLint vec3Count, GLint vec3ArrayCount,
GLint vec4Count, GLint vec4ArrayCount, bool useFragCoord, bool usePointCoord, bool usePointSize, bool expectSuccess)
void VaryingTestBase(GLint floatCount,
GLint floatArrayCount,
GLint vec2Count,
GLint vec2ArrayCount,
GLint vec3Count,
GLint vec3ArrayCount,
GLint vec4Count,
GLint vec4ArrayCount,
bool useFragCoord,
bool usePointCoord,
bool usePointSize,
bool expectSuccess)
{
std::string fragmentShaderSource;
std::string vertexShaderSource;
GenerateGLSLWithVaryings(floatCount, floatArrayCount, vec2Count, vec2ArrayCount, vec3Count, vec3ArrayCount,
vec4Count, vec4ArrayCount, useFragCoord, usePointCoord, usePointSize,
&fragmentShaderSource, &vertexShaderSource);
GenerateGLSLWithVaryings(floatCount, floatArrayCount, vec2Count, vec2ArrayCount, vec3Count,
vec3ArrayCount, vec4Count, vec4ArrayCount, useFragCoord,
usePointCoord, usePointSize, &fragmentShaderSource,
&vertexShaderSource);
GLuint program = CompileProgram(vertexShaderSource, fragmentShaderSource);
......@@ -478,18 +499,12 @@ class GLSLTestNoValidation : public GLSLTest
class GLSLTest_ES3 : public GLSLTest
{
void SetUp() override
{
ANGLETest::SetUp();
}
void SetUp() override { ANGLETest::SetUp(); }
};
class GLSLTest_ES31 : public GLSLTest
{
void SetUp() override
{
ANGLETest::SetUp();
}
void SetUp() override { ANGLETest::SetUp(); }
};
TEST_P(GLSLTest, NamelessScopedStructs)
......@@ -638,7 +653,7 @@ TEST_P(GLSLTest, ElseIfRewriting)
drawQuad(program, "a_position", 0.5f);
EXPECT_PIXEL_EQ(0, 0, 255, 0, 0, 255);
EXPECT_PIXEL_EQ(getWindowWidth()-1, 0, 0, 255, 0, 255);
EXPECT_PIXEL_EQ(getWindowWidth() - 1, 0, 0, 255, 0, 255);
}
TEST_P(GLSLTest, TwoElseIfRewriting)
......@@ -1308,15 +1323,16 @@ TEST_P(GLSLTest, MaxVaryingVec2Arrays)
VaryingTestBase(0, 0, 0, maxVec2Arrays, 0, 0, 0, 0, false, false, false, true);
}
// Verify shader source with a fixed length that is less than the null-terminated length will compile.
// Verify shader source with a fixed length that is less than the null-terminated length will
// compile.
TEST_P(GLSLTest, FixedShaderLength)
{
GLuint shader = glCreateShader(GL_FRAGMENT_SHADER);
const std::string appendGarbage = "abcasdfasdfasdfasdfasdf";
const std::string source = "void main() { gl_FragColor = vec4(0, 0, 0, 0); }" + appendGarbage;
const char *sourceArray[1] = { source.c_str() };
GLint lengths[1] = { static_cast<GLint>(source.length() - appendGarbage.length()) };
const char *sourceArray[1] = {source.c_str()};
GLint lengths[1] = {static_cast<GLint>(source.length() - appendGarbage.length())};
glShaderSource(shader, static_cast<GLsizei>(ArraySize(sourceArray)), sourceArray, lengths);
glCompileShader(shader);
......@@ -1331,7 +1347,7 @@ TEST_P(GLSLTest, NegativeShaderLength)
GLuint shader = glCreateShader(GL_FRAGMENT_SHADER);
const char *sourceArray[1] = {essl1_shaders::fs::Red()};
GLint lengths[1] = { -10 };
GLint lengths[1] = {-10};
glShaderSource(shader, static_cast<GLsizei>(ArraySize(sourceArray)), sourceArray, lengths);
glCompileShader(shader);
......@@ -1358,19 +1374,11 @@ TEST_P(GLSLTest, MixedShaderLengths)
{
GLuint shader = glCreateShader(GL_FRAGMENT_SHADER);
const char *sourceArray[] =
{
"void main()",
"{",
" gl_FragColor = vec4(0, 0, 0, 0);",
"}",
const char *sourceArray[] = {
"void main()", "{", " gl_FragColor = vec4(0, 0, 0, 0);", "}",
};
GLint lengths[] =
{
-10,
1,
static_cast<GLint>(strlen(sourceArray[2])),
-1,
GLint lengths[] = {
-10, 1, static_cast<GLint>(strlen(sourceArray[2])), -1,
};
ASSERT_EQ(ArraySize(sourceArray), ArraySize(lengths));
......@@ -1387,21 +1395,11 @@ TEST_P(GLSLTest, ZeroShaderLength)
{
GLuint shader = glCreateShader(GL_FRAGMENT_SHADER);
const char *sourceArray[] =
{
"adfasdf",
"34534",
"void main() { gl_FragColor = vec4(0, 0, 0, 0); }",
"",
"asdfasdfsdsdf",
const char *sourceArray[] = {
"adfasdf", "34534", "void main() { gl_FragColor = vec4(0, 0, 0, 0); }", "", "asdfasdfsdsdf",
};
GLint lengths[] =
{
0,
0,
-1,
0,
0,
GLint lengths[] = {
0, 0, -1, 0, 0,
};
ASSERT_EQ(ArraySize(sourceArray), ArraySize(lengths));
......@@ -4292,7 +4290,8 @@ ANGLE_INSTANTIATE_TEST(GLSLTest,
ES2_OPENGLES(),
ES3_OPENGLES());
// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
// Use this to select which configurations (e.g. which renderer, which GLES major version) these
// tests should be run against.
ANGLE_INSTANTIATE_TEST(GLSLTest_ES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
ANGLE_INSTANTIATE_TEST(WebGLGLSLTest, ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES());
......
......@@ -200,6 +200,7 @@ class Texture2DTest : public TexCoordDrawTest
!extensionEnabled("GL_CHROMIUM_color_buffer_float_rgb"));
}
// clang-format off
GLfloat sourceImageData[4][16] =
{
{ // R
......@@ -227,21 +228,14 @@ class Texture2DTest : public TexCoordDrawTest
1.0f, 1.0f, 0.0f, 1.0f
},
};
// clang-format on
GLenum imageFormats[] =
{
GL_R32F,
GL_RG32F,
GL_RGB32F,
GL_RGBA32F,
GLenum imageFormats[] = {
GL_R32F, GL_RG32F, GL_RGB32F, GL_RGBA32F,
};
GLenum sourceUnsizedFormats[] =
{
GL_RED,
GL_RG,
GL_RGB,
GL_RGBA,
GLenum sourceUnsizedFormats[] = {
GL_RED, GL_RG, GL_RGB, GL_RGBA,
};
GLuint textures[2];
......@@ -661,7 +655,6 @@ class SamplerArrayTest : public TexCoordDrawTest
GLint mTexture1UniformLocation;
};
class SamplerArrayAsFunctionParameterTest : public SamplerArrayTest
{
protected:
......@@ -1190,7 +1183,7 @@ TEST_P(Texture2DTest, NegativeAPISubImage)
setUpProgram();
const GLubyte *pixels[20] = { 0 };
const GLubyte *pixels[20] = {0};
glTexSubImage2D(GL_TEXTURE_2D, 0, 1, 1, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
EXPECT_GL_ERROR(GL_INVALID_VALUE);
......@@ -1241,7 +1234,7 @@ TEST_P(Texture2DTest, ZeroSizedUploads)
glUniform1i(mTexture2DUniformLocation, 0);
drawQuad(mProgram, "position", 0.5f);
const GLubyte *pixel[4] = { 0 };
const GLubyte *pixel[4] = {0};
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixel);
EXPECT_GL_NO_ERROR();
......@@ -1389,7 +1382,8 @@ TEST_P(TextureCubeTest, CubeMapFBO)
glBindFramebuffer(GL_FRAMEBUFFER, fbo);
glBindTexture(GL_TEXTURE_CUBE_MAP, mTextureCube);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_Y, mTextureCube, 0);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
mTextureCube, 0);
EXPECT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
......@@ -1398,7 +1392,8 @@ TEST_P(TextureCubeTest, CubeMapFBO)
EXPECT_GL_NO_ERROR();
}
// Test that glTexSubImage2D works properly when glTexStorage2DEXT has initialized the image with a default color.
// Test that glTexSubImage2D works properly when glTexStorage2DEXT has initialized the image with a
// default color.
TEST_P(Texture2DTest, TexStorage)
{
ANGLE_SKIP_TEST_IF(getClientMajorVersion() < 3 && !extensionEnabled("GL_EXT_texture_storage"));
......@@ -1421,8 +1416,8 @@ TEST_P(Texture2DTest, TexStorage)
}
// ANGLE internally uses RGBA as the DirectX format for RGB images
// therefore glTexStorage2DEXT initializes the image to a default color to get a consistent alpha color.
// The data is kept in a CPU-side image and the image is marked as dirty.
// therefore glTexStorage2DEXT initializes the image to a default color to get a consistent
// alpha color. The data is kept in a CPU-side image and the image is marked as dirty.
if (getClientMajorVersion() >= 3)
{
glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGB8, 16, 16);
......@@ -1452,7 +1447,8 @@ TEST_P(Texture2DTest, TexStorage)
EXPECT_EQ(255, pixel.A);
}
// Test that glTexSubImage2D combined with a PBO works properly when glTexStorage2DEXT has initialized the image with a default color.
// Test that glTexSubImage2D combined with a PBO works properly when glTexStorage2DEXT has
// initialized the image with a default color.
TEST_P(Texture2DTest, TexStorageWithPBO)
{
if (extensionEnabled("NV_pixel_buffer_object"))
......@@ -1481,8 +1477,8 @@ TEST_P(Texture2DTest, TexStorageWithPBO)
glBufferData(GL_PIXEL_UNPACK_BUFFER, 3 * 16 * 16, pixels.data(), GL_STATIC_DRAW);
// ANGLE internally uses RGBA as the DirectX format for RGB images
// therefore glTexStorage2DEXT initializes the image to a default color to get a consistent alpha color.
// The data is kept in a CPU-side image and the image is marked as dirty.
// therefore glTexStorage2DEXT initializes the image to a default color to get a consistent
// alpha color. The data is kept in a CPU-side image and the image is marked as dirty.
glTexStorage2DEXT(GL_TEXTURE_2D, 1, GL_RGB8, 16, 16);
// Initializes the color of the upper-left 8x8 pixels, leaves the other pixels untouched.
......@@ -1571,8 +1567,10 @@ TEST_P(Texture2DTest, CopySubImageFloat_RGBA_RGBA)
testFloatCopySubImage(4, 4);
}
// Port of https://www.khronos.org/registry/webgl/conformance-suites/1.0.3/conformance/textures/texture-npot.html
// Run against GL_ALPHA/UNSIGNED_BYTE format, to ensure that D3D11 Feature Level 9_3 correctly handles GL_ALPHA
// Port of
// https://www.khronos.org/registry/webgl/conformance-suites/1.0.3/conformance/textures/texture-npot.html
// Run against GL_ALPHA/UNSIGNED_BYTE format, to ensure that D3D11 Feature Level 9_3 correctly
// handles GL_ALPHA
TEST_P(Texture2DTest, TextureNPOT_GL_ALPHA_UBYTE)
{
// TODO(lucferron): DIRTY_BIT_UNPACK_STATE isn't implemented on Vulkan yet.
......@@ -1609,11 +1607,13 @@ TEST_P(Texture2DTest, TextureNPOT_GL_ALPHA_UBYTE)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
// Check that an NPOT texture not on level 0 generates INVALID_VALUE
glTexImage2D(GL_TEXTURE_2D, 1, GL_ALPHA, npotTexSize, npotTexSize, 0, GL_ALPHA, GL_UNSIGNED_BYTE, pixels.data());
glTexImage2D(GL_TEXTURE_2D, 1, GL_ALPHA, npotTexSize, npotTexSize, 0, GL_ALPHA,
GL_UNSIGNED_BYTE, pixels.data());
EXPECT_GL_ERROR(GL_INVALID_VALUE);
// Check that an NPOT texture on level 0 succeeds
glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, npotTexSize, npotTexSize, 0, GL_ALPHA, GL_UNSIGNED_BYTE, pixels.data());
glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, npotTexSize, npotTexSize, 0, GL_ALPHA,
GL_UNSIGNED_BYTE, pixels.data());
EXPECT_GL_NO_ERROR();
// Check that generateMipmap fails on NPOT
......@@ -1644,7 +1644,8 @@ TEST_P(Texture2DTest, TextureNPOT_GL_ALPHA_UBYTE)
EXPECT_PIXEL_EQ(getWindowWidth() / 2, getWindowHeight() / 2, 0, 0, 0, 64);
// Check that glTexImage2D for POT texture succeeds
glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, potTexSize, potTexSize, 0, GL_ALPHA, GL_UNSIGNED_BYTE, pixels.data());
glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, potTexSize, potTexSize, 0, GL_ALPHA, GL_UNSIGNED_BYTE,
pixels.data());
EXPECT_GL_NO_ERROR();
// Check that generateMipmap for an POT texture succeeds
......@@ -2192,9 +2193,9 @@ TEST_P(Texture2DTestES3, SetImageWhenBaseLevelOutOfRange)
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
}
// In the D3D11 renderer, we need to initialize some texture formats, to fill empty channels. EG RBA->RGBA8, with 1.0
// in the alpha channel. This test covers a bug where redefining array textures with these formats does not work as
// expected.
// In the D3D11 renderer, we need to initialize some texture formats, to fill empty channels. EG
// RBA->RGBA8, with 1.0 in the alpha channel. This test covers a bug where redefining array textures
// with these formats does not work as expected.
TEST_P(Texture2DArrayTestES3, RedefineInittableArray)
{
std::vector<GLubyte> pixelData;
......@@ -2210,7 +2211,8 @@ TEST_P(Texture2DArrayTestES3, RedefineInittableArray)
glUniform1i(mTextureArrayLocation, 0);
// The first draw worked correctly.
glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB, 4, 4, 2, 0, GL_RGB, GL_UNSIGNED_BYTE, &pixelData[0]);
glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB, 4, 4, 2, 0, GL_RGB, GL_UNSIGNED_BYTE,
&pixelData[0]);
glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
......@@ -2220,7 +2222,8 @@ TEST_P(Texture2DArrayTestES3, RedefineInittableArray)
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
// The dimension of the respecification must match the original exactly to trigger the bug.
glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB, 4, 4, 2, 0, GL_RGB, GL_UNSIGNED_BYTE, &pixelData[0]);
glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB, 4, 4, 2, 0, GL_RGB, GL_UNSIGNED_BYTE,
&pixelData[0]);
drawQuad(mProgram, "position", 1.0f);
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
......@@ -3098,9 +3101,9 @@ class Texture2DNorm16TestES3 : public Texture2DTestES3
GLubyte expectedValue = (type == GL_SHORT) ? 0xFF : static_cast<GLubyte>(pixelValue >> 8);
EXPECT_PIXEL_COLOR_EQ(
0, 0, SliceFormatColor(
format, GLColor(expectedValue, expectedValue, expectedValue, expectedValue)));
EXPECT_PIXEL_COLOR_EQ(0, 0,
SliceFormatColor(format, GLColor(expectedValue, expectedValue,
expectedValue, expectedValue)));
glBindFramebuffer(GL_FRAMEBUFFER, 0);
......@@ -3129,9 +3132,9 @@ class Texture2DNorm16TestES3 : public Texture2DTestES3
drawQuad(mProgram, "position", 0.5f);
GLubyte expectedValue = static_cast<GLubyte>(pixelValue >> 8);
EXPECT_PIXEL_COLOR_EQ(
0, 0, SliceFormatColor(
format, GLColor(expectedValue, expectedValue, expectedValue, expectedValue)));
EXPECT_PIXEL_COLOR_EQ(0, 0,
SliceFormatColor(format, GLColor(expectedValue, expectedValue,
expectedValue, expectedValue)));
glBindRenderbuffer(GL_RENDERBUFFER, mRenderbuffer);
glRenderbufferStorage(GL_RENDERBUFFER, internalformat, 1, 1);
......@@ -3758,7 +3761,8 @@ TEST_P(Texture2DTestES3, GenerateMipmapAndBaseLevelLUMA)
EXPECT_PIXEL_COLOR_EQ(0, 0, angle::GLColor::white);
}
// Use this to select which configurations (e.g. which renderer, which GLES major version) these tests should be run against.
// Use this to select which configurations (e.g. which renderer, which GLES major version) these
// tests should be run against.
ANGLE_INSTANTIATE_TEST(Texture2DTest,
ES2_D3D9(),
ES2_D3D11(),
......
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