From 32342f032e1dfd133040324f851f0365f9d4cb51 Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Sat, 4 Mar 2017 08:12:46 -0500 Subject: Rebase and fix chromium Combine texture provider and resource provider Largely mechanical. Only three places that were calling createApprox via texture provider (ie without flags), so that was simple. BUG=skia: Change-Id: I876367bcdc6a8db736deedab1028de1972015509 Reviewed-on: https://skia-review.googlesource.com/9176 Commit-Queue: Brian Osman Reviewed-by: Brian Salomon --- tests/GrPorterDuffTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/GrPorterDuffTest.cpp') diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index bfbd97e387..c1d73ef251 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -1018,7 +1018,7 @@ DEF_GPUTEST(PorterDuffNoDualSourceBlending, reporter, /*factory*/) { fakeDesc.fTextureHandle = backendTex; GrXferProcessor::DstTexture fakeDstTexture; fakeDstTexture.setTexture( - ctx->textureProvider()->wrapBackendTexture(fakeDesc, kBorrow_GrWrapOwnership)); + ctx->resourceProvider()->wrapBackendTexture(fakeDesc, kBorrow_GrWrapOwnership)); static const GrPipelineInput colorInputs[] = {GrPipelineInput(), GrPipelineInput(GrPipelineInput::Opaque::kYes), -- cgit v1.2.3