Revert "Add format-specifier warnings to SkDebugf."
This reverts commit e58831cd9578805634b986b434a20757277b3a36.
Reason for revert: looks like breaking a few build bots
Original change's description:
> Add format-specifier warnings to SkDebugf.
>
> This CL fixes up many existing format-specifier violations in Skia.
> Note that GCC has a warning for formatting nothing, so existing calls to
> `SkDebugf("")` have been removed, or replaced with `SkDebugf("%s", "")`.
> These were apparently meant to be used as a place to set a breakpoint.
>
> Some of our clients also use SkDebug with bad format specifiers, so this
> check is currently only enabled when SKIA_IMPLEMENTATION is true.
>
> Change-Id: I8177a1298a624c6936adc24e0d8f481362a356d0
> Bug: skia:12143
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/420902
> Auto-Submit: John Stiles <johnstiles@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Change-Id: I07848c1bf8992925c9498e916744d0840355a077
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:12143
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/421917
Reviewed-by: Tyler Denniston <tdenniston@google.com>
Commit-Queue: Tyler Denniston <tdenniston@google.com>
diff --git a/src/core/SkResourceCache.cpp b/src/core/SkResourceCache.cpp
index b8285ed..016c38c 100644
--- a/src/core/SkResourceCache.cpp
+++ b/src/core/SkResourceCache.cpp
@@ -412,7 +412,7 @@
void SkResourceCache::dump() const {
this->validate();
- SkDebugf("SkResourceCache: count=%d bytes=%zu %s\n",
+ SkDebugf("SkResourceCache: count=%d bytes=%d %s\n",
fCount, fTotalBytesUsed, fDiscardableFactory ? "discardable" : "malloc");
}
@@ -581,7 +581,7 @@
/////////////
static void dump_visitor(const SkResourceCache::Rec& rec, void*) {
- SkDebugf("RC: %12s bytes %9zu discardable %p\n",
+ SkDebugf("RC: %12s bytes %9lu discardable %p\n",
rec.getCategory(), rec.bytesUsed(), rec.diagnostic_only_getDiscardable());
}
diff --git a/src/core/SkSharedMutex.cpp b/src/core/SkSharedMutex.cpp
index 6ae129a..5d34e42 100644
--- a/src/core/SkSharedMutex.cpp
+++ b/src/core/SkSharedMutex.cpp
@@ -10,8 +10,6 @@
#include "include/core/SkTypes.h"
#include "include/private/SkSemaphore.h"
-#include <cinttypes>
-
#if !defined(__has_feature)
#define __has_feature(x) 0
#endif
@@ -134,10 +132,10 @@
SkAutoMutexExclusive l(fMu);
SkASSERTF(!fCurrentShared->find(threadID),
- "Thread %" PRIx64 " already has an shared lock\n", threadID);
+ "Thread %lx already has an shared lock\n", threadID);
if (!fWaitingExclusive->tryAdd(threadID)) {
- SkDEBUGFAILF("Thread %" PRIx64 " already has an exclusive lock\n", threadID);
+ SkDEBUGFAILF("Thread %lx already has an exclusive lock\n", threadID);
}
currentSharedCount = fCurrentShared->count();
@@ -164,7 +162,7 @@
SkAutoMutexExclusive l(fMu);
SkASSERT(0 == fCurrentShared->count());
if (!fWaitingExclusive->tryRemove(threadID)) {
- SkDEBUGFAILF("Thread %" PRIx64 " did not have the lock held.\n", threadID);
+ SkDEBUGFAILF("Thread %lx did not have the lock held.\n", threadID);
}
exclusiveWaitingCount = fWaitingExclusive->count();
sharedWaitingCount = fWaitingShared->count();
@@ -198,11 +196,11 @@
exclusiveWaitingCount = fWaitingExclusive->count();
if (exclusiveWaitingCount > 0) {
if (!fWaitingShared->tryAdd(threadID)) {
- SkDEBUGFAILF("Thread %" PRIx64 " was already waiting!\n", threadID);
+ SkDEBUGFAILF("Thread %lx was already waiting!\n", threadID);
}
} else {
if (!fCurrentShared->tryAdd(threadID)) {
- SkDEBUGFAILF("Thread %" PRIx64 " already holds a shared lock!\n", threadID);
+ SkDEBUGFAILF("Thread %lx already holds a shared lock!\n", threadID);
}
}
sharedQueueSelect = fSharedQueueSelect;
@@ -224,7 +222,7 @@
{
SkAutoMutexExclusive l(fMu);
if (!fCurrentShared->tryRemove(threadID)) {
- SkDEBUGFAILF("Thread %" PRIx64 " does not hold a shared lock.\n", threadID);
+ SkDEBUGFAILF("Thread %lx does not hold a shared lock.\n", threadID);
}
currentSharedCount = fCurrentShared->count();
waitingExclusiveCount = fWaitingExclusive->count();
diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index 52fe061..ad16698 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -428,7 +428,7 @@
if (sk_fwrite(buffer, size, fFILE) != size)
{
- SkDEBUGCODE(SkDebugf("SkFILEWStream failed writing %zu bytes\n", size);)
+ SkDEBUGCODE(SkDebugf("SkFILEWStream failed writing %d bytes\n", size);)
sk_fclose(fFILE);
fFILE = nullptr;
return false;
diff --git a/src/core/SkStrikeCache.cpp b/src/core/SkStrikeCache.cpp
index 19a7454..1fce164 100644
--- a/src/core/SkStrikeCache.cpp
+++ b/src/core/SkStrikeCache.cpp
@@ -58,7 +58,7 @@
SkDebugf("GlyphCache [ used budget ]\n");
SkDebugf(" bytes [ %8zu %8zu ]\n",
SkGraphics::GetFontCacheUsed(), SkGraphics::GetFontCacheLimit());
- SkDebugf(" count [ %8d %8d ]\n",
+ SkDebugf(" count [ %8zu %8zu ]\n",
SkGraphics::GetFontCacheCountUsed(), SkGraphics::GetFontCacheCountLimit());
int counter = 0;
@@ -342,7 +342,7 @@
SK_ABORT("fCacheCount != computedCount");
}
if (fTotalMemoryUsed != computedBytes) {
- SkDebugf("fTotalMemoryUsed: %zu, computedBytes: %zu", fTotalMemoryUsed, computedBytes);
+ SkDebugf("fTotalMemoryUsed: %d, computedBytes: %d", fTotalMemoryUsed, computedBytes);
SK_ABORT("fTotalMemoryUsed == computedBytes");
}
#endif
diff --git a/src/core/SkTextBlobTrace.cpp b/src/core/SkTextBlobTrace.cpp
index 8827542..7cd15e3 100644
--- a/src/core/SkTextBlobTrace.cpp
+++ b/src/core/SkTextBlobTrace.cpp
@@ -63,8 +63,8 @@
font.getScaleX(),
font.getSkewX(),
SkFontPriv::Flags(font),
- (int)font.getEdging(),
- (int)font.getHinting());
+ font.getEdging(),
+ font.getHinting());
uint32_t glyphCount = iter.glyphCount();
const uint16_t* glyphs = iter.glyphs();
for (uint32_t i = 0; i < glyphCount; i++) {
diff --git a/src/core/SkVM.cpp b/src/core/SkVM.cpp
index bc49f16..840701d 100644
--- a/src/core/SkVM.cpp
+++ b/src/core/SkVM.cpp
@@ -159,7 +159,7 @@
size_t fBytesWritten = 0;
bool write(const void* buffer, size_t size) override {
- SkDebugf("%.*s", (int)size, (const char*)buffer);
+ SkDebugf("%.*s", size, buffer);
fBytesWritten += size;
return true;
}
diff --git a/src/gpu/GrRecordingContextPriv.h b/src/gpu/GrRecordingContextPriv.h
index cf3205e..c52413a 100644
--- a/src/gpu/GrRecordingContextPriv.h
+++ b/src/gpu/GrRecordingContextPriv.h
@@ -99,7 +99,7 @@
return;
}
#endif
- SkDebugf("%s", msg);
+ SkDebugf(msg);
}
GrRecordingContext::Stats* stats() {
diff --git a/src/gpu/d3d/GrD3DUtil.h b/src/gpu/d3d/GrD3DUtil.h
index faa4072..52d98df 100644
--- a/src/gpu/d3d/GrD3DUtil.h
+++ b/src/gpu/d3d/GrD3DUtil.h
@@ -13,14 +13,14 @@
#include "include/gpu/d3d/GrD3DTypes.h"
#include "include/private/GrTypesPriv.h"
-#define GR_D3D_CALL_ERRCHECK(X) \
- do { \
- HRESULT result = X; \
- SkASSERT(SUCCEEDED(result)); \
- if (!SUCCEEDED(result)) { \
- SkDebugf("Failed Direct3D call. Error: 0x%08lx\n", result); \
- } \
- } while (false)
+#define GR_D3D_CALL_ERRCHECK(X) \
+ do { \
+ HRESULT result = X; \
+ SkASSERT(SUCCEEDED(result)); \
+ if (!SUCCEEDED(result)) { \
+ SkDebugf("Failed Direct3D call. Error: 0x%08x\n", result); \
+ } \
+ } while(false)
static constexpr bool operator==(const D3D12_CPU_DESCRIPTOR_HANDLE & first,
const D3D12_CPU_DESCRIPTOR_HANDLE & second) {
diff --git a/src/gpu/vk/GrVkDescriptorPool.h b/src/gpu/vk/GrVkDescriptorPool.h
index 3afe8bb..888dcb3 100644
--- a/src/gpu/vk/GrVkDescriptorPool.h
+++ b/src/gpu/vk/GrVkDescriptorPool.h
@@ -11,8 +11,6 @@
#include "include/gpu/vk/GrVkTypes.h"
#include "src/gpu/vk/GrVkManagedResource.h"
-#include <cinttypes>
-
class GrVkGpu;
/**
@@ -32,8 +30,8 @@
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkDescriptorPool: %" PRIdPTR ", type %d (%d refs)\n", (intptr_t)fDescPool,
- fType, this->getRefCnt());
+ SkDebugf("GrVkDescriptorPool: %d, type %d (%d refs)\n", fDescPool, fType,
+ this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkDescriptorSet.h b/src/gpu/vk/GrVkDescriptorSet.h
index 3e45d2c..38c4f2d 100644
--- a/src/gpu/vk/GrVkDescriptorSet.h
+++ b/src/gpu/vk/GrVkDescriptorSet.h
@@ -12,8 +12,6 @@
#include "src/gpu/vk/GrVkDescriptorSetManager.h"
#include "src/gpu/vk/GrVkManagedResource.h"
-#include <cinttypes>
-
class GrVkDescriptorPool;
class GrVkGpu;
@@ -30,8 +28,7 @@
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkDescriptorSet: %" PRIdPTR " (%d refs)\n", (intptr_t)fDescSet,
- this->getRefCnt());
+ SkDebugf("GrVkDescriptorSet: %d (%d refs)\n", fDescSet, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkFramebuffer.h b/src/gpu/vk/GrVkFramebuffer.h
index cf774cb..81b6989 100644
--- a/src/gpu/vk/GrVkFramebuffer.h
+++ b/src/gpu/vk/GrVkFramebuffer.h
@@ -13,8 +13,6 @@
#include "src/gpu/vk/GrVkManagedResource.h"
#include "src/gpu/vk/GrVkResourceProvider.h"
-#include <cinttypes>
-
class GrVkAttachment;
class GrVkGpu;
class GrVkImageView;
@@ -59,8 +57,7 @@
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkFramebuffer: %" PRIdPTR " (%d refs)\n",
- (intptr_t)fFramebuffer, this->getRefCnt());
+ SkDebugf("GrVkFramebuffer: %d (%d refs)\n", fFramebuffer, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkImage.h b/src/gpu/vk/GrVkImage.h
index 172ea9f..cd99b0e 100644
--- a/src/gpu/vk/GrVkImage.h
+++ b/src/gpu/vk/GrVkImage.h
@@ -17,8 +17,6 @@
#include "src/gpu/GrManagedResource.h"
#include "src/gpu/GrTexture.h"
-#include <cinttypes>
-
class GrVkGpu;
class GrVkTexture;
@@ -195,7 +193,7 @@
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkImage: %" PRIdPTR " (%d refs)\n", (intptr_t)fImage, this->getRefCnt());
+ SkDebugf("GrVkImage: %d (%d refs)\n", fImage, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkImageView.h b/src/gpu/vk/GrVkImageView.h
index ec0a2ee..f365724 100644
--- a/src/gpu/vk/GrVkImageView.h
+++ b/src/gpu/vk/GrVkImageView.h
@@ -12,8 +12,6 @@
#include "include/gpu/vk/GrVkTypes.h"
#include "src/gpu/vk/GrVkManagedResource.h"
-#include <cinttypes>
-
class GrVkSamplerYcbcrConversion;
struct GrVkYcbcrConversionInfo;
@@ -32,8 +30,7 @@
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkImageView: %" PRIdPTR " (%d refs)\n",
- (intptr_t)fImageView, this->getRefCnt());
+ SkDebugf("GrVkImageView: %d (%d refs)\n", fImageView, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkPipeline.h b/src/gpu/vk/GrVkPipeline.h
index c218c89..f8891b8 100644
--- a/src/gpu/vk/GrVkPipeline.h
+++ b/src/gpu/vk/GrVkPipeline.h
@@ -14,8 +14,6 @@
#include "src/gpu/GrXferProcessor.h"
#include "src/gpu/vk/GrVkManagedResource.h"
-#include <cinttypes>
-
class GrPipeline;
class GrProgramInfo;
class GrRenderTarget;
@@ -76,7 +74,7 @@
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkPipeline: %" PRIdPTR " (%d refs)\n", (intptr_t)fPipeline, this->getRefCnt());
+ SkDebugf("GrVkPipeline: %d (%d refs)\n", fPipeline, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkRenderPass.h b/src/gpu/vk/GrVkRenderPass.h
index 943cc9f..c6fbeee 100644
--- a/src/gpu/vk/GrVkRenderPass.h
+++ b/src/gpu/vk/GrVkRenderPass.h
@@ -12,8 +12,6 @@
#include "include/gpu/vk/GrVkTypes.h"
#include "src/gpu/vk/GrVkManagedResource.h"
-#include <cinttypes>
-
class GrProcessorKeyBuilder;
class GrVkGpu;
class GrVkRenderTarget;
@@ -166,8 +164,7 @@
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkRenderPass: %" PRIdPTR " (%d refs)\n",
- (intptr_t)fRenderPass, this->getRefCnt());
+ SkDebugf("GrVkRenderPass: %d (%d refs)\n", fRenderPass, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkSampler.h b/src/gpu/vk/GrVkSampler.h
index ff3727d..14790ca 100644
--- a/src/gpu/vk/GrVkSampler.h
+++ b/src/gpu/vk/GrVkSampler.h
@@ -12,9 +12,7 @@
#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;
@@ -55,7 +53,7 @@
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkSampler: %" PRIdPTR " (%d refs)\n", (intptr_t)fSampler, this->getRefCnt());
+ SkDebugf("GrVkSampler: %d (%d refs)\n", fSampler, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkSamplerYcbcrConversion.h b/src/gpu/vk/GrVkSamplerYcbcrConversion.h
index 4296b7e..c4c7f86 100644
--- a/src/gpu/vk/GrVkSamplerYcbcrConversion.h
+++ b/src/gpu/vk/GrVkSamplerYcbcrConversion.h
@@ -13,8 +13,6 @@
#include "include/gpu/vk/GrVkTypes.h"
#include "src/core/SkOpts.h"
-#include <cinttypes>
-
class GrVkGpu;
class GrVkSamplerYcbcrConversion : public GrVkManagedResource {
@@ -55,8 +53,7 @@
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkSamplerYcbcrConversion: %" PRIdPTR " (%d refs)\n", (intptr_t)fYcbcrConversion,
- this->getRefCnt());
+ SkDebugf("GrVkSamplerYcbcrConversion: %d (%d refs)\n", fYcbcrConversion, this->getRefCnt());
}
#endif
diff --git a/src/gpu/vk/GrVkSemaphore.h b/src/gpu/vk/GrVkSemaphore.h
index f7c2183..4e03607 100644
--- a/src/gpu/vk/GrVkSemaphore.h
+++ b/src/gpu/vk/GrVkSemaphore.h
@@ -14,8 +14,6 @@
#include "src/gpu/GrResourceProvider.h"
#include "src/gpu/vk/GrVkManagedResource.h"
-#include <cinttypes>
-
class GrBackendSemaphore;
class GrVkGpu;
@@ -68,8 +66,7 @@
#ifdef SK_TRACE_MANAGED_RESOURCES
void dumpInfo() const override {
- SkDebugf("GrVkSemaphore: %" PRIdPTR " (%d refs)\n", (intptr_t)fSemaphore,
- this->getRefCnt());
+ SkDebugf("GrVkSemaphore: %d (%d refs)\n", fSemaphore, this->getRefCnt());
}
#endif
private:
diff --git a/src/pathops/SkPathOpsTSect.cpp b/src/pathops/SkPathOpsTSect.cpp
index 1680584..21f15fc 100644
--- a/src/pathops/SkPathOpsTSect.cpp
+++ b/src/pathops/SkPathOpsTSect.cpp
@@ -40,7 +40,7 @@
fMatch = cPt.approximatelyEqual(fPerpPt);
#if DEBUG_T_SECT
if (fMatch) {
- SkDebugf("%s", ""); // allow setting breakpoint
+ SkDebugf(""); // allow setting breakpoint
}
#endif
}
@@ -233,7 +233,7 @@
fDeleted = false;
#if DEBUG_T_SECT
if (fCollapsed) {
- SkDebugf("%s", ""); // for convenient breakpoints
+ SkDebugf(""); // for convenient breakpoints
}
#endif
return fBounds.valid();
diff --git a/src/pathops/SkPathWriter.cpp b/src/pathops/SkPathWriter.cpp
index 144fda9..842cd2a 100644
--- a/src/pathops/SkPathWriter.cpp
+++ b/src/pathops/SkPathWriter.cpp
@@ -364,6 +364,7 @@
connect by following segments from one to the other, rather than introducing
a diagonal to connect the two.
*/
+ SkDebugf("");
}
}
if (forward) {
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 3841638..02e5f75 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1455,7 +1455,7 @@
FT_Error err = FT_Load_Glyph(fFace, glyph.getGlyphID(), fLoadGlyphFlags);
if (err != 0) {
SK_TRACEFTR(err, "SkScalerContext_FreeType::generateImage: FT_Load_Glyph(glyph:%d "
- "width:%d height:%d rb:%zu flags:%d) failed.",
+ "width:%d height:%d rb:%d flags:%d) failed.",
glyph.getGlyphID(), glyph.width(), glyph.height(), glyph.rowBytes(),
fLoadGlyphFlags);
sk_bzero(glyph.fImage, glyph.imageSize());
diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp
index ae88efa..4245ae7 100644
--- a/src/ports/SkFontHost_FreeType_common.cpp
+++ b/src/ports/SkFontHost_FreeType_common.cpp
@@ -1070,7 +1070,7 @@
FT_Error err = FT_Render_Glyph(face->glyph, doVert ? FT_RENDER_MODE_LCD_V :
FT_RENDER_MODE_LCD);
if (err) {
- SK_TRACEFTR(err, "Could not render glyph %p.", face->glyph);
+ SK_TRACEFTR(err, "Could not render glyph %x.", face->glyph);
return;
}
diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h
index 5e97038..1b5a72f 100644
--- a/src/ports/SkFontHost_FreeType_common.h
+++ b/src/ports/SkFontHost_FreeType_common.h
@@ -27,7 +27,7 @@
#ifdef SK_DEBUG
const char* SkTraceFtrGetError(int);
#define SK_TRACEFTR(ERR, MSG, ...) \
- SkDebugf("%s:%d:1: error: 0x%x '%s' " MSG "\n", __FILE__, __LINE__, ERR, \
+ SkDebugf("%s:%lu:1: error: 0x%x '%s' " MSG "\n", __FILE__, __LINE__, ERR, \
SkTraceFtrGetError((int)(ERR)), __VA_ARGS__)
#else
#define SK_TRACEFTR(ERR, ...) do { sk_ignore_unused_variable(ERR); } while (false)
diff --git a/src/ports/SkFontMgr_android_parser.cpp b/src/ports/SkFontMgr_android_parser.cpp
index 396435c..85a4f1f 100644
--- a/src/ports/SkFontMgr_android_parser.cpp
+++ b/src/ports/SkFontMgr_android_parser.cpp
@@ -126,11 +126,9 @@
#define SK_FONTMGR_ANDROID_PARSER_PREFIX "[SkFontMgr Android Parser] "
-#define SK_FONTCONFIGPARSER_WARNING(message, ...) \
- SkDebugf(SK_FONTMGR_ANDROID_PARSER_PREFIX "%s:%d:%d: warning: " message "\n", \
- self->fFilename, \
- (int)XML_GetCurrentLineNumber(self->fParser), \
- (int)XML_GetCurrentColumnNumber(self->fParser), \
+#define SK_FONTCONFIGPARSER_WARNING(message, ...) \
+ SkDebugf(SK_FONTMGR_ANDROID_PARSER_PREFIX "%s:%d:%d: warning: " message "\n", self->fFilename, \
+ XML_GetCurrentLineNumber(self->fParser), XML_GetCurrentColumnNumber(self->fParser), \
##__VA_ARGS__)
static bool is_whitespace(char c) {
diff --git a/src/sksl/SkSLOperators.h b/src/sksl/SkSLOperators.h
index 4a936b0..a51985f 100644
--- a/src/sksl/SkSLOperators.h
+++ b/src/sksl/SkSLOperators.h
@@ -22,7 +22,7 @@
// Allow implicit conversion from Token::Kind, since this is just a utility wrapper on top.
Operator(Token::Kind t) : fKind(t) {
- SkASSERTF(this->isOperator(), "token-kind %d is not an operator", (int)fKind);
+ SkASSERTF(this->isOperator(), "token-kind %d is not an operator", fKind);
}
enum class Precedence {
diff --git a/src/sksl/codegen/SkSLVMCodeGenerator.cpp b/src/sksl/codegen/SkSLVMCodeGenerator.cpp
index 82cd65b..7aa2c02 100644
--- a/src/sksl/codegen/SkSLVMCodeGenerator.cpp
+++ b/src/sksl/codegen/SkSLVMCodeGenerator.cpp
@@ -644,7 +644,7 @@
default:
break;
}
- SkDEBUGFAILF("Unsupported type conversion: %d -> %d", (int)srcKind, (int)dstKind);
+ SkDEBUGFAILF("Unsupported type conversion: %d -> %d", srcKind, dstKind);
return {};
}
@@ -1348,7 +1348,7 @@
Value SkVMGenerator::writeStore(const Expression& lhs, const Value& rhs) {
SkASSERTF(rhs.slots() == lhs.type().slotCount(),
- "lhs=%s (%s)\nrhs=%zu slot",
+ "lhs=%s (%s)\nrhs=%d slot",
lhs.type().description().c_str(), lhs.description().c_str(), rhs.slots());
// We need to figure out the collection of slots that we're storing into. The l-value (lhs)
diff --git a/src/utils/win/SkHRESULT.cpp b/src/utils/win/SkHRESULT.cpp
index 43de3d6..2be6331 100644
--- a/src/utils/win/SkHRESULT.cpp
+++ b/src/utils/win/SkHRESULT.cpp
@@ -14,7 +14,7 @@
if (msg) {
SkDebugf("%s\n", msg);
}
- SkDebugf("%s(%lu) : error 0x%lx: ", file, line, hr);
+ SkDebugf("%s(%lu) : error 0x%x: ", file, line, hr);
LPSTR errorText = nullptr;
FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |