From 108bb232775c0b768ce1beca929ed31a97b46ed3 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Tue, 3 Jul 2018 16:18:29 -0400 Subject: Reland "Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors." This reverts commit 34aa059c1502d67c9a5f4db449667a8709b69fb9. Reason for revert: Original change's description: > Revert "Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors." > > This reverts commit ff2181e62e79ffd2ce628fc8c05b5457d4f54163. > > Reason for revert: suspect it's behind Chrome roll failure > > Original change's description: > > Remove setting/use of GrPixelConfig in GrBackendTex/RT ctors. > > > > Bug: skia: > > Change-Id: I1466668e3502cd1e6e1f6aed4105e0f626d293dd > > Reviewed-on: https://skia-review.googlesource.com/138987 > > Commit-Queue: Greg Daniel > > Reviewed-by: Robert Phillips > > TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com > > Change-Id: I4cba44858aafffbadc45e18349b93c741d7cfc66 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/139220 > Reviewed-by: Ethan Nicholas > Commit-Queue: Ethan Nicholas Bug: skia: Change-Id: Ib1fd10c126862824f3e31c420c697ac749c637f5 Reviewed-on: https://skia-review.googlesource.com/139221 Commit-Queue: Greg Daniel Reviewed-by: Robert Phillips --- tests/RectangleTextureTest.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/RectangleTextureTest.cpp') diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp index e473ed86f3..b3846a1bcb 100644 --- a/tests/RectangleTextureTest.cpp +++ b/tests/RectangleTextureTest.cpp @@ -119,7 +119,8 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(RectangleTexture, reporter, ctxInfo) { rectangleInfo.fID = rectTexID; rectangleInfo.fTarget = GR_GL_TEXTURE_RECTANGLE; - GrBackendTexture rectangleTex(kWidth, kHeight, kRGBA_8888_GrPixelConfig, rectangleInfo); + GrBackendTexture rectangleTex(kWidth, kHeight, GrMipMapped::kNo, rectangleInfo); + rectangleTex.setPixelConfig(kRGBA_8888_GrPixelConfig); GrColor refPixels[kWidth * kHeight]; for (int y = 0; y < kHeight; ++y) { -- cgit v1.2.3