Unified · Split
| @@ -46,7 +46,7 @@ static bool map(struct ra_hwdec_mapper *mapper, · 45 unmodified lines | |||
| 46 | return false; | 46 | return false; |
| 47 | } else if (!ra_compatible_format(mapper->ra, drm_format, | 47 | } else if (!ra_compatible_format(mapper->ra, drm_format, |
| 48 | mapper_p->desc.objects[0].format_modifier)) { | 48 | mapper_p->desc.objects[0].format_modifier)) { |
| 49 | MP_VERBOSE(mapper, "Mapped surface with format %s; drm format '%s(%016lx)' " | 49 | MP_VERBOSE(mapper, "Mapped surface with format %s; drm format '%s(%016" PRIx64 ")' " |
| 50 | "is not supported by compositor.\n", | 50 | "is not supported by compositor.\n", |
| 51 | mp_imgfmt_to_name(mapper->src->params.hw_subfmt), | 51 | mp_imgfmt_to_name(mapper->src->params.hw_subfmt), |
| 52 | mp_tag_str(drm_format), | 52 | mp_tag_str(drm_format), |
| @@ -54,7 +54,7 @@ static bool map(struct ra_hwdec_mapper *mapper, · 1 unmodified line | |||
| 54 | return false; | 54 | return false; |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | MP_VERBOSE(mapper, "Supported Wayland display format %s: '%s(%016lx)'\n", | 57 | MP_VERBOSE(mapper, "Supported Wayland display format %s: '%s(%016" PRIx64 ")'\n", |
| 58 | mp_imgfmt_to_name(mapper->src->params.hw_subfmt), | 58 | mp_imgfmt_to_name(mapper->src->params.hw_subfmt), |
| 59 | mp_tag_str(drm_format), mapper_p->desc.objects[0].format_modifier); | 59 | mp_tag_str(drm_format), mapper_p->desc.objects[0].format_modifier); |
| 60 | 60 | ||
| @@ -203,7 +203,7 @@ static void vaapi_dmabuf_importer(struct buffer *buf, struct mp_image *src, · 202 unmodified lines | |||
| 203 | } | 203 | } |
| 204 | buf->drm_format = desc.layers[layer_no].drm_format; | 204 | buf->drm_format = desc.layers[layer_no].drm_format; |
| 205 | if (!ra_compatible_format(p->ctx->ra, buf->drm_format, desc.objects[0].drm_format_modifier)) { | 205 | if (!ra_compatible_format(p->ctx->ra, buf->drm_format, desc.objects[0].drm_format_modifier)) { |
| 206 | MP_VERBOSE(vo, "%s(%016lx) is not supported.\n", | 206 | MP_VERBOSE(vo, "%s(%016" PRIx64 ") is not supported.\n", |
| 207 | mp_tag_str(buf->drm_format), desc.objects[0].drm_format_modifier); | 207 | mp_tag_str(buf->drm_format), desc.objects[0].drm_format_modifier); |
| 208 | buf->drm_format = 0; | 208 | buf->drm_format = 0; |
| 209 | goto done; | 209 | goto done; |
| @@ -685,7 +685,7 @@ static int reconfig(struct vo *vo, struct mp_image *img) · 475 unmodified lines | |||
| 685 | } | 685 | } |
| 686 | 686 | ||
| 687 | if (!ra_compatible_format(p->ctx->ra, p->drm_format, p->drm_modifier)) { | 687 | if (!ra_compatible_format(p->ctx->ra, p->drm_format, p->drm_modifier)) { |
| 688 | MP_ERR(vo, "Format '%s' with modifier '(%016lx)' is not supported by" | 688 | MP_ERR(vo, "Format '%s' with modifier '(%016" PRIx64 ")' is not supported by" |
| 689 | " the compositor.\n", mp_tag_str(p->drm_format), p->drm_modifier); | 689 | " the compositor.\n", mp_tag_str(p->drm_format), p->drm_modifier); |
| 690 | return VO_ERROR; | 690 | return VO_ERROR; |
| 691 | } | 691 | } |