Revert "Revert "Plumb GrBackendTexture throughout skia.""
This reverts commit 7fa5c31c2c9af834bee66d5fcf476e250076c8d6.
Reason for revert: Relanding this change now that other fixes have landed.
Original change's description:
> Revert "Plumb GrBackendTexture throughout skia."
>
> This reverts commit 7da62b9059f3c1d31624a0e4da96ee5f908f9c12.
>
> Reason for revert: fix android roll
>
> Original change's description:
> > Plumb GrBackendTexture throughout skia.
> >
> > Bug: skia:
> > Change-Id: I1bae6768ee7229818a83ba608035a1f7867e6875
> > Reviewed-on: https://skia-review.googlesource.com/13645
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > Reviewed-by: Robert Phillips <robertphillips@google.com>
> >
>
> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,brianosman@google.com,reviews@skia.org,stani@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
>
> Change-Id: I5cb8763cc837c83ebc6d10366fe2dd3efe35fb89
> Reviewed-on: https://skia-review.googlesource.com/13773
> Reviewed-by: Stan Iliev <stani@google.com>
> Commit-Queue: Stan Iliev <stani@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org,brianosman@google.com,stani@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: I92bc074e4fe37fa5c83186afadc472c03802e8f2
Reviewed-on: https://skia-review.googlesource.com/13975
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index e236928..58ced7e 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -25,6 +25,7 @@
#include "GrRenderTargetContext.h"
#include "GrGpu.h"
#include "GrResourceProvider.h"
+#include "GrTest.h"
#include <vector>
#endif
@@ -587,20 +588,24 @@
const int kHeight = 10;
std::unique_ptr<uint32_t[]> pixels(new uint32_t[kWidth * kHeight]);
sk_memset32(pixels.get(), color, kWidth * kHeight);
- GrBackendTextureDesc desc;
- desc.fConfig = kRGBA_8888_GrPixelConfig;
- desc.fWidth = kWidth;
- desc.fHeight = kHeight;
- desc.fFlags = kRenderTarget_GrBackendTextureFlag;
- desc.fTextureHandle = context->getGpu()->createTestingOnlyBackendTexture(
+
+ GrBackendObject backendHandle = context->getGpu()->createTestingOnlyBackendTexture(
pixels.get(), kWidth, kHeight, kRGBA_8888_GrPixelConfig, true);
- desc.fSampleCnt = sampleCnt;
- sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTexture(context, desc, nullptr);
+
+ GrBackendTexture backendTex = GrTest::CreateBackendTexture(context->contextPriv().getBackend(),
+ kWidth,
+ kHeight,
+ kRGBA_8888_GrPixelConfig,
+ backendHandle);
+
+ sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTexture(context, backendTex,
+ kDefault_GrSurfaceOrigin, sampleCnt,
+ nullptr, nullptr);
if (!surface) {
- context->getGpu()->deleteTestingOnlyBackendTexture(desc.fTextureHandle);
+ context->getGpu()->deleteTestingOnlyBackendTexture(backendHandle);
return nullptr;
}
- *outTexture = desc.fTextureHandle;
+ *outTexture = backendHandle;
return surface;
}
@@ -610,21 +615,23 @@
const int kHeight = 10;
std::unique_ptr<uint32_t[]> pixels(new uint32_t[kWidth * kHeight]);
sk_memset32(pixels.get(), color, kWidth * kHeight);
- GrBackendTextureDesc desc;
- desc.fConfig = kRGBA_8888_GrPixelConfig;
- desc.fWidth = kWidth;
- desc.fHeight = kHeight;
- desc.fFlags = kRenderTarget_GrBackendTextureFlag;
- desc.fTextureHandle = context->getGpu()->createTestingOnlyBackendTexture(
+
+ GrBackendObject backendHandle = context->getGpu()->createTestingOnlyBackendTexture(
pixels.get(), kWidth, kHeight, kRGBA_8888_GrPixelConfig, true);
- desc.fSampleCnt = sampleCnt;
- sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTextureAsRenderTarget(context, desc,
- nullptr);
+
+ GrBackendTexture backendTex = GrTest::CreateBackendTexture(context->contextPriv().getBackend(),
+ kWidth,
+ kHeight,
+ kRGBA_8888_GrPixelConfig,
+ backendHandle);
+ sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTextureAsRenderTarget(
+ context, backendTex, kDefault_GrSurfaceOrigin, sampleCnt, nullptr, nullptr);
+
if (!surface) {
- context->getGpu()->deleteTestingOnlyBackendTexture(desc.fTextureHandle);
+ context->getGpu()->deleteTestingOnlyBackendTexture(backendHandle);
return nullptr;
}
- *outTexture = desc.fTextureHandle;
+ *outTexture = backendHandle;
return surface;
}
@@ -879,21 +886,26 @@
std::vector<GrBackendObject> textureHandles;
auto wrappedSurfaceMaker = [context,&textureHandles](const SkImageInfo& info) {
- GrBackendTextureDesc desc;
- desc.fConfig = SkImageInfo2GrPixelConfig(info, *context->caps());
- desc.fWidth = 10;
- desc.fHeight = 10;
- desc.fFlags = kRenderTarget_GrBackendTextureFlag;
- desc.fTextureHandle = context->getGpu()->createTestingOnlyBackendTexture(
- nullptr, desc.fWidth, desc.fHeight, desc.fConfig, true);
+ static const int kSize = 10;
+ GrPixelConfig config = SkImageInfo2GrPixelConfig(info, *context->caps());
- if (!desc.fTextureHandle) {
+ GrBackendObject backendHandle = context->getGpu()->createTestingOnlyBackendTexture(
+ nullptr, kSize, kSize, config, true);
+
+ if (!backendHandle) {
return sk_sp<SkSurface>(nullptr);
}
- textureHandles.push_back(desc.fTextureHandle);
+ textureHandles.push_back(backendHandle);
- return SkSurface::MakeFromBackendTexture(context, desc, sk_ref_sp(info.colorSpace()),
- nullptr);
+ GrBackendTexture backendTex = GrTest::CreateBackendTexture(context->contextPriv().getBackend(),
+ kSize,
+ kSize,
+ config,
+ backendHandle);
+
+ return SkSurface::MakeFromBackendTexture(context, backendTex,
+ kDefault_GrSurfaceOrigin, 0,
+ sk_ref_sp(info.colorSpace()), nullptr);
};
test_surface_creation_and_snapshot_with_color_space(reporter, "wrapped", f16Support,