Skip to content

A
angle
Commit 9e3bd310 by Frank Henigman Committed by Commit Bot
Options

Enable CopyTex(Sub)Image default FB on Mesa/GLX.

Allow CopyTexImageTest.SubDefaultFramebuffer and CopyTexImageTest.DefaultFramebuffer to work with Mesa and GLX back end by doing a clear before reading the framebuffer. BUG=angleproject:2027 Change-Id: Ibb10369e3f5aceb60511fbed1d67a28132734b29 Reviewed-on: https://chromium-review.googlesource.com/507952Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
parent 487b63ab
Showing with 6 additions and 14 deletions
src/tests/gl_tests/CopyTexImageTest.cpp
...@@ -302,13 +302,9 @@ TEST_P(CopyTexImageTest, SubImageRGBToL) ...@@ -302,13 +302,9 @@ TEST_P(CopyTexImageTest, SubImageRGBToL)
// Read default framebuffer with glCopyTexImage2D(). // Read default framebuffer with glCopyTexImage2D().
TEST_P(CopyTexImageTest, DefaultFramebuffer) TEST_P(CopyTexImageTest, DefaultFramebuffer)
{ {
// TODO(fjhenigman): Test fails on Linnux Intel with the following in GL Debug Output: // Seems to be a bug in Mesa with the GLX back end: cannot read framebuffer until we draw to it.
// GL_INVALID_OPERATION in glCopyTexImage2D(missing readbuffer) // glCopyTexImage2D() below will fail without this clear.
if (IsLinux() && IsIntel()) glClear(GL_COLOR_BUFFER_BIT);
{
std::cout << "Test skipped on Linux Intel." << std::endl;
return;
}
const GLint w = getWindowWidth(), h = getWindowHeight(); const GLint w = getWindowWidth(), h = getWindowHeight();
GLTexture tex; GLTexture tex;
...@@ -321,13 +317,9 @@ TEST_P(CopyTexImageTest, DefaultFramebuffer) ...@@ -321,13 +317,9 @@ TEST_P(CopyTexImageTest, DefaultFramebuffer)
// Read default framebuffer with glCopyTexSubImage2D(). // Read default framebuffer with glCopyTexSubImage2D().
TEST_P(CopyTexImageTest, SubDefaultFramebuffer) TEST_P(CopyTexImageTest, SubDefaultFramebuffer)
{ {
// TODO(fjhenigman): Test fails on Linnux Intel with the following in GL Debug Output: // Seems to be a bug in Mesa with the GLX back end: cannot read framebuffer until we draw to it.
// GL_INVALID_OPERATION in glCopyTexImage2D(missing readbuffer) // glCopyTexSubImage2D() below will fail without this clear.
if (IsLinux() && IsIntel()) glClear(GL_COLOR_BUFFER_BIT);
{
std::cout << "Test skipped on Linux Intel." << std::endl;
return;
}
const GLint w = getWindowWidth(), h = getWindowHeight(); const GLint w = getWindowWidth(), h = getWindowHeight();
GLTexture tex; GLTexture tex;
......
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