Make feature structs on GrVkBackendContext const.
Change-Id: I6655c2458a4a9b007cb3d5e100f5368697a0f6bb
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/218547
Commit-Queue: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Auto-Submit: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/include/gpu/vk/GrVkBackendContext.h b/include/gpu/vk/GrVkBackendContext.h
index aa8733e..969140e 100644
--- a/include/gpu/vk/GrVkBackendContext.h
+++ b/include/gpu/vk/GrVkBackendContext.h
@@ -43,31 +43,31 @@
// (either by deleting the struct or manually releasing the refs) before the underlying vulkan
// device and instance are destroyed.
struct SK_API GrVkBackendContext {
- VkInstance fInstance;
- VkPhysicalDevice fPhysicalDevice;
- VkDevice fDevice;
- VkQueue fQueue;
- uint32_t fGraphicsQueueIndex;
- uint32_t fMinAPIVersion; // Deprecated. Set fInstanceVersion instead.
- uint32_t fInstanceVersion = 0; // Deprecated. Set fMaxApiVersion instead.
+ VkInstance fInstance;
+ VkPhysicalDevice fPhysicalDevice;
+ VkDevice fDevice;
+ VkQueue fQueue;
+ uint32_t fGraphicsQueueIndex;
+ uint32_t fMinAPIVersion; // Deprecated. Set fInstanceVersion instead.
+ uint32_t fInstanceVersion = 0; // Deprecated. Set fMaxApiVersion instead
// The max api version set here should match the value set in VkApplicationInfo::apiVersion when
// then VkInstance was created.
- uint32_t fMaxAPIVersion = 0;
- uint32_t fExtensions = 0; // Deprecated. Use fVkExtensions instead.
- const GrVkExtensions* fVkExtensions = nullptr;
- uint32_t fFeatures; // Deprecated. Use either fDeviceFeatures[2] instead.
+ uint32_t fMaxAPIVersion = 0;
+ uint32_t fExtensions = 0; // Deprecated. Use fVkExtensions instead.
+ const GrVkExtensions* fVkExtensions = nullptr;
+ uint32_t fFeatures; // Deprecated. Use fDeviceFeatures[2] instead.
// The client can create their VkDevice with either a VkPhysicalDeviceFeatures or
// VkPhysicalDeviceFeatures2 struct, thus we have to support taking both. The
// VkPhysicalDeviceFeatures2 struct is needed so we know if the client enabled any extension
// specific features. If fDeviceFeatures2 is not null then we ignore fDeviceFeatures. If both
// fDeviceFeatures and fDeviceFeatures2 are null we will assume no features are enabled.
- VkPhysicalDeviceFeatures* fDeviceFeatures = nullptr;
- VkPhysicalDeviceFeatures2* fDeviceFeatures2 = nullptr;
- sk_sp<GrVkMemoryAllocator> fMemoryAllocator;
- GrVkGetProc fGetProc = nullptr;
+ const VkPhysicalDeviceFeatures* fDeviceFeatures = nullptr;
+ const VkPhysicalDeviceFeatures2* fDeviceFeatures2 = nullptr;
+ sk_sp<GrVkMemoryAllocator> fMemoryAllocator;
+ GrVkGetProc fGetProc = nullptr;
// This is deprecated and should be set to false. The client is responsible for managing the
// lifetime of the VkInstance and VkDevice objects.
- bool fOwnsInstanceAndDevice = false;
+ bool fOwnsInstanceAndDevice = false;
};
#endif