@shopify/react-native-skia 0.1.234 → 0.1.236

package/src/external/reanimated/index.ts

@@ -2,3 +2,4 @@ export * from "./useAnimatedImageValue";
 export * from "./useDerivedValueOnJS";
 export * from "./renderHelpers";
 export * from "./interpolators";
+export * from "./textures";

package/src/external/reanimated/interpolators.ts

@@ -87,8 +87,20 @@ export const usePathInterpolation = (
   input: number[],
   outputRange: SkPath[],
   options?: ExtrapolationType
-) =>
-  useInterpolator(
+) => {
+  // Check if all paths in outputRange are interpolable
+  const allPathsInterpolable = outputRange
+    .slice(1)
+    .every((path) => outputRange[0].isInterpolatable(path));
+  if (!allPathsInterpolable) {
+    // Handle the case where not all paths are interpolable
+    // For example, throw an error or return early
+    throw new Error(
+      `Not all paths in the output range are interpolable.
+See: https://shopify.github.io/react-native-skia/docs/animations/hooks#usepathinterpolation`
+    );
+  }
+  return useInterpolator(
     () => Skia.Path.Make(),
     value,
     interpolatePaths,
@@ -96,6 +108,7 @@ export const usePathInterpolation = (
     outputRange,
     options
   );
+};
 
 export const useVectorInterpolation = (
   value: SharedValue<number>,

package/src/external/reanimated/moduleWrapper.ts

@@ -63,6 +63,7 @@ export const stopMapper: (mapperID: number) => void =
   Reanimated2?.stopMapper || throwOnMissingReanimated;
 
 export const runOnJS = Reanimated2?.runOnJS || throwOnMissingReanimated;
+export const runOnUI = Reanimated2?.runOnUI || throwOnMissingReanimated;
 
 export const useAnimatedReaction: <T>(
   prepare: () => T,

package/src/external/reanimated/textures.tsx

@@ -0,0 +1,50 @@
+import { useEffect, useMemo } from "react";
+import type { ReactElement } from "react";
+import type { SharedValue } from "react-native-reanimated";
+
+import { Skia } from "../../skia";
+import type { SkImage, SkPicture, SkSize } from "../../skia/types";
+import { drawAsPicture } from "../../renderer/Offscreen";
+
+import { runOnUI, useSharedValue } from "./moduleWrapper";
+
+// TODO: We're not sure yet why PixelRatio is not needed here.
+const pd = 1; //Platform.PixelRatio;
+
+const createTexture = (
+  texture: SharedValue<SkImage | null>,
+  picture: SkPicture,
+  size: SkSize
+) => {
+  "worklet";
+  const surface = Skia.Surface.MakeOffscreen(
+    size.width * pd,
+    size.height * pd
+  )!;
+  const canvas = surface.getCanvas();
+  // see comment above
+  //canvas.save();
+  //canvas.scale(pd, pd);
+  canvas.drawPicture(picture);
+  //canvas.restore();
+  surface.flush();
+  texture.value = surface.makeImageSnapshot();
+};
+
+export const useTextureValue = (element: ReactElement, size: SkSize) => {
+  const picture = useMemo(() => {
+    return drawAsPicture(element);
+  }, [element]);
+  return useTextureValueFromPicture(picture, size);
+};
+
+export const useTextureValueFromPicture = (
+  picture: SkPicture,
+  size: SkSize
+) => {
+  const texture = useSharedValue<SkImage | null>(null);
+  useEffect(() => {
+    runOnUI(createTexture)(texture, picture, size);
+  }, [texture, picture, size]);
+  return texture;
+};

package/src/headless/index.ts

@@ -25,7 +25,7 @@ export const makeOffscreenSurface = (width: number, height: number) => {
 };
 
 export const drawOffscreen = (surface: SkSurface, element: ReactNode) => {
-  const root = new SkiaRoot(Skia);
+  const root = new SkiaRoot(Skia, false);
   root.render(element);
   const canvas = surface.getCanvas();
   const ctx = new JsiDrawingContext(Skia, canvas);

package/src/mock/index.ts

@@ -31,9 +31,12 @@ export const Mock = (CanvasKit: CanvasKit) => {
     // Reanimated hooks
     useClock: NoopSharedValue,
     usePathInterpolation: NoopSharedValue,
+    useTextureValue: NoopSharedValue,
+    useTextureValueFromPicture: NoopSharedValue,
     useRawData: Noop,
     useData: Noop,
     useFont: () => Skia.Font(undefined, 0),
+    useFonts: Noop,
     useTypeface: () => null,
     useImage: () => null,
     useSVG: () => null,

package/src/renderer/Canvas.tsx

@@ -75,7 +75,7 @@ export const Canvas = forwardRef<SkiaDomView, CanvasProps>(
     }, [innerRef]);
 
     const root = useMemo(
-      () => new SkiaRoot(Skia, redraw, getNativeId),
+      () => new SkiaRoot(Skia, NATIVE_DOM, redraw, getNativeId),
       [redraw, getNativeId]
     );
 

package/src/renderer/Container.tsx

@@ -13,9 +13,10 @@ export class Container {
   constructor(
     Skia: Skia,
     public redraw: () => void = () => {},
-    public getNativeId: () => number = () => 0
+    public getNativeId: () => number = () => 0,
+    native: boolean
   ) {
-    this.Sk = new JsiSkDOM({ Skia });
+    this.Sk = new JsiSkDOM({ Skia }, native);
     this._root = this.Sk.Group();
   }
 

package/src/renderer/Offscreen.tsx

@@ -10,15 +10,24 @@ export const drawAsImage = (
   width: number,
   height: number
 ) => {
+  const picture = drawAsPicture(element);
   const surface = Skia.Surface.MakeOffscreen(width, height);
   if (!surface) {
     throw new Error("Could not create offscreen surface");
   }
   const canvas = surface.getCanvas();
-  const root = new SkiaRoot(Skia);
+  canvas.drawPicture(picture);
+  surface.flush();
+  return surface.makeImageSnapshot();
+};
+
+export const drawAsPicture = (element: ReactElement) => {
+  const recorder = Skia.PictureRecorder();
+  const canvas = recorder.beginRecording();
+  const root = new SkiaRoot(Skia, false);
   root.render(element);
   const ctx = new JsiDrawingContext(Skia, canvas);
   root.dom.render(ctx);
-  surface.flush();
-  return surface.makeImageSnapshot();
+  const picture = recorder.finishRecordingAsPicture();
+  return picture;
 };

package/src/renderer/Reconciler.tsx

@@ -21,10 +21,11 @@ export class SkiaRoot {
 
   constructor(
     Skia: Skia,
+    native = false,
     redraw: () => void = () => {},
     getNativeId: () => number = () => 0
   ) {
-    this.container = new Container(Skia, redraw, getNativeId);
+    this.container = new Container(Skia, redraw, getNativeId, native);
     this.root = skiaReconciler.createContainer(
       this.container,
       0,
@@ -45,7 +46,9 @@ export class SkiaRoot {
   }
 
   unmount() {
-    skiaReconciler.updateContainer(null, this.root, null, () => {});
+    skiaReconciler.updateContainer(null, this.root, null, () => {
+      hostDebug("unmountContainer");
+    });
   }
 
   get dom() {

package/src/skia/types/Matrix4.ts

@@ -356,13 +356,13 @@ export const convertToColumnMajor = (rowMajorMatrix: Matrix4) => {
       colMajorMatrix[col * size + row] = rowMajorMatrix[row * size + col];
     }
   }
-  return colMajorMatrix;
+  return colMajorMatrix as unknown as Matrix4;
 };
 
 /**
  * @worklet
  */
-export const convertToAffineMatrix = (m4: number[]) => {
+export const convertToAffineMatrix = (m4: Matrix4) => {
   "worklet";
   // Extracting the relevant components from the 4x4 matrix
   const a = m4[0]; // Scale X

package/src/skia/types/Shader/Shader.ts

@@ -7,7 +7,12 @@ export const isShader = (obj: SkJSIInstance<string> | null): obj is SkShader =>
 
 export type SkShader = SkJSIInstance<"Shader">;
 
-export type Uniform = number | Vector | Float32Array | Uniform[];
+export type Uniform =
+  | number
+  | Vector
+  | Float32Array
+  | readonly Uniform[]
+  | Uniform[];
 
 export interface Uniforms {
   [name: string]: Uniform;

package/cpp/skia/include/gpu/GrSurfaceInfo.h

@@ -1,142 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrSurfaceInfo_DEFINED
-#define GrSurfaceInfo_DEFINED
-
-#include "include/gpu/GrTypes.h"
-
-#ifdef SK_GL
-#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
-#endif
-#ifdef SK_VULKAN
-#include "include/private/gpu/ganesh/GrVkTypesPriv.h"
-#endif
-#ifdef SK_DIRECT3D
-#include "include/private/gpu/ganesh/GrD3DTypesMinimal.h"
-struct GrD3DSurfaceInfo;
-#endif
-#ifdef SK_METAL
-#include "include/private/gpu/ganesh/GrMtlTypesPriv.h"
-#endif
-#include "include/private/gpu/ganesh/GrMockTypesPriv.h"
-
-class GrSurfaceInfo {
-public:
-    GrSurfaceInfo() {}
-#ifdef SK_GL
-    GrSurfaceInfo(const GrGLSurfaceInfo& glInfo)
-            : fBackend(GrBackendApi::kOpenGL)
-            , fValid(true)
-            , fSampleCount(glInfo.fSampleCount)
-            , fLevelCount(glInfo.fLevelCount)
-            , fProtected(glInfo.fProtected)
-            , fGLSpec(glInfo) {}
-#endif
-#ifdef SK_VULKAN
-    GrSurfaceInfo(const GrVkSurfaceInfo& vkInfo)
-            : fBackend(GrBackendApi::kVulkan)
-            , fValid(true)
-            , fSampleCount(vkInfo.fSampleCount)
-            , fLevelCount(vkInfo.fLevelCount)
-            , fProtected(vkInfo.fProtected)
-            , fVkSpec(vkInfo) {}
-#endif
-#ifdef SK_DIRECT3D
-    GrSurfaceInfo(const GrD3DSurfaceInfo& d3dInfo);
-#endif
-#ifdef SK_METAL
-    GrSurfaceInfo(const GrMtlSurfaceInfo& mtlInfo)
-            : fBackend(GrBackendApi::kMetal)
-            , fValid(true)
-            , fSampleCount(mtlInfo.fSampleCount)
-            , fLevelCount(mtlInfo.fLevelCount)
-            , fProtected(mtlInfo.fProtected)
-            , fMtlSpec(mtlInfo) {}
-#endif
-    GrSurfaceInfo(const GrMockSurfaceInfo& mockInfo)
-            : fBackend(GrBackendApi::kMock)
-            , fValid(true)
-            , fSampleCount(mockInfo.fSampleCount)
-            , fLevelCount(mockInfo.fLevelCount)
-            , fProtected(mockInfo.fProtected)
-            , fMockSpec(mockInfo) {}
-
-    ~GrSurfaceInfo();
-    GrSurfaceInfo(const GrSurfaceInfo&) = default;
-
-    bool isValid() const { return fValid; }
-    GrBackendApi backend() const { return fBackend; }
-
-    uint32_t numSamples() const { return fSampleCount; }
-    uint32_t numMipLevels() const { return fLevelCount; }
-    GrProtected isProtected() const { return fProtected; }
-
-#ifdef SK_GL
-    bool getGLSurfaceInfo(GrGLSurfaceInfo* info) const {
-        if (!this->isValid() || fBackend != GrBackendApi::kOpenGL) {
-            return false;
-        }
-        *info = GrGLTextureSpecToSurfaceInfo(fGLSpec, fSampleCount, fLevelCount, fProtected);
-        return true;
-    }
-#endif
-#ifdef SK_VULKAN
-    bool getVkSurfaceInfo(GrVkSurfaceInfo* info) const {
-        if (!this->isValid() || fBackend != GrBackendApi::kVulkan) {
-            return false;
-        }
-        *info = GrVkImageSpecToSurfaceInfo(fVkSpec, fSampleCount, fLevelCount, fProtected);
-        return true;
-    }
-#endif
-#ifdef SK_DIRECT3D
-    bool getD3DSurfaceInfo(GrD3DSurfaceInfo*) const;
-#endif
-#ifdef SK_METAL
-    bool getMtlSurfaceInfo(GrMtlSurfaceInfo* info) const {
-        if (!this->isValid() || fBackend != GrBackendApi::kMetal) {
-            return false;
-        }
-        *info = GrMtlTextureSpecToSurfaceInfo(fMtlSpec, fSampleCount, fLevelCount, fProtected);
-        return true;
-    }
-#endif
-    bool getMockSurfaceInfo(GrMockSurfaceInfo* info) const {
-        if (!this->isValid() || fBackend != GrBackendApi::kMock) {
-            return false;
-        }
-        *info = GrMockTextureSpecToSurfaceInfo(fMockSpec, fSampleCount, fLevelCount, fProtected);
-        return true;
-    }
-
-private:
-    GrBackendApi fBackend = GrBackendApi::kMock;
-    bool fValid = false;
-
-    uint32_t fSampleCount = 1;
-    uint32_t fLevelCount = 0;
-    GrProtected fProtected = GrProtected::kNo;
-
-    union {
-#ifdef SK_GL
-        GrGLTextureSpec fGLSpec;
-#endif
-#ifdef SK_VULKAN
-        GrVkImageSpec fVkSpec;
-#endif
-#ifdef SK_DIRECT3D
-        GrD3DTextureResourceSpecHolder fD3DSpec;
-#endif
-#ifdef SK_METAL
-        GrMtlTextureSpec fMtlSpec;
-#endif
-        GrMockTextureSpec fMockSpec;
-    };
-};
-
-#endif

package/cpp/skia/include/private/gpu/ganesh/GrGLTypesPriv.h

@@ -1,107 +0,0 @@
-/*
- * Copyright 2019 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "include/core/SkRefCnt.h"
-#include "include/gpu/gl/GrGLTypes.h"
-
-#ifndef GrGLTypesPriv_DEFINED
-#define GrGLTypesPriv_DEFINED
-
-// TODO(b/293490566) Move this to src/ after GrSurfaceInfo.h has been decoupled from GL
-
-static constexpr int kGrGLColorFormatCount = static_cast<int>(GrGLFormat::kLastColorFormat) + 1;
-
-class GrGLTextureParameters : public SkNVRefCnt<GrGLTextureParameters> {
-public:
-    // We currently consider texture parameters invalid on all textures
-    // GrContext::resetContext(). We use this type to track whether instances of
-    // GrGLTextureParameters were updated before or after the most recent resetContext(). At 10
-    // resets / frame and 60fps a 64bit timestamp will overflow in about a billion years.
-    // TODO: Require clients to use GrBackendTexture::glTextureParametersModified() to invalidate
-    // texture parameters and get rid of timestamp checking.
-    using ResetTimestamp = uint64_t;
-
-    // This initializes the params to have an expired timestamp. They'll be considered invalid the
-    // first time the texture is used unless set() is called.
-    GrGLTextureParameters() = default;
-
-    // This is texture parameter state that is overridden when a non-zero sampler object is bound.
-    struct SamplerOverriddenState {
-        SamplerOverriddenState();
-        void invalidate();
-
-        GrGLenum fMinFilter;
-        GrGLenum fMagFilter;
-        GrGLenum fWrapS;
-        GrGLenum fWrapT;
-        GrGLfloat fMinLOD;
-        GrGLfloat fMaxLOD;
-        GrGLfloat fMaxAniso;
-        // We always want the border color to be transparent black, so no need to store 4 floats.
-        // Just track if it's been invalidated and no longer the default
-        bool fBorderColorInvalid;
-    };
-
-    // Texture parameter state that is not overridden by a bound sampler object.
-    struct NonsamplerState {
-        NonsamplerState();
-        void invalidate();
-
-        GrGLint fBaseMipMapLevel;
-        GrGLint fMaxMipmapLevel;
-        bool    fSwizzleIsRGBA;
-    };
-
-    void invalidate();
-
-    ResetTimestamp resetTimestamp() const { return fResetTimestamp; }
-    const SamplerOverriddenState& samplerOverriddenState() const { return fSamplerOverriddenState; }
-    const NonsamplerState& nonsamplerState() const { return fNonsamplerState; }
-
-    // SamplerOverriddenState is optional because we don't track it when we're using sampler
-    // objects.
-    void set(const SamplerOverriddenState* samplerState,
-             const NonsamplerState& nonsamplerState,
-             ResetTimestamp currTimestamp);
-
-private:
-    static constexpr ResetTimestamp kExpiredTimestamp = 0;
-
-    SamplerOverriddenState fSamplerOverriddenState;
-    NonsamplerState fNonsamplerState;
-    ResetTimestamp fResetTimestamp = kExpiredTimestamp;
-};
-
-class GrGLBackendTextureInfo {
-public:
-    GrGLBackendTextureInfo(const GrGLTextureInfo& info, sk_sp<GrGLTextureParameters> params)
-            : fInfo(info), fParams(params) {}
-    const GrGLTextureInfo& info() const { return fInfo; }
-    GrGLTextureParameters* parameters() const { return fParams.get(); }
-    sk_sp<GrGLTextureParameters> refParameters() const { return fParams; }
-
-    bool isProtected() const { return fInfo.isProtected(); }
-
-private:
-    GrGLTextureInfo fInfo;
-    sk_sp<GrGLTextureParameters> fParams;  // not const because we might call invalidate() on it.
-};
-
-struct GrGLTextureSpec {
-    GrGLTextureSpec() : fTarget(0), fFormat(0) {}
-    GrGLTextureSpec(const GrGLSurfaceInfo& info) : fTarget(info.fTarget), fFormat(info.fFormat) {}
-
-    GrGLenum fTarget;
-    GrGLenum fFormat;
-};
-
-GrGLSurfaceInfo GrGLTextureSpecToSurfaceInfo(const GrGLTextureSpec& glSpec,
-                                             uint32_t sampleCount,
-                                             uint32_t levelCount,
-                                             skgpu::Protected isProtected);
-
-#endif

package/cpp/skia/include/private/gpu/ganesh/GrMockTypesPriv.h

@@ -1,32 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrMockTypesPriv_DEFINED
-#define GrMockTypesPriv_DEFINED
-
-#include "include/core/SkTextureCompressionType.h"
-#include "include/gpu/mock/GrMockTypes.h"
-
-struct GrMockTextureSpec {
-    GrMockTextureSpec()
-            : fColorType(GrColorType::kUnknown)
-             , fCompressionType(SkTextureCompressionType::kNone) {}
-    GrMockTextureSpec(const GrMockSurfaceInfo& info)
-            : fColorType(info.fColorType)
-            , fCompressionType(info.fCompressionType) {}
-
-    GrColorType fColorType = GrColorType::kUnknown;
-    SkTextureCompressionType fCompressionType = SkTextureCompressionType::kNone;
-};
-
-GrMockSurfaceInfo GrMockTextureSpecToSurfaceInfo(const GrMockTextureSpec& mockSpec,
-                                                 uint32_t sampleCount,
-                                                 uint32_t levelCount,
-                                                 GrProtected isProtected);
-
-#endif
-

package/cpp/skia/include/private/gpu/ganesh/GrMtlTypesPriv.h

@@ -1,83 +0,0 @@
-/*
- * Copyright 2021 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrMtlTypesPriv_DEFINED
-#define GrMtlTypesPriv_DEFINED
-
-#include "include/gpu/GrTypes.h"
-#include "include/gpu/mtl/GrMtlTypes.h"
-
-///////////////////////////////////////////////////////////////////////////////
-
-#ifdef __APPLE__
-
-#include <TargetConditionals.h>
-
-#if defined(SK_BUILD_FOR_MAC)
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000
-#define GR_METAL_SDK_VERSION 300
-#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 120000
-#define GR_METAL_SDK_VERSION 240
-#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
-#define GR_METAL_SDK_VERSION 230
-#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
-#define GR_METAL_SDK_VERSION 220
-#elif __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-#define GR_METAL_SDK_VERSION 210
-#else
-#error Must use at least 10.14 SDK to build Metal backend for MacOS
-#endif
-#else
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 160000 || __TV_OS_VERSION_MAX_ALLOWED >= 160000
-#define GR_METAL_SDK_VERSION 300
-#elif __IPHONE_OS_VERSION_MAX_ALLOWED >= 150000 || __TV_OS_VERSION_MAX_ALLOWED >= 150000
-#define GR_METAL_SDK_VERSION 240
-#elif __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 || __TV_OS_VERSION_MAX_ALLOWED >= 140000
-#define GR_METAL_SDK_VERSION 230
-#elif __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 || __TV_OS_VERSION_MAX_ALLOWED >= 130000
-#define GR_METAL_SDK_VERSION 220
-#elif __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000 || __TV_OS_VERSION_MAX_ALLOWED >= 120000
-#define GR_METAL_SDK_VERSION 210
-#else
-#error Must use at least 12.00 SDK to build Metal backend for iOS
-#endif
-#endif
-
-#if __has_feature(objc_arc) && __has_attribute(objc_externally_retained)
-#define GR_NORETAIN __attribute__((objc_externally_retained))
-#define GR_NORETAIN_BEGIN \
-    _Pragma("clang attribute push (__attribute__((objc_externally_retained)), apply_to=any(function,objc_method))")
-#define GR_NORETAIN_END _Pragma("clang attribute pop")
-#else
-#define GR_NORETAIN
-#define GR_NORETAIN_BEGIN
-#define GR_NORETAIN_END
-#endif
-
-struct GrMtlTextureSpec {
-    GrMtlTextureSpec()
-            : fFormat(0)
-            , fUsage(0)
-            , fStorageMode(0) {}
-    GrMtlTextureSpec(const GrMtlSurfaceInfo& info)
-            : fFormat(info.fFormat)
-            , fUsage(info.fUsage)
-            , fStorageMode(info.fStorageMode) {}
-
-    GrMTLPixelFormat fFormat;
-    GrMTLTextureUsage fUsage;
-    GrMTLStorageMode fStorageMode;
-};
-
-GrMtlSurfaceInfo GrMtlTextureSpecToSurfaceInfo(const GrMtlTextureSpec& mtlSpec,
-                                               uint32_t sampleCount,
-                                               uint32_t levelCount,
-                                               skgpu::Protected isProtected);
-
-#endif  // __APPLE__
-
-#endif  // GrMtlTypesPriv_DEFINED

package/cpp/skia/include/private/gpu/ganesh/GrVkTypesPriv.h

@@ -1,47 +0,0 @@
-/*
- * Copyright 2018 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrVkTypesPriv_DEFINED
-#define GrVkTypesPriv_DEFINED
-
-#include "include/core/SkRefCnt.h"
-#include "include/gpu/vk/GrVkTypes.h"
-
-namespace skgpu {
-class MutableTextureStateRef;
-}
-
-GrVkImageInfo GrVkImageInfoWithMutableState(const GrVkImageInfo&,
-                                            const skgpu::MutableTextureStateRef*);
-
-struct GrVkImageSpec {
-    GrVkImageSpec()
-            : fImageTiling(VK_IMAGE_TILING_OPTIMAL)
-            , fFormat(VK_FORMAT_UNDEFINED)
-            , fImageUsageFlags(0)
-            , fSharingMode(VK_SHARING_MODE_EXCLUSIVE) {}
-
-    GrVkImageSpec(const GrVkSurfaceInfo& info)
-            : fImageTiling(info.fImageTiling)
-            , fFormat(info.fFormat)
-            , fImageUsageFlags(info.fImageUsageFlags)
-            , fYcbcrConversionInfo(info.fYcbcrConversionInfo)
-            , fSharingMode(info.fSharingMode) {}
-
-    VkImageTiling fImageTiling;
-    VkFormat fFormat;
-    VkImageUsageFlags fImageUsageFlags;
-    GrVkYcbcrConversionInfo fYcbcrConversionInfo;
-    VkSharingMode fSharingMode;
-};
-
-GrVkSurfaceInfo GrVkImageSpecToSurfaceInfo(const GrVkImageSpec& vkSpec,
-                                           uint32_t sampleCount,
-                                           uint32_t levelCount,
-                                           skgpu::Protected isProtected);
-
-#endif