liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: Fix drawing on cpu with color transform. 

Taken directly from this commit, credits to Dinnerbone:
9b76090e1f
This commit is contained in:
iwannabethedev 2023-05-11 18:43:54 +02:00 committed by Adrian Wielgosik
parent 77e1cc96c2
commit 476ff4aeef
1 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/bitmap/operations.rs
View File

@ -1318,39 +1318,25 @@ fn blend_and_transform<'gc>(
dest_region: PixelRegion,
transform: &ColorTransform,
) {
if !source.transparency() && source.ptr_eq(dest) && source_region == dest_region {
// Copying the same area of opaque self to self, noop
return;
}
if source.ptr_eq(dest) {
let dest = dest.sync();
let mut write = dest.write(context.gc_context);
if write.transparency() {
for y in 0..dest_region.height() {
for x in 0..dest_region.width() {
let mut color =
write.get_pixel32_raw(source_region.x_min + x, source_region.y_min + y);
color = Color::from(transform * swf::Color::from(color.to_un_multiplied_alpha()))
.to_premultiplied_alpha(true);
color = write
.get_pixel32_raw(dest_region.x_min + x, dest_region.y_min + y)
.blend_over(&color);
color =
Color::from(transform * swf::Color::from(color.to_un_multiplied_alpha()))
.to_premultiplied_alpha(true);
if !write.transparency() {
color = color.with_alpha(255);
}
write.set_pixel32_raw(dest_region.x_min + x, dest_region.y_min + y, color);
}
}
} else {
// Can't blend if copying from opaque
for y in 0..dest_region.height() {
for x in 0..dest_region.width() {
let mut color =
write.get_pixel32_raw(source_region.x_min + x, source_region.y_min + y);
color = Color::from(transform * swf::Color::from(color)).with_alpha(255);
write.set_pixel32_raw(dest_region.x_min + x, dest_region.y_min + y, color);
}
}
}
write.set_cpu_dirty(dest_region);
} else {
@ -1363,10 +1349,10 @@ fn blend_and_transform<'gc>(
for x in 0..dest_region.width() {
let mut color =
source_read.get_pixel32_raw(source_region.x_min + x, source_region.y_min + y);
color = Color::from(transform * swf::Color::from(color));
color = dest_write
.get_pixel32_raw(dest_region.x_min + x, dest_region.y_min + y)
.blend_over(&color);
color = Color::from(transform * swf::Color::from(color));
if opaque {
color = color.with_alpha(255);
}
@ -1431,7 +1417,7 @@ pub fn draw<'gc>(
&mut source_region,
);
if transform.color_transform == ColorTransform::default() {
if transform.color_transform != ColorTransform::default() {
blend_and_transform(
context,
*source,