Skip to content

Commit 71b58cd

Browse files
vontureAngle LUCI CQ
authored andcommitted
Fix feedback loop in ImageTest.SourceRenderbufferTargetTexture*
This test would make a renderbuffer as an EGLImage source and a texture as the target. It would then try to verify the data in the texture by sampling but the renderbuffer was currently bound to the framebuffer creating a feedback loop. Bug: angleproject:418022112 Change-Id: I456eb541c84d98d99e6b8d8be817ce67d7b1d519 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6556610 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
1 parent 6518078 commit 71b58cd

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

src/tests/angle_end2end_tests_expectations.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1695,7 +1695,6 @@ b/292285899 PIXEL4ORXL GLES : EGLSurfaceTest.DestroyAndRecreateWhileCurrent/* =
16951695
404958320 WIN NVIDIA VULKAN : BlitFramebufferTest.BlitSmallColorLargeDepthAttachments/* = SKIP
16961696

16971697
// EGLImage colorspace renderbuffer failures on NVIDIA, INTEL and ANDROID
1698-
40644776 D3D11 : ImageTest.SourceRenderbufferTargetTexture* = SKIP
16991698
40644776 D3D11 : ImageTestES3.SourceRenderbufferTargetTextureExternalESSL3* = SKIP
17001699
40644776 WIN INTEL VULKAN : ImageTest.SourceRenderbufferTargetTexture* = SKIP
17011700
40644776 WIN INTEL VULKAN : ImageTestES3.SourceRenderbufferTargetTextureExternalESSL3* = SKIP

src/tests/gl_tests/ImageTest.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7155,6 +7155,7 @@ void ImageTest::SourceRenderbufferTargetTexture_helper(const EGLint *attribs)
71557155
glClearColor(kSrgbColor[0] / 255.0f, kSrgbColor[1] / 255.0f, kSrgbColor[2] / 255.0f,
71567156
kSrgbColor[3] / 255.0f);
71577157
glClear(GL_COLOR_BUFFER_BIT);
7158+
glBindFramebuffer(GL_FRAMEBUFFER, 0);
71587159
ASSERT_GL_NO_ERROR();
71597160

71607161
// Create the target
@@ -7200,6 +7201,7 @@ void ImageTest::SourceRenderbufferTargetTextureExternal_helper(const EGLint *att
72007201
glClearColor(kSrgbColor[0] / 255.0f, kSrgbColor[1] / 255.0f, kSrgbColor[2] / 255.0f,
72017202
kSrgbColor[3] / 255.0f);
72027203
glClear(GL_COLOR_BUFFER_BIT);
7204+
glBindFramebuffer(GL_FRAMEBUFFER, 0);
72037205
ASSERT_GL_NO_ERROR();
72047206

72057207
// Create the target

0 commit comments

Comments
 (0)