Merge pull request #47 from GloriousEggroll/upstream

wined3d-Revert_Surface_Blt: 0001 update format->convert to conv_byte_…
This commit is contained in:
GloriousEggroll 2018-02-20 21:44:37 -05:00 committed by GitHub
commit ad9df471b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -20,7 +20,7 @@ index e90ef042323..aacdb07ad4a 100644
+ /* We want to avoid invalidating the sysmem location for converted
+ * surfaces, since otherwise we'd have to convert the data back when
+ * locking them. */
+ if (dst_texture->flags & WINED3D_TEXTURE_CONVERTED || dst_texture->resource.format->convert
+ if (dst_texture->flags & WINED3D_TEXTURE_CONVERTED || dst_texture->resource.format->conv_byte_count
+ || wined3d_format_get_color_key_conversion(dst_texture, TRUE))
+ {
+ WARN_(d3d_perf)("Converted surface, using CPU blit.\n");