[Scummvm-git-logs] scummvm master -> e10081f29b1295a410fa50ccff5c4cf9cabfdcb2

[fracturehill]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
33a1b1738b AGS: Don't skip drawing last line in optimized blit paths
e10081f29b AGS: Re-add include guard for NEON path cpp file


Commit: 33a1b1738b09e33adb5bd02b4dfa94e0040ac6cc
    https://github.com/scummvm/scummvm/commit/33a1b1738b09e33adb5bd02b4dfa94e0040ac6cc
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-10-16T13:23:04+03:00

Commit Message:
AGS: Don't skip drawing last line in optimized blit paths

Fixed an oversight in the code which would result in scaled
blits skipping the last line.

Changed paths:
    engines/ags/lib/allegro/surface_avx2.cpp
    engines/ags/lib/allegro/surface_neon.cpp
    engines/ags/lib/allegro/surface_sse2.cpp


diff --git a/engines/ags/lib/allegro/surface_avx2.cpp b/engines/ags/lib/allegro/surface_avx2.cpp
index d8ac206a341..f9fb1f88f67 100644
--- a/engines/ags/lib/allegro/surface_avx2.cpp
+++ b/engines/ags/lib/allegro/surface_avx2.cpp
@@ -676,7 +676,7 @@ static void drawInner2Bpp(BITMAP::DrawInnerArgs &args) {
 	if (args.yStart + yCtrHeight > args.destArea.h) {
 		yCtrHeight = args.destArea.h - args.yStart;
 	}
-	if (xCtrWidth % 16 != 0) {
+	if (!Scale && xCtrWidth % 16 != 0) {
 		--yCtrHeight;
 	}
 
diff --git a/engines/ags/lib/allegro/surface_neon.cpp b/engines/ags/lib/allegro/surface_neon.cpp
index ecb1a479973..4cd6a8a4a5b 100644
--- a/engines/ags/lib/allegro/surface_neon.cpp
+++ b/engines/ags/lib/allegro/surface_neon.cpp
@@ -495,7 +495,7 @@ static void drawInner4BppWithConv(BITMAP::DrawInnerArgs &args) {
 	if (args.yStart + yCtrHeight > args.destArea.h) {
 		yCtrHeight = args.destArea.h - args.yStart;
 	}
-	if (xCtrWidth % 4 != 0) {
+	if (!Scale && xCtrWidth % 4 != 0) {
 		--yCtrHeight;
 	}
 
@@ -662,7 +662,7 @@ static void drawInner2Bpp(BITMAP::DrawInnerArgs &args) {
 	if (args.yStart + yCtrHeight > args.destArea.h) {
 		yCtrHeight = args.destArea.h - args.yStart;
 	}
-	if (xCtrWidth % 8 != 0) {
+	if (!Scale && xCtrWidth % 8 != 0) {
 		--yCtrHeight;
 	}
 
diff --git a/engines/ags/lib/allegro/surface_sse2.cpp b/engines/ags/lib/allegro/surface_sse2.cpp
index 876d30ad8cf..5dd7bc0b831 100644
--- a/engines/ags/lib/allegro/surface_sse2.cpp
+++ b/engines/ags/lib/allegro/surface_sse2.cpp
@@ -518,7 +518,7 @@ static void drawInner4BppWithConv(BITMAP::DrawInnerArgs &args) {
 	if (args.yStart + yCtrHeight > args.destArea.h) {
 		yCtrHeight = args.destArea.h - args.yStart;
 	}
-	if (xCtrWidth % 4 != 0) {
+	if (!Scale && xCtrWidth % 4 != 0) {
 		--yCtrHeight;
 	}
 
@@ -688,7 +688,7 @@ static void drawInner2Bpp(BITMAP::DrawInnerArgs &args) {
 	if (args.yStart + yCtrHeight > args.destArea.h) {
 		yCtrHeight = args.destArea.h - args.yStart;
 	}
-	if (xCtrWidth % 8 != 0) {
+	if (!Scale && xCtrWidth % 8 != 0) {
 		--yCtrHeight;
 	}
 


Commit: e10081f29b1295a410fa50ccff5c4cf9cabfdcb2
    https://github.com/scummvm/scummvm/commit/e10081f29b1295a410fa50ccff5c4cf9cabfdcb2
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-10-16T13:23:04+03:00

Commit Message:
AGS: Re-add include guard for NEON path cpp file

This was mistakenly removed previously, but it seems that
without it the iOS backend breaks.

Changed paths:
    engines/ags/lib/allegro/surface_neon.cpp


diff --git a/engines/ags/lib/allegro/surface_neon.cpp b/engines/ags/lib/allegro/surface_neon.cpp
index 4cd6a8a4a5b..187374968b1 100644
--- a/engines/ags/lib/allegro/surface_neon.cpp
+++ b/engines/ags/lib/allegro/surface_neon.cpp
@@ -20,6 +20,10 @@
  */
 
 #include "ags/ags.h"
+
+// Without this ifdef the iOS backend breaks, please do not remove
+#ifdef SCUMMVM_NEON
+
 #include <arm_neon.h>
 #include "ags/globals.h"
 #include "ags/lib/allegro/color.h"
@@ -932,3 +936,5 @@ template void BITMAP::drawNEON<false>(DrawInnerArgs &);
 template void BITMAP::drawNEON<true>(DrawInnerArgs &);
 
 } // namespace AGS3
+
+#endif // SCUMMVM_NEON