commit 0536b82
neauoire
·
2023-11-13 00:45:55 +0000 UTC
parent a4ff15e
(Screen) Cache row during sprite drawing
2 files changed,
+5,
-5
+4,
-4
1@@ -68,12 +68,12 @@ screen_2bpp(Uint8 *layer, Uint8 *ram, Uint16 addr, Uint16 x1, Uint16 y1, Uint16
2 Uint16 y, ymod = (fy < 0 ? 7 : 0), ymax = y1 + ymod + fy * 8;
3 Uint16 x, xmod = (fx > 0 ? 7 : 0), xmax = x1 + xmod - fx * 8;
4 for(y = y1 + ymod; y != ymax; y += fy) {
5- Uint16 c = *ch1++ | (*ch2++ << 8);
6+ int row = y * w, c = *ch1++ | (*ch2++ << 8);
7 if(y < h)
8 for(x = x1 + xmod; x != xmax; x -= fx, c >>= 1) {
9 Uint8 ch = (c & 1) | ((c >> 7) & 2);
10 if((opaque || ch) && x < w)
11- layer[x + y * w] = blending[ch][color];
12+ layer[x + row] = blending[ch][color];
13 }
14 }
15 }
16@@ -86,12 +86,12 @@ screen_1bpp(Uint8 *layer, Uint8 *ram, Uint16 addr, Uint16 x1, Uint16 y1, Uint16
17 Uint16 y, ymod = (fy < 0 ? 7 : 0), ymax = y1 + ymod + fy * 8;
18 Uint16 x, xmod = (fx > 0 ? 7 : 0), xmax = x1 + xmod - fx * 8;
19 for(y = y1 + ymod; y != ymax; y += fy) {
20- Uint16 c = *ch1++;
21+ int row = y * w, c = *ch1++;
22 if(y < h)
23 for(x = x1 + xmod; x != xmax; x -= fx, c >>= 1) {
24 Uint8 ch = c & 1;
25 if((opaque || ch) && x < w)
26- layer[x + y * w] = blending[ch][color];
27+ layer[x + row] = blending[ch][color];
28 }
29 }
30 }
+1,
-1
1@@ -258,7 +258,7 @@ main(int argc, char **argv)
2 return system_error("usage", "uxn11 [-v] file.rom [args...]");
3 /* Read flags */
4 if(argv[i][0] == '-' && argv[i][1] == 'v')
5- return system_version("Uxn11 - Graphical Varvara Emulator", "11 Nov 2023");
6+ return system_version("Uxn11 - Graphical Varvara Emulator", "12 Nov 2023");
7 if(!emu_init())
8 return system_error("Init", "Failed to initialize varvara.");
9 if(!system_init(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)), argv[i++]))