From 261b8aa1de8562f79c1a7c515d968787e027a2c8 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Mon, 23 Oct 2017 09:37:36 -0400 Subject: Revert "Revert "Support creation/use of mipped proxy in GrBackendTextureImageGenerator"" This reverts commit 7477d9693869982a4b0b18d20fee32d2f3eaedbf. Reason for revert: Putting in fixes in tests Original change's description: > Revert "Support creation/use of mipped proxy in GrBackendTextureImageGenerator" > > This reverts commit b8ad00b5a68975cafd68d6df0d66f0a01f5c07c2. > > Reason for revert: Some various test failures > > Original change's description: > > Support creation/use of mipped proxy in GrBackendTextureImageGenerator > > > > Bug: skia: > > Change-Id: I9d06780ccb2db0865100b67041c03408f2445c62 > > Reviewed-on: https://skia-review.googlesource.com/61241 > > Reviewed-by: Brian Salomon > > Commit-Queue: Greg Daniel > > TBR=egdaniel@google.com,bsalomon@google.com,brianosman@google.com > > Change-Id: I28e625776352ee6f9f27e66cd5d4b149ef50a22a > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/61941 > Reviewed-by: Greg Daniel > Commit-Queue: Greg Daniel TBR=egdaniel@google.com,bsalomon@google.com,brianosman@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: skia: Change-Id: Ibfbca5101b06d9ff8f8a5d33bc6f2114806db552 Reviewed-on: https://skia-review.googlesource.com/62561 Commit-Queue: Greg Daniel Reviewed-by: Greg Daniel --- tests/EGLImageTest.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/EGLImageTest.cpp') diff --git a/tests/EGLImageTest.cpp b/tests/EGLImageTest.cpp index 784ec5d99e..82e4c4bb55 100644 --- a/tests/EGLImageTest.cpp +++ b/tests/EGLImageTest.cpp @@ -107,6 +107,12 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(EGLImageTest, reporter, ctxInfo) { return; } + // Since we are dealing with two different GL contexts here, we need to call finish so that the + // clearing of the texture that happens in createTextingOnlyBackendTexture occurs before we call + // TexSubImage below on the other context. Otherwise, it is possible the calls get reordered and + // the clearing overwrites the TexSubImage writes. + GR_GL_CALL(glCtx1->gl(), Finish()); + // Populate the texture using GL context 1. Important to use TexSubImage as TexImage orphans // the EGL image. Also, this must be done after creating the EGLImage as the texture // contents may not be preserved when the image is created. -- cgit v1.2.3