Skip to content

A
angle
Commit 2f07e4fb by James Dong Committed by Commit Bot
Options

Add test for array of arrays of samplers

This test fails on the Vulkan backend because Vulkan does not allow arrays of arrays of samplers. Also adds a few other tests relating to arrays of arrays. Test: ./angle_end2end_tests --gtest_filter='GLSLTest_ES31.*' Bug: angleproject:3604 Change-Id: I5c47119b6ba6d26fe30fdd9c6730caac6f222696 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1733476 Commit-Queue: James Dong <dongja@google.com> Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org>
parent b8482ab7
Showing with 640 additions and 2 deletions
src/tests/gl_tests/GLSLTest.cpp
...@@ -2980,8 +2980,8 @@ void main() { ...@@ -2980,8 +2980,8 @@ void main() {
glUnmapBuffer(GL_SHADER_STORAGE_BUFFER); glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
} }
// Test that array indices for arrays of arrays work as expected. // Test that array indices for arrays of arrays of basic types work as expected.
TEST_P(GLSLTest_ES31, ArraysOfArrays) TEST_P(GLSLTest_ES31, ArraysOfArraysBasicType)
{ {
constexpr char kFS[] = constexpr char kFS[] =
"#version 310 es\n" "#version 310 es\n"
...@@ -3018,6 +3018,644 @@ TEST_P(GLSLTest_ES31, ArraysOfArrays) ...@@ -3018,6 +3018,644 @@ TEST_P(GLSLTest_ES31, ArraysOfArrays)
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green); EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
} }
// Test that array indices for arrays of arrays of basic types work as expected
// inside blocks.
TEST_P(GLSLTest_ES31, ArraysOfArraysBlockBasicType)
{
// anglebug.com/3821 - fails on AMD Windows
ANGLE_SKIP_TEST_IF(IsWindows() && IsAMD() && IsOpenGL());
constexpr char kFS[] =
"#version 310 es\n"
"precision mediump float;\n"
"out vec4 my_FragColor;\n"
"layout(packed) uniform UBO { ivec2 test[2][2]; } ubo_data;\n"
"void main() {\n"
" bool passed = true;\n"
" for (int i = 0; i < 2; i++) {\n"
" for (int j = 0; j < 2; j++) {\n"
" if (ubo_data.test[i][j] != ivec2(i + 1, j + 1)) {\n"
" passed = false;\n"
" }\n"
" }\n"
" }\n"
" my_FragColor = passed ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);\n"
"}\n";
ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
glUseProgram(program.get());
// Use interface queries to determine buffer size and offset
GLuint uboBlockIndex = glGetProgramResourceIndex(program.get(), GL_UNIFORM_BLOCK, "UBO");
GLenum uboDataSizeProp = GL_BUFFER_DATA_SIZE;
GLint uboDataSize;
glGetProgramResourceiv(program.get(), GL_UNIFORM_BLOCK, uboBlockIndex, 1, &uboDataSizeProp, 1,
nullptr, &uboDataSize);
std::unique_ptr<char[]> uboData(new char[uboDataSize]);
for (int i = 0; i < 2; i++)
{
std::stringstream resourceName;
resourceName << "UBO.test[" << i << "][0]";
GLenum resourceProps[] = {GL_ARRAY_STRIDE, GL_OFFSET};
struct
{
GLint stride;
GLint offset;
} values;
GLuint resourceIndex =
glGetProgramResourceIndex(program.get(), GL_UNIFORM, resourceName.str().c_str());
ASSERT_NE(resourceIndex, GL_INVALID_INDEX);
glGetProgramResourceiv(program.get(), GL_UNIFORM, resourceIndex, 2, &resourceProps[0], 2,
nullptr, &values.stride);
for (int j = 0; j < 2; j++)
{
GLint(&dataPtr)[2] =
*reinterpret_cast<GLint(*)[2]>(&uboData[values.offset + j * values.stride]);
dataPtr[0] = i + 1;
dataPtr[1] = j + 1;
}
}
GLBuffer ubo;
glBindBuffer(GL_UNIFORM_BUFFER, ubo.get());
glBufferData(GL_UNIFORM_BUFFER, uboDataSize, &uboData[0], GL_STATIC_DRAW);
GLuint ubo_index = glGetUniformBlockIndex(program.get(), "UBO");
ASSERT_NE(ubo_index, GL_INVALID_INDEX);
glUniformBlockBinding(program.get(), ubo_index, 5);
glBindBufferBase(GL_UNIFORM_BUFFER, 5, ubo.get());
drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.5f);
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
}
// Test that arrays of arrays of samplers work as expected.
TEST_P(GLSLTest_ES31, ArraysOfArraysSampler)
{
// anglebug.com/3604 - Vulkan doesn't support 2D arrays of samplers
ANGLE_SKIP_TEST_IF(IsVulkan());
constexpr char kFS[] =
"#version 310 es\n"
"precision mediump float;\n"
"out vec4 my_FragColor;\n"
"uniform mediump isampler2D test[2][2];\n"
"void main() {\n"
" bool passed = true;\n"
"#define DO_CHECK(i,j) \\\n"
" if (texture(test[i][j], vec2(0.0, 0.0)) != ivec4(i + 1, j + 1, 0, 1)) { \\\n"
" passed = false; \\\n"
" }\n"
" DO_CHECK(0, 0)\n"
" DO_CHECK(0, 1)\n"
" DO_CHECK(1, 0)\n"
" DO_CHECK(1, 1)\n"
" my_FragColor = passed ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);\n"
"}\n";
ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
glUseProgram(program.get());
GLTexture textures[2][2];
for (int i = 0; i < 2; i++)
{
for (int j = 0; j < 2; j++)
{
// First generate the texture
int textureUnit = i * 2 + j;
glActiveTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(GL_TEXTURE_2D, textures[i][j]);
GLint texData[2] = {i + 1, j + 1};
glTexImage2D(GL_TEXTURE_2D, 0, GL_RG32I, 1, 1, 0, GL_RG_INTEGER, GL_INT, &texData[0]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
// Then send it as a uniform
std::stringstream uniformName;
uniformName << "test[" << i << "][" << j << "]";
GLint uniformLocation = glGetUniformLocation(program.get(), uniformName.str().c_str());
// All array indices should be used.
EXPECT_NE(uniformLocation, -1);
glUniform1i(uniformLocation, textureUnit);
}
}
drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.5f);
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
}
// Test that structs containing arrays of samplers work as expected.
TEST_P(GLSLTest_ES31, StructArraySampler)
{
constexpr char kFS[] =
"#version 310 es\n"
"precision mediump float;\n"
"out vec4 my_FragColor;\n"
"struct Data { mediump sampler2D data[2]; };\n"
"uniform Data test;\n"
"void main() {\n"
" my_FragColor = vec4(texture(test.data[0], vec2(0.0, 0.0)).rg,\n"
" texture(test.data[1], vec2(0.0, 0.0)).rg);\n"
"}\n";
ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
glUseProgram(program.get());
GLTexture textures[2];
GLColor expected = MakeGLColor(32, 64, 96, 255);
for (int i = 0; i < 2; i++)
{
glActiveTexture(GL_TEXTURE0 + i);
glBindTexture(GL_TEXTURE_2D, textures[i]);
// Each element provides two components.
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
expected.data() + 2 * i);
std::stringstream uniformName;
uniformName << "test.data[" << i << "]";
// Then send it as a uniform
GLint uniformLocation = glGetUniformLocation(program.get(), uniformName.str().c_str());
// The uniform should be active.
EXPECT_NE(uniformLocation, -1);
glUniform1i(uniformLocation, i);
}
drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.5f);
EXPECT_PIXEL_COLOR_EQ(0, 0, expected);
}
// Test that arrays of arrays of samplers inside structs work as expected.
TEST_P(GLSLTest_ES31, StructArrayArraySampler)
{
// anglebug.com/3604 - Vulkan doesn't support 2D arrays of samplers
ANGLE_SKIP_TEST_IF(IsVulkan());
constexpr char kFS[] =
"#version 310 es\n"
"precision mediump float;\n"
"out vec4 my_FragColor;\n"
"struct Data { mediump isampler2D data[2][2]; };\n"
"uniform Data test;\n"
"void main() {\n"
" bool passed = true;\n"
"#define DO_CHECK(i,j) \\\n"
" if (texture(test.data[i][j], vec2(0.0, 0.0)) != ivec4(i + 1, j + 1, 0, 1)) { \\\n"
" passed = false; \\\n"
" }\n"
" DO_CHECK(0, 0)\n"
" DO_CHECK(0, 1)\n"
" DO_CHECK(1, 0)\n"
" DO_CHECK(1, 1)\n"
" my_FragColor = passed ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);\n"
"}\n";
ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
glUseProgram(program.get());
GLTexture textures[2][2];
for (int i = 0; i < 2; i++)
{
for (int j = 0; j < 2; j++)
{
// First generate the texture
int textureUnit = i * 2 + j;
glActiveTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(GL_TEXTURE_2D, textures[i][j]);
GLint texData[2] = {i + 1, j + 1};
glTexImage2D(GL_TEXTURE_2D, 0, GL_RG32I, 1, 1, 0, GL_RG_INTEGER, GL_INT, &texData[0]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
// Then send it as a uniform
std::stringstream uniformName;
uniformName << "test.data[" << i << "][" << j << "]";
GLint uniformLocation = glGetUniformLocation(program.get(), uniformName.str().c_str());
// All array indices should be used.
EXPECT_NE(uniformLocation, -1);
glUniform1i(uniformLocation, textureUnit);
}
}
drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.5f);
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
}
// Test that an array of structs with arrays of arrays of samplers works.
TEST_P(GLSLTest_ES31, ArrayStructArrayArraySampler)
{
// anglebug.com/3604 - Vulkan doesn't support 2D arrays of samplers
ANGLE_SKIP_TEST_IF(IsVulkan());
GLint numTextures;
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &numTextures);
ANGLE_SKIP_TEST_IF(numTextures < 2 * (2 * 2 + 2 * 2));
constexpr char kFS[] =
"#version 310 es\n"
"precision mediump float;\n"
"out vec4 my_FragColor;\n"
"struct Data { mediump isampler2D data0[2][2]; mediump isampler2D data1[2][2]; };\n"
"uniform Data test[2];\n"
"void main() {\n"
" bool passed = true;\n"
"#define DO_CHECK_ikl(i,k,l) \\\n"
" if (texture(test[i].data0[k][l], vec2(0.0, 0.0)) != ivec4(i, 0, k, l)+1) { \\\n"
" passed = false; \\\n"
" } \\\n"
" if (texture(test[i].data1[k][l], vec2(0.0, 0.0)) != ivec4(i, 1, k, l)+1) { \\\n"
" passed = false; \\\n"
" }\n"
"#define DO_CHECK_ik(i,k) \\\n"
" DO_CHECK_ikl(i, k, 0) \\\n"
" DO_CHECK_ikl(i, k, 1)\n"
"#define DO_CHECK_i(i) \\\n"
" DO_CHECK_ik(i, 0) \\\n"
" DO_CHECK_ik(i, 1)\n"
" DO_CHECK_i(0)\n"
" DO_CHECK_i(1)\n"
" my_FragColor = passed ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);\n"
"}\n";
ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
glUseProgram(program.get());
GLTexture textures[2][2][2][2];
for (int i = 0; i < 2; i++)
{
for (int j = 0; j < 2; j++)
{
for (int k = 0; k < 2; k++)
{
for (size_t l = 0; l < 2; l++)
{
// First generate the texture
int textureUnit = l + 2 * (k + 2 * (j + 2 * i));
glActiveTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(GL_TEXTURE_2D, textures[i][j][k][l]);
GLint texData[4] = {i + 1, j + 1, k + 1, l + 1};
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32I, 1, 1, 0, GL_RGBA_INTEGER, GL_INT,
&texData[0]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
// Then send it as a uniform
std::stringstream uniformName;
uniformName << "test[" << i << "].data" << j << "[" << k << "][" << l << "]";
GLint uniformLocation =
glGetUniformLocation(program.get(), uniformName.str().c_str());
// All array indices should be used.
EXPECT_NE(uniformLocation, -1);
glUniform1i(uniformLocation, textureUnit);
}
}
}
}
drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.5f);
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
}
// Test that a complex chain of structs and arrays of samplers works as expected.
TEST_P(GLSLTest_ES31, ComplexStructArraySampler)
{
// anglebug.com/3604 - Vulkan doesn't support 2D arrays of samplers
ANGLE_SKIP_TEST_IF(IsVulkan());
GLint numTextures;
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &numTextures);
ANGLE_SKIP_TEST_IF(numTextures < 2 * 3 * (2 + 3));
constexpr char kFS[] =
"#version 310 es\n"
"precision mediump float;\n"
"out vec4 my_FragColor;\n"
"struct Data { mediump isampler2D data0[2]; mediump isampler2D data1[3]; };\n"
"uniform Data test[2][3];\n"
"const vec2 ZERO = vec2(0.0, 0.0);\n"
"void main() {\n"
" bool passed = true;\n"
"#define DO_CHECK_INNER0(i,j,l) \\\n"
" if (texture(test[i][j].data0[l], ZERO) != ivec4(i, j, 0, l) + 1) { \\\n"
" passed = false; \\\n"
" }\n"
"#define DO_CHECK_INNER1(i,j,l) \\\n"
" if (texture(test[i][j].data1[l], ZERO) != ivec4(i, j, 1, l) + 1) { \\\n"
" passed = false; \\\n"
" }\n"
"#define DO_CHECK(i,j) \\\n"
" DO_CHECK_INNER0(i, j, 0) \\\n"
" DO_CHECK_INNER0(i, j, 1) \\\n"
" DO_CHECK_INNER1(i, j, 0) \\\n"
" DO_CHECK_INNER1(i, j, 1) \\\n"
" DO_CHECK_INNER1(i, j, 2)\n"
" DO_CHECK(0, 0)\n"
" DO_CHECK(0, 1)\n"
" DO_CHECK(0, 2)\n"
" DO_CHECK(1, 0)\n"
" DO_CHECK(1, 1)\n"
" DO_CHECK(1, 2)\n"
" my_FragColor = passed ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);\n"
"}\n";
ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
glUseProgram(program.get());
struct Data
{
GLTexture data1[2];
GLTexture data2[3];
};
Data textures[2][3];
for (int i = 0; i < 2; i++)
{
for (int j = 0; j < 3; j++)
{
GLTexture *arrays[] = {&textures[i][j].data1[0], &textures[i][j].data2[0]};
size_t arrayLengths[] = {2, 3};
size_t arrayOffsets[] = {0, 2};
size_t totalArrayLength = 5;
for (int k = 0; k < 2; k++)
{
GLTexture *array = arrays[k];
size_t arrayLength = arrayLengths[k];
size_t arrayOffset = arrayOffsets[k];
for (size_t l = 0; l < arrayLength; l++)
{
// First generate the texture
int textureUnit = arrayOffset + l + totalArrayLength * (j + 3 * i);
glActiveTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(GL_TEXTURE_2D, array[l]);
GLint texData[4] = {i + 1, j + 1, k + 1, l + 1};
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32I, 1, 1, 0, GL_RGBA_INTEGER, GL_INT,
&texData[0]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
// Then send it as a uniform
std::stringstream uniformName;
uniformName << "test[" << i << "][" << j << "].data" << k << "[" << l << "]";
GLint uniformLocation =
glGetUniformLocation(program.get(), uniformName.str().c_str());
// All array indices should be used.
EXPECT_NE(uniformLocation, -1);
glUniform1i(uniformLocation, textureUnit);
}
}
}
}
drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.5f);
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
}
TEST_P(GLSLTest_ES31, ArraysOfArraysStructDifferentTypesSampler)
{
// anglebug.com/3604 - Vulkan doesn't support 2D arrays of samplers
ANGLE_SKIP_TEST_IF(IsVulkan());
GLint numTextures;
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &numTextures);
ANGLE_SKIP_TEST_IF(numTextures < 3 * (2 + 2));
constexpr char kFS[] =
"#version 310 es\n"
"precision mediump float;\n"
"out vec4 my_FragColor;\n"
"struct Data { mediump isampler2D data0[2]; mediump sampler2D data1[2]; };\n"
"uniform Data test[3];\n"
"ivec4 f2i(vec4 x) { return ivec4(x * 4.0 + 0.5); }"
"void main() {\n"
" bool passed = true;\n"
"#define DO_CHECK_ik(i,k) \\\n"
" if (texture(test[i].data0[k], vec2(0.0, 0.0)) != ivec4(i, 0, k, 0)+1) { \\\n"
" passed = false; \\\n"
" } \\\n"
" if (f2i(texture(test[i].data1[k], vec2(0.0, 0.0))) != ivec4(i, 1, k, 0)+1) { \\\n"
" passed = false; \\\n"
" }\n"
"#define DO_CHECK_i(i) \\\n"
" DO_CHECK_ik(i, 0) \\\n"
" DO_CHECK_ik(i, 1)\n"
" DO_CHECK_i(0)\n"
" DO_CHECK_i(1)\n"
" DO_CHECK_i(2)\n"
" my_FragColor = passed ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);\n"
"}\n";
ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
glUseProgram(program.get());
GLTexture textures[3][2][2];
for (int i = 0; i < 3; i++)
{
for (int j = 0; j < 2; j++)
{
for (int k = 0; k < 2; k++)
{
// First generate the texture
int textureUnit = k + 2 * (j + 2 * i);
glActiveTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(GL_TEXTURE_2D, textures[i][j][k]);
GLint texData[4] = {i + 1, j + 1, k + 1, 1};
GLubyte texDataFloat[4] = {(i + 1) * 64 - 1, (j + 1) * 64 - 1, (k + 1) * 64 - 1,
64};
if (j == 0)
{
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32I, 1, 1, 0, GL_RGBA_INTEGER, GL_INT,
&texData[0]);
}
else
{
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
&texDataFloat[0]);
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
// Then send it as a uniform
std::stringstream uniformName;
uniformName << "test[" << i << "].data" << j << "[" << k << "]";
GLint uniformLocation =
glGetUniformLocation(program.get(), uniformName.str().c_str());
// All array indices should be used.
EXPECT_NE(uniformLocation, -1);
glUniform1i(uniformLocation, textureUnit);
}
}
}
drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.5f);
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
}
// Test that arrays of arrays of samplers as parameters works as expected.
TEST_P(GLSLTest_ES31, ParameterArraysOfArraysSampler)
{
// anglebug.com/3604 - Vulkan doesn't support 2D arrays of samplers
ANGLE_SKIP_TEST_IF(IsVulkan());
// anglebug.com/3832 - no sampler array params on Android
ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
constexpr char kFS[] =
"#version 310 es\n"
"precision mediump float;\n"
"out vec4 my_FragColor;\n"
"uniform mediump isampler2D test[2][3];\n"
"const vec2 ZERO = vec2(0.0, 0.0);\n"
"\n"
"bool check(isampler2D data[2][3]) {\n"
"#define DO_CHECK(i,j) \\\n"
" if (texture(data[i][j], ZERO) != ivec4(i+1, j+1, 0, 1)) { \\\n"
" return false; \\\n"
" }\n"
" DO_CHECK(0, 0)\n"
" DO_CHECK(0, 1)\n"
" DO_CHECK(0, 2)\n"
" DO_CHECK(1, 0)\n"
" DO_CHECK(1, 1)\n"
" DO_CHECK(1, 2)\n"
" return true;\n"
"}\n"
"void main() {\n"
" bool passed = check(test);\n"
" my_FragColor = passed ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);\n"
"}\n";
ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
glUseProgram(program.get());
GLTexture textures[2][3];
for (int i = 0; i < 2; i++)
{
for (int j = 0; j < 3; j++)
{
// First generate the texture
int textureUnit = i * 3 + j;
glActiveTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(GL_TEXTURE_2D, textures[i][j]);
GLint texData[2] = {i + 1, j + 1};
glTexImage2D(GL_TEXTURE_2D, 0, GL_RG32I, 1, 1, 0, GL_RG_INTEGER, GL_INT, &texData[0]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
// Then send it as a uniform
std::stringstream uniformName;
uniformName << "test[" << i << "][" << j << "]";
GLint uniformLocation = glGetUniformLocation(program.get(), uniformName.str().c_str());
// All array indices should be used.
EXPECT_NE(uniformLocation, -1);
glUniform1i(uniformLocation, textureUnit);
}
}
drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.5f);
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
}
// Test that structs with arrays of arrays of samplers as parameters works as expected.
TEST_P(GLSLTest_ES31, ParameterStructArrayArraySampler)
{
// anglebug.com/3604 - Vulkan doesn't support 2D arrays of samplers
ANGLE_SKIP_TEST_IF(IsVulkan());
// anglebug.com/3832 - no sampler array params on Android
ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
constexpr char kFS[] =
"#version 310 es\n"
"precision mediump float;\n"
"out vec4 my_FragColor;\n"
"struct Data { mediump isampler2D data[2][3]; };\n"
"uniform Data test;\n"
"const vec2 ZERO = vec2(0.0, 0.0);\n"
"\n"
"bool check(Data data) {\n"
"#define DO_CHECK(i,j) \\\n"
" if (texture(data.data[i][j], ZERO) != ivec4(i+1, j+1, 0, 1)) { \\\n"
" return false; \\\n"
" }\n"
" DO_CHECK(0, 0)\n"
" DO_CHECK(0, 1)\n"
" DO_CHECK(0, 2)\n"
" DO_CHECK(1, 0)\n"
" DO_CHECK(1, 1)\n"
" DO_CHECK(1, 2)\n"
" return true;\n"
"}\n"
"void main() {\n"
" bool passed = check(test);\n"
" my_FragColor = passed ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);\n"
"}\n";
ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
glUseProgram(program.get());
GLTexture textures[2][3];
for (int i = 0; i < 2; i++)
{
for (int j = 0; j < 3; j++)
{
// First generate the texture
int textureUnit = i * 3 + j;
glActiveTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(GL_TEXTURE_2D, textures[i][j]);
GLint texData[2] = {i + 1, j + 1};
glTexImage2D(GL_TEXTURE_2D, 0, GL_RG32I, 1, 1, 0, GL_RG_INTEGER, GL_INT, &texData[0]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
// Then send it as a uniform
std::stringstream uniformName;
uniformName << "test.data[" << i << "][" << j << "]";
GLint uniformLocation = glGetUniformLocation(program.get(), uniformName.str().c_str());
// All array indices should be used.
EXPECT_NE(uniformLocation, -1);
glUniform1i(uniformLocation, textureUnit);
}
}
drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.5f);
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
}
// Test that arrays of arrays of structs with arrays of arrays of samplers
// as parameters works as expected.
TEST_P(GLSLTest_ES31, ParameterArrayArrayStructArrayArraySampler)
{
// anglebug.com/3604 - Vulkan doesn't support 2D arrays of samplers
ANGLE_SKIP_TEST_IF(IsVulkan());
// anglebug.com/3832 - no sampler array params on Android
ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
GLint numTextures;
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &numTextures);
ANGLE_SKIP_TEST_IF(numTextures < 3 * 2 * 2 * 2);
constexpr char kFS[] =
"#version 310 es\n"
"precision mediump float;\n"
"out vec4 my_FragColor;\n"
"struct Data { mediump isampler2D data[2][2]; };\n"
"uniform Data test[3][2];\n"
"const vec2 ZERO = vec2(0.0, 0.0);\n"
"\n"
"bool check(Data data[3][2]) {\n"
"#define DO_CHECK_ijkl(i,j,k,l) \\\n"
" if (texture(data[i][j].data[k][l], ZERO) != ivec4(i, j, k, l) + 1) { \\\n"
" return false; \\\n"
" }\n"
"#define DO_CHECK_ij(i,j) \\\n"
" DO_CHECK_ijkl(i, j, 0, 0) \\\n"
" DO_CHECK_ijkl(i, j, 0, 1) \\\n"
" DO_CHECK_ijkl(i, j, 1, 0) \\\n"
" DO_CHECK_ijkl(i, j, 1, 1)\n"
" DO_CHECK_ij(0, 0)\n"
" DO_CHECK_ij(1, 0)\n"
" DO_CHECK_ij(2, 0)\n"
" DO_CHECK_ij(0, 1)\n"
" DO_CHECK_ij(1, 1)\n"
" DO_CHECK_ij(2, 1)\n"
" return true;\n"
"}\n"
"void main() {\n"
" bool passed = check(test);\n"
" my_FragColor = passed ? vec4(0.0, 1.0, 0.0, 1.0) : vec4(1.0, 0.0, 0.0, 1.0);\n"
"}\n";
ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
glUseProgram(program.get());
GLTexture textures[3][2][2][2];
for (int i = 0; i < 3; i++)
{
for (int j = 0; j < 2; j++)
{
for (int k = 0; k < 2; k++)
{
for (int l = 0; l < 2; l++)
{
// First generate the texture
int textureUnit = l + 2 * (k + 2 * (j + 2 * i));
glActiveTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(GL_TEXTURE_2D, textures[i][j][k][l]);
GLint texData[4] = {i + 1, j + 1, k + 1, l + 1};
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32I, 1, 1, 0, GL_RGBA_INTEGER, GL_INT,
&texData[0]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
// Then send it as a uniform
std::stringstream uniformName;
uniformName << "test[" << i << "][" << j << "].data[" << k << "][" << l << "]";
GLint uniformLocation =
glGetUniformLocation(program.get(), uniformName.str().c_str());
// All array indices should be used.
EXPECT_NE(uniformLocation, -1);
glUniform1i(uniformLocation, textureUnit);
}
}
}
}
drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.5f);
EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
}
// This test covers a bug (and associated workaround) with nested sampling operations in the HLSL // This test covers a bug (and associated workaround) with nested sampling operations in the HLSL
// compiler DLL. // compiler DLL.
TEST_P(GLSLTest_ES3, NestedSamplingOperation) TEST_P(GLSLTest_ES3, NestedSamplingOperation)
......
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