aboutsummaryrefslogtreecommitdiff
path: root/src/gpu/vk
diff options
context:
space:
mode:
Diffstat (limited to 'src/gpu/vk')
-rw-r--r--src/gpu/vk/GrVkDescriptorPool.h6
-rw-r--r--src/gpu/vk/GrVkDescriptorSet.h5
-rw-r--r--src/gpu/vk/GrVkFramebuffer.h5
-rw-r--r--src/gpu/vk/GrVkImage.h4
-rw-r--r--src/gpu/vk/GrVkImageView.h5
-rw-r--r--src/gpu/vk/GrVkPipeline.h4
-rw-r--r--src/gpu/vk/GrVkRenderPass.h5
-rw-r--r--src/gpu/vk/GrVkSampler.h4
-rw-r--r--src/gpu/vk/GrVkSamplerYcbcrConversion.h5
-rw-r--r--src/gpu/vk/GrVkSemaphore.h5
10 files changed, 37 insertions, 11 deletions
diff --git a/src/gpu/vk/GrVkDescriptorPool.h b/src/gpu/vk/GrVkDescriptorPool.h
index 888dcb34d5..3afe8bb1d2 100644
--- a/src/gpu/vk/GrVkDescriptorPool.h
+++ b/src/gpu/vk/GrVkDescriptorPool.h
@@ -11,6 +11,8 @@
#include "include/gpu/vk/GrVkTypes.h"
#include "src/gpu/vk/GrVkManagedResource.h"
+#include <cinttypes>
+
class GrVkGpu;
/**
@@ -30,8 +32,8 @@ public:
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkDescriptorPool: %d, type %d (%d refs)\n", fDescPool, fType,
- this->getRefCnt());
+ SkDebugf("GrVkDescriptorPool: %" PRIdPTR ", type %d (%d refs)\n", (intptr_t)fDescPool,
+ fType, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkDescriptorSet.h b/src/gpu/vk/GrVkDescriptorSet.h
index 38c4f2df5b..3e45d2cdd5 100644
--- a/src/gpu/vk/GrVkDescriptorSet.h
+++ b/src/gpu/vk/GrVkDescriptorSet.h
@@ -12,6 +12,8 @@
#include "src/gpu/vk/GrVkDescriptorSetManager.h"
#include "src/gpu/vk/GrVkManagedResource.h"
+#include <cinttypes>
+
class GrVkDescriptorPool;
class GrVkGpu;
@@ -28,7 +30,8 @@ public:
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkDescriptorSet: %d (%d refs)\n", fDescSet, this->getRefCnt());
+ SkDebugf("GrVkDescriptorSet: %" PRIdPTR " (%d refs)\n", (intptr_t)fDescSet,
+ this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkFramebuffer.h b/src/gpu/vk/GrVkFramebuffer.h
index 81b69899af..cf774cb11e 100644
--- a/src/gpu/vk/GrVkFramebuffer.h
+++ b/src/gpu/vk/GrVkFramebuffer.h
@@ -13,6 +13,8 @@
#include "src/gpu/vk/GrVkManagedResource.h"
#include "src/gpu/vk/GrVkResourceProvider.h"
+#include <cinttypes>
+
class GrVkAttachment;
class GrVkGpu;
class GrVkImageView;
@@ -57,7 +59,8 @@ public:
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkFramebuffer: %d (%d refs)\n", fFramebuffer, this->getRefCnt());
+ SkDebugf("GrVkFramebuffer: %" PRIdPTR " (%d refs)\n",
+ (intptr_t)fFramebuffer, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkImage.h b/src/gpu/vk/GrVkImage.h
index cd99b0eb08..172ea9f5b0 100644
--- a/src/gpu/vk/GrVkImage.h
+++ b/src/gpu/vk/GrVkImage.h
@@ -17,6 +17,8 @@
#include "src/gpu/GrManagedResource.h"
#include "src/gpu/GrTexture.h"
+#include <cinttypes>
+
class GrVkGpu;
class GrVkTexture;
@@ -193,7 +195,7 @@ private:
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkImage: %d (%d refs)\n", fImage, this->getRefCnt());
+ SkDebugf("GrVkImage: %" PRIdPTR " (%d refs)\n", (intptr_t)fImage, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkImageView.h b/src/gpu/vk/GrVkImageView.h
index f36572484d..ec0a2ee9ec 100644
--- a/src/gpu/vk/GrVkImageView.h
+++ b/src/gpu/vk/GrVkImageView.h
@@ -12,6 +12,8 @@
#include "include/gpu/vk/GrVkTypes.h"
#include "src/gpu/vk/GrVkManagedResource.h"
+#include <cinttypes>
+
class GrVkSamplerYcbcrConversion;
struct GrVkYcbcrConversionInfo;
@@ -30,7 +32,8 @@ public:
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkImageView: %d (%d refs)\n", fImageView, this->getRefCnt());
+ SkDebugf("GrVkImageView: %" PRIdPTR " (%d refs)\n",
+ (intptr_t)fImageView, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkPipeline.h b/src/gpu/vk/GrVkPipeline.h
index f8891b8b24..c218c8915d 100644
--- a/src/gpu/vk/GrVkPipeline.h
+++ b/src/gpu/vk/GrVkPipeline.h
@@ -14,6 +14,8 @@
#include "src/gpu/GrXferProcessor.h"
#include "src/gpu/vk/GrVkManagedResource.h"
+#include <cinttypes>
+
class GrPipeline;
class GrProgramInfo;
class GrRenderTarget;
@@ -74,7 +76,7 @@ public:
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkPipeline: %d (%d refs)\n", fPipeline, this->getRefCnt());
+ SkDebugf("GrVkPipeline: %" PRIdPTR " (%d refs)\n", (intptr_t)fPipeline, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkRenderPass.h b/src/gpu/vk/GrVkRenderPass.h
index c6fbeeebbc..943cc9f634 100644
--- a/src/gpu/vk/GrVkRenderPass.h
+++ b/src/gpu/vk/GrVkRenderPass.h
@@ -12,6 +12,8 @@
#include "include/gpu/vk/GrVkTypes.h"
#include "src/gpu/vk/GrVkManagedResource.h"
+#include <cinttypes>
+
class GrProcessorKeyBuilder;
class GrVkGpu;
class GrVkRenderTarget;
@@ -164,7 +166,8 @@ public:
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkRenderPass: %d (%d refs)\n", fRenderPass, this->getRefCnt());
+ SkDebugf("GrVkRenderPass: %" PRIdPTR " (%d refs)\n",
+ (intptr_t)fRenderPass, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkSampler.h b/src/gpu/vk/GrVkSampler.h
index 14790ca8dd..ff3727d894 100644
--- a/src/gpu/vk/GrVkSampler.h
+++ b/src/gpu/vk/GrVkSampler.h
@@ -12,7 +12,9 @@
#include "src/core/SkOpts.h"
#include "src/gpu/vk/GrVkManagedResource.h"
#include "src/gpu/vk/GrVkSamplerYcbcrConversion.h"
+
#include <atomic>
+#include <cinttypes>
class GrSamplerState;
class GrVkGpu;
@@ -53,7 +55,7 @@ public:
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkSampler: %d (%d refs)\n", fSampler, this->getRefCnt());
+ SkDebugf("GrVkSampler: %" PRIdPTR " (%d refs)\n", (intptr_t)fSampler, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkSamplerYcbcrConversion.h b/src/gpu/vk/GrVkSamplerYcbcrConversion.h
index c4c7f868de..4296b7e2cf 100644
--- a/src/gpu/vk/GrVkSamplerYcbcrConversion.h
+++ b/src/gpu/vk/GrVkSamplerYcbcrConversion.h
@@ -13,6 +13,8 @@
#include "include/gpu/vk/GrVkTypes.h"
#include "src/core/SkOpts.h"
+#include <cinttypes>
+
class GrVkGpu;
class GrVkSamplerYcbcrConversion : public GrVkManagedResource {
@@ -53,7 +55,8 @@ public:
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkSamplerYcbcrConversion: %d (%d refs)\n", fYcbcrConversion, this->getRefCnt());
+ SkDebugf("GrVkSamplerYcbcrConversion: %" PRIdPTR " (%d refs)\n", (intptr_t)fYcbcrConversion,
+ this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkSemaphore.h b/src/gpu/vk/GrVkSemaphore.h
index 4e036074d2..f7c21837db 100644
--- a/src/gpu/vk/GrVkSemaphore.h
+++ b/src/gpu/vk/GrVkSemaphore.h
@@ -14,6 +14,8 @@
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/vk/GrVkManagedResource.h"
+#include <cinttypes>
+
class GrBackendSemaphore;
class GrVkGpu;
@@ -66,7 +68,8 @@ public:
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkSemaphore: %d (%d refs)\n", fSemaphore, this->getRefCnt());
+ SkDebugf("GrVkSemaphore: %" PRIdPTR " (%d refs)\n", (intptr_t)fSemaphore,
+ this->getRefCnt());
}
#endif
private: