Commit 008450ba by Frank Henigman Committed by Jamie Madill

Revert "Fbo attaching non-zero base level texture should be complete"

parent 3af74d77
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
// //
#include "test_utils/ANGLETest.h" #include "test_utils/ANGLETest.h"
#include "test_utils/gl_raii.h"
using namespace angle; using namespace angle;
...@@ -354,7 +353,6 @@ class FramebufferTest_ES3 : public ANGLETest ...@@ -354,7 +353,6 @@ class FramebufferTest_ES3 : public ANGLETest
{ {
glDeleteFramebuffers(1, &mFramebuffer); glDeleteFramebuffers(1, &mFramebuffer);
glDeleteRenderbuffers(1, &mRenderbuffer); glDeleteRenderbuffers(1, &mRenderbuffer);
ANGLETest::TearDown(); ANGLETest::TearDown();
} }
...@@ -391,29 +389,4 @@ TEST_P(FramebufferTest_ES3, DepthOnlyAsDepthStencil) ...@@ -391,29 +389,4 @@ TEST_P(FramebufferTest_ES3, DepthOnlyAsDepthStencil)
EXPECT_GLENUM_NE(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER)); EXPECT_GLENUM_NE(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
} }
TEST_P(FramebufferTest_ES3, CompleteWithNonZeroBaseLevel)
{
// This fails on Windows OpenGL, NVIDIA Linux, and Mac OSX.
if ((IsWindows() && IsOpenGL()) || (IsNVIDIA() && IsLinux()) || IsOSX())
{
std::cout << "Test skipped due to driver bug on Windows OpenGL, NVIDIA Linux, and Mac OSX."
<< std::endl;
return;
}
GLint level = 1;
GLTexture tex;
glBindTexture(GL_TEXTURE_2D, tex.get());
glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA, 8, 8, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, level);
glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex.get(), level);
// Verify the framebuffer is complete.
ASSERT_GLENUM_EQ(GL_FRAMEBUFFER_COMPLETE, glCheckFramebufferStatus(GL_FRAMEBUFFER));
}
ANGLE_INSTANTIATE_TEST(FramebufferTest_ES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES()); ANGLE_INSTANTIATE_TEST(FramebufferTest_ES3, ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES());
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