Simplify sk_gpu_test::MakeTextureProxyFromData.
Make it take GrImageInfo.
Change-Id: I9ec16e9b935fbe3e829b4669f715c17873a1793a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/249813
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/tools/gpu/ProxyUtils.h b/tools/gpu/ProxyUtils.h
index 28eacea..ed4c625 100644
--- a/tools/gpu/ProxyUtils.h
+++ b/tools/gpu/ProxyUtils.h
@@ -9,28 +9,18 @@
#define ProxyUtils_DEFINED
#include "include/private/GrTypesPriv.h"
+#include "src/gpu/GrImageInfo.h"
#include "src/gpu/GrTextureProxy.h"
namespace sk_gpu_test {
/** Makes a texture proxy containing the passed in color data. */
-sk_sp<GrTextureProxy> MakeTextureProxyFromData(GrContext*, GrRenderable, int width, int height,
- GrColorType, SkAlphaType, GrSurfaceOrigin,
- const void* data, size_t rowBytes);
-
-/** Version that takes SkColorType rather than GrColorType. */
-inline sk_sp<GrTextureProxy> MakeTextureProxyFromData(GrContext* context, GrRenderable renderable,
- int width, int height, SkColorType ct,
- SkAlphaType alphaType, GrSurfaceOrigin origin,
- const void* data, size_t rowBytes) {
- GrColorType grCT = SkColorTypeToGrColorType(ct);
- if (GrColorType::kUnknown == grCT) {
- return nullptr;
- }
-
- return MakeTextureProxyFromData(context, renderable, width, height, grCT, alphaType, origin,
- data, rowBytes);
-}
+sk_sp<GrTextureProxy> MakeTextureProxyFromData(GrContext*,
+ GrRenderable,
+ GrSurfaceOrigin,
+ const GrImageInfo&,
+ const void* data,
+ size_t rowBytes);
} // namespace sk_gpu_test