@@ -347,7 +347,12 @@ static GrBackendTexture make_vk_backend_texture(
347
347
}
348
348
349
349
VkFormat format;
350
- SkAssertResult (backendFormat.asVkFormat (&format));
350
+ if (!backendFormat.asVkFormat (&format)) {
351
+ SkDebugf (" asVkFormat failed (valid: %d, backend: %d)" ,
352
+ backendFormat.isValid (),
353
+ backendFormat.backend ());
354
+ return GrBackendTexture ();
355
+ }
351
356
352
357
VkResult err;
353
358
@@ -364,6 +369,13 @@ static GrBackendTexture make_vk_backend_texture(
364
369
return GrBackendTexture ();
365
370
}
366
371
372
+ if (hwbFormatProps.format != format) {
373
+ SkDebugf (" Queried format not consistent with expected format; got: %d, expected: %d" ,
374
+ hwbFormatProps.format ,
375
+ format);
376
+ return GrBackendTexture ();
377
+ }
378
+
367
379
VkExternalFormatANDROID externalFormat;
368
380
externalFormat.sType = VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_ANDROID;
369
381
externalFormat.pNext = nullptr ;
@@ -389,7 +401,6 @@ static GrBackendTexture make_vk_backend_texture(
389
401
SkASSERT (hwbFormatProps.externalFormat == ycbcrConversion->fExternalFormat );
390
402
externalFormat.externalFormat = hwbFormatProps.externalFormat ;
391
403
}
392
- SkASSERT (format == hwbFormatProps.format );
393
404
394
405
const VkExternalMemoryImageCreateInfo externalMemoryImageInfo{
395
406
VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO, // sType
0 commit comments