Skip to content

A
angle
Commit 7a4f6b8c by Olli Etuaho Committed by Commit Bot
Options

Fix resource init/teardown in FramebufferMultiviewTest

GL RAII classes can't be used as test class members since the GL objects need to be deleted before the test class TearDown is called. BUG=angleproject:2765 TEST=angle_end2end_tests Change-Id: If19d33bd044c9e74e46f35183e8ca1bc6a96d6cf Reviewed-on: https://chromium-review.googlesource.com/1179159Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
parent 4836acc5
Showing with 117 additions and 21 deletions
src/tests/gl_tests/FramebufferMultiviewTest.cpp
...@@ -36,14 +36,58 @@ class FramebufferMultiviewTest : public MultiviewTest ...@@ -36,14 +36,58 @@ class FramebufferMultiviewTest : public MultiviewTest
class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest
{ {
protected: protected:
FramebufferMultiviewSideBySideClearTest() {} FramebufferMultiviewSideBySideClearTest()
: mMultiviewFBO(0u), mNonMultiviewFBO(0u), mDepthTex(0u), mDepthStencilTex(0u)
{
}
void TearDown() override
{
if (mMultiviewFBO != 0)
{
glDeleteFramebuffers(1, &mMultiviewFBO);
mMultiviewFBO = 0u;
}
if (mNonMultiviewFBO != 0)
{
glDeleteTextures(1, &mNonMultiviewFBO);
mNonMultiviewFBO = 0u;
}
if (!mColorTex.empty())
{
glDeleteTextures(mColorTex.size(), mColorTex.data());
mColorTex.clear();
}
if (mDepthStencilTex != 0u)
{
glDeleteTextures(1, &mDepthStencilTex);
mDepthStencilTex = 0u;
}
if (mDepthTex != 0u)
{
glDeleteTextures(1, &mDepthTex);
mDepthTex = 0u;
}
MultiviewTest::TearDown();
}
void initializeFBOs(size_t numColorBuffers, bool stencil, bool depth) void initializeFBOs(size_t numColorBuffers, bool stencil, bool depth)
{ {
const std::vector<GLenum> &drawBuffers = GetDrawBufferRange(2); const std::vector<GLenum> &drawBuffers = GetDrawBufferRange(2);
// Generate textures. // Generate textures.
// Generate textures.
mColorTex.resize(numColorBuffers); mColorTex.resize(numColorBuffers);
glGenTextures(mColorTex.size(), mColorTex.data());
if (stencil)
{
glGenTextures(1, &mDepthStencilTex);
}
else if (depth)
{
glGenTextures(1, &mDepthTex);
}
for (size_t i = 0u; i < numColorBuffers; ++i) for (size_t i = 0u; i < numColorBuffers; ++i)
{ {
glBindTexture(GL_TEXTURE_2D, mColorTex[i]); glBindTexture(GL_TEXTURE_2D, mColorTex[i]);
...@@ -52,7 +96,7 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest ...@@ -52,7 +96,7 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest
if (stencil) if (stencil)
{ {
glBindTexture(GL_TEXTURE_2D, mStencilTex); glBindTexture(GL_TEXTURE_2D, mDepthStencilTex);
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, 4, 2, 0, GL_DEPTH_STENCIL, glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, 4, 2, 0, GL_DEPTH_STENCIL,
GL_UNSIGNED_INT_24_8, nullptr); GL_UNSIGNED_INT_24_8, nullptr);
} }
...@@ -63,6 +107,9 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest ...@@ -63,6 +107,9 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest
GL_FLOAT, nullptr); GL_FLOAT, nullptr);
} }
glGenFramebuffers(1, &mMultiviewFBO);
glGenFramebuffers(1, &mNonMultiviewFBO);
// Generate multiview fbo and attach textures. // Generate multiview fbo and attach textures.
const GLint kViewportOffsets[4] = {1, 0, 3, 0}; const GLint kViewportOffsets[4] = {1, 0, 3, 0};
glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO); glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO);
...@@ -76,9 +123,9 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest ...@@ -76,9 +123,9 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest
if (stencil) if (stencil)
{ {
glFramebufferTextureMultiviewSideBySideANGLE(GL_FRAMEBUFFER, glFramebufferTextureMultiviewSideBySideANGLE(
GL_DEPTH_STENCIL_ATTACHMENT, mStencilTex, GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, mDepthStencilTex, 0, 2,
0, 2, &kViewportOffsets[0]); &kViewportOffsets[0]);
} }
else if (depth) else if (depth)
{ {
...@@ -97,7 +144,7 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest ...@@ -97,7 +144,7 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest
if (stencil) if (stencil)
{ {
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D, glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_TEXTURE_2D,
mStencilTex, 0); mDepthStencilTex, 0);
} }
else if (depth) else if (depth)
{ {
...@@ -128,17 +175,49 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest ...@@ -128,17 +175,49 @@ class FramebufferMultiviewSideBySideClearTest : public FramebufferMultiviewTest
EXPECT_PIXEL_COLOR_EQ(3, 1, GLColor::green); EXPECT_PIXEL_COLOR_EQ(3, 1, GLColor::green);
} }
GLFramebuffer mMultiviewFBO; GLuint mMultiviewFBO;
GLFramebuffer mNonMultiviewFBO; GLuint mNonMultiviewFBO;
std::vector<GLTexture> mColorTex;
GLTexture mDepthTex; private:
GLTexture mStencilTex; std::vector<GLuint> mColorTex;
GLuint mDepthTex;
GLuint mDepthStencilTex;
}; };
class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
{ {
protected: protected:
FramebufferMultiviewLayeredClearTest() {} FramebufferMultiviewLayeredClearTest() : mMultiviewFBO(0), mDepthTex(0), mDepthStencilTex(0) {}
void TearDown() override
{
if (mMultiviewFBO != 0)
{
glDeleteFramebuffers(1, &mMultiviewFBO);
mMultiviewFBO = 0u;
}
if (!mNonMultiviewFBO.empty())
{
glDeleteTextures(mNonMultiviewFBO.size(), mNonMultiviewFBO.data());
mNonMultiviewFBO.clear();
}
if (!mColorTex.empty())
{
glDeleteTextures(mColorTex.size(), mColorTex.data());
mColorTex.clear();
}
if (mDepthStencilTex != 0u)
{
glDeleteTextures(1, &mDepthStencilTex);
mDepthStencilTex = 0u;
}
if (mDepthTex != 0u)
{
glDeleteTextures(1, &mDepthTex);
mDepthTex = 0u;
}
MultiviewTest::TearDown();
}
void initializeFBOs(int width, void initializeFBOs(int width,
int height, int height,
...@@ -153,6 +232,16 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest ...@@ -153,6 +232,16 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
// Generate textures. // Generate textures.
mColorTex.resize(numColorAttachments); mColorTex.resize(numColorAttachments);
glGenTextures(mColorTex.size(), mColorTex.data());
if (stencil)
{
glGenTextures(1, &mDepthStencilTex);
}
else if (depth)
{
glGenTextures(1, &mDepthTex);
}
for (int i = 0; i < numColorAttachments; ++i) for (int i = 0; i < numColorAttachments; ++i)
{ {
glBindTexture(GL_TEXTURE_2D_ARRAY, mColorTex[i]); glBindTexture(GL_TEXTURE_2D_ARRAY, mColorTex[i]);
...@@ -162,7 +251,7 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest ...@@ -162,7 +251,7 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
if (stencil) if (stencil)
{ {
glBindTexture(GL_TEXTURE_2D_ARRAY, mStencilTex); glBindTexture(GL_TEXTURE_2D_ARRAY, mDepthStencilTex);
glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_DEPTH24_STENCIL8, width, height, numLayers, 0, glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_DEPTH24_STENCIL8, width, height, numLayers, 0,
GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr); GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, nullptr);
} }
...@@ -173,6 +262,8 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest ...@@ -173,6 +262,8 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
GL_DEPTH_COMPONENT, GL_FLOAT, nullptr); GL_DEPTH_COMPONENT, GL_FLOAT, nullptr);
} }
glGenFramebuffers(1, &mMultiviewFBO);
// Generate multiview FBO and attach textures. // Generate multiview FBO and attach textures.
glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO); glBindFramebuffer(GL_FRAMEBUFFER, mMultiviewFBO);
for (int i = 0; i < numColorAttachments; ++i) for (int i = 0; i < numColorAttachments; ++i)
...@@ -185,7 +276,7 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest ...@@ -185,7 +276,7 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
if (stencil) if (stencil)
{ {
glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, glFramebufferTextureMultiviewLayeredANGLE(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
mStencilTex, 0, baseViewIndex, numViews); mDepthStencilTex, 0, baseViewIndex, numViews);
} }
else if (depth) else if (depth)
{ {
...@@ -196,6 +287,9 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest ...@@ -196,6 +287,9 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
const auto &drawBuffers = GetDrawBufferRange(numColorAttachments); const auto &drawBuffers = GetDrawBufferRange(numColorAttachments);
glDrawBuffers(numColorAttachments, drawBuffers.data()); glDrawBuffers(numColorAttachments, drawBuffers.data());
mNonMultiviewFBO.resize(numLayers);
glGenFramebuffers(mNonMultiviewFBO.size(), mNonMultiviewFBO.data());
// Generate non-multiview FBOs and attach textures. // Generate non-multiview FBOs and attach textures.
mNonMultiviewFBO.resize(numLayers); mNonMultiviewFBO.resize(numLayers);
for (int i = 0; i < numLayers; ++i) for (int i = 0; i < numLayers; ++i)
...@@ -209,8 +303,8 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest ...@@ -209,8 +303,8 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
} }
if (stencil) if (stencil)
{ {
glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, mStencilTex, glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
0, i); mDepthStencilTex, 0, i);
} }
else if (depth) else if (depth)
{ {
...@@ -238,11 +332,13 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest ...@@ -238,11 +332,13 @@ class FramebufferMultiviewLayeredClearTest : public FramebufferMultiviewTest
return getLayerColor(layer, attachment, 0, 0); return getLayerColor(layer, attachment, 0, 0);
} }
GLFramebuffer mMultiviewFBO; GLuint mMultiviewFBO;
std::vector<GLFramebuffer> mNonMultiviewFBO; std::vector<GLuint> mNonMultiviewFBO;
std::vector<GLTexture> mColorTex;
GLTexture mDepthTex; private:
GLTexture mStencilTex; std::vector<GLuint> mColorTex;
GLuint mDepthTex;
GLuint mDepthStencilTex;
}; };
// Test that the framebuffer tokens introduced by ANGLE_multiview can be used to query the // Test that the framebuffer tokens introduced by ANGLE_multiview can be used to query the
......
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