all repos — mgba @ 9dfcef3f45efe580e252ec8bc3852257e9de9fd6

mGBA Game Boy Advance Emulator

DS GX: Fixed viewport calculations (fixes #709)
Gericom fnouwt2@gmail.com
Sun, 16 Jul 2017 16:10:28 -0700
commit

9dfcef3f45efe580e252ec8bc3852257e9de9fd6

parent

de55e441520f1678864c7fe9d1936a013b096a65

2 files changed, 4 insertions(+), 3 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -4,6 +4,7 @@ - DS GX: Toon shading
 Bugfixes:
  - DS GX: Fix vertex texture transformation (fixes mgba.io/i/702)
  - DS GX: Automatically normalize winding culling calculations (fixes mgba.io/i/699)
+ - DS GX: Fixed viewport calculations (fixes mgba.io/i/709)
 Misc:
  - DS GX: Clean up and unify texture mapping
  - DS Core: Add symbol loading
M src/ds/gx/software.c → src/ds/gx/software.c 
@@ -498,7 +498,7 @@ v0w = 1;
 	}
 
 	int32_t v0x = (v0->viewCoord[0] + v0w) * (int64_t) (v0->viewportWidth << 12) / (v0w * 2) + (v0->viewportX << 12);
-	int32_t v0y = (-v0->viewCoord[1] + v0w) * (int64_t) (v0->viewportHeight << 12) / (v0w * 2) + (v0->viewportY << 12);
+	int32_t v0y = (DS_VIDEO_VERTICAL_PIXELS << 12) - ((v0->viewCoord[1] + v0w) * (int64_t) (v0->viewportHeight << 12) / (v0w * 2) + (v0->viewportY << 12));
 	if (poly->minY > v0y >> 12) {
 		poly->minY = v0y >> 12;
 	}

@@ -515,7 +515,7 @@ if (!v1w) {
 			v1w = 1;
 		}
 		int32_t v1x = (v1->viewCoord[0] + v1w) * (int64_t) (v1->viewportWidth << 12) / (v1w * 2) + (v1->viewportX << 12);
-		int32_t v1y = (-v1->viewCoord[1] + v1w) * (int64_t) (v1->viewportHeight << 12) / (v1w * 2) + (v1->viewportY << 12);
+		int32_t v1y = (DS_VIDEO_VERTICAL_PIXELS << 12) - ((v1->viewCoord[1] + v1w) * (int64_t) (v1->viewportHeight << 12) / (v1w * 2) + (v1->viewportY << 12));
 		if (poly->minY > v1y >> 12) {
 			poly->minY = v1y >> 12;
 		}

@@ -574,7 +574,7 @@ if (!v1w) {
 		v1w = 1;
 	}
 	int32_t v1x = (v1->viewCoord[0] + v1w) * (int64_t) (v1->viewportWidth << 12) / (v1w * 2) + (v1->viewportX << 12);
-	int32_t v1y = (-v1->viewCoord[1] + v1w) * (int64_t) (v1->viewportHeight << 12) / (v1w * 2) + (v1->viewportY << 12);
+	int32_t v1y = (DS_VIDEO_VERTICAL_PIXELS << 12) - ((v1->viewCoord[1] + v1w) * (int64_t) (v1->viewportHeight << 12) / (v1w * 2) + (v1->viewportY << 12));
 
 	if (poly->minY > v1y >> 12) {
 		poly->minY = v1y >> 12;