mvietri/union-minui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added 3x_scanline and 2x_grid

Browse source
This commit is contained in:
Shaun Inman 2023-02-16 23:25:32 -05:00
parent d4c8a0acfd
commit f68e21b83b
1 changed files with 53 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/minarch/main.c
View file

@ -1638,7 +1638,7 @@ static void scale1x_scanline(void* __restrict src, void* __restrict dst, uint32_
for (unsigned x = 0; x < w; x++) {
uint16_t s = *(src_row + x);
*(dst_row + x) = Weight3_2(s, k);
*(dst_row + x) = Weight3_1(s, k);
}
}
@ -1705,6 +1705,26 @@ static void scale2x_scanline(void* __restrict src, void* __restrict dst, uint32_
}
}
}
static void scale2x_grid(void* __restrict src, void* __restrict dst, uint32_t w, uint32_t h, uint32_t pitch, uint32_t dst_pitch) {
uint16_t k = 0x0000;
for (unsigned y = 0; y < h; y++) {
uint16_t* restrict src_row = (void*)src + y * pitch;
uint16_t* restrict dst_row = (void*)dst + y * dst_pitch * 2;
for (unsigned x = 0; x < w; x++) {
uint16_t c1 = *src_row;
uint16_t c2 = Weight3_1( c1, k);
*(dst_row ) = c2;
*(dst_row + 1 ) = c2;
*(dst_row + SCREEN_WIDTH ) = c2;
*(dst_row + SCREEN_WIDTH + 1) = c1;
src_row += 1;
dst_row += 2;
}
}
}
static void scale3x(void* __restrict src, void* __restrict dst, uint32_t w, uint32_t h, uint32_t pitch, uint32_t dst_pitch) {
int row3 = SCREEN_WIDTH * 2;
for (unsigned y = 0; y < h; y++) {
@ -1797,6 +1817,35 @@ static void scale3x_dmg(void* __restrict src, void* __restrict dst, uint32_t w,
}
}
static void scale3x_scanline(void* __restrict src, void* __restrict dst, uint32_t w, uint32_t h, uint32_t pitch, uint32_t dst_pitch) {
uint16_t k = 0x0000;
for (unsigned y = 0; y < h; y++) {
uint16_t* restrict src_row = (void*)src + y * pitch;
uint16_t* restrict dst_row = (void*)dst + y * dst_pitch * 3;
for (unsigned x = 0; x < w; x++) {
uint16_t c1 = *src_row;
uint16_t c2 = Weight3_2( c1, k);
// row 1
*(dst_row ) = c2;
*(dst_row + 1) = c2;
*(dst_row + 2) = c2;
// row 2
*(dst_row + SCREEN_WIDTH * 1 ) = c1;
*(dst_row + SCREEN_WIDTH * 1 + 1) = c1;
*(dst_row + SCREEN_WIDTH * 1 + 2) = c1;
// row 3
*(dst_row + SCREEN_WIDTH * 2 ) = c1;
*(dst_row + SCREEN_WIDTH * 2 + 1) = c1;
*(dst_row + SCREEN_WIDTH * 2 + 2) = c1;
src_row += 1;
dst_row += 3;
}
}
}
static void scale3x_grid(void* __restrict src, void* __restrict dst, uint32_t w, uint32_t h, uint32_t pitch, uint32_t dst_pitch) {
uint16_t k = 0x0000;
for (unsigned y = 0; y < h; y++) {
uint16_t* restrict src_row = (void*)src + y * pitch;
@ -1810,7 +1859,7 @@ static void scale3x_scanline(void* __restrict src, void* __restrict dst, uint32_
*(dst_row ) = c2;
*(dst_row + 1) = c1;
*(dst_row + 2) = c1;
// row 2
*(dst_row + SCREEN_WIDTH * 1 ) = c2;
*(dst_row + SCREEN_WIDTH * 1 + 1) = c1;
@ -1904,6 +1953,7 @@ static void scale4x_scanline(void* __restrict src, void* __restrict dst, uint32_
}
}
}
// TODO: NN versions of scanline need updating to use blended scanlines (or maybe not for performance?)
static void scaleNN(void* __restrict src, void* __restrict dst, uint32_t w, uint32_t h, uint32_t pitch, uint32_t dst_pitch) {
int dy = -renderer.dst_h;
unsigned lines = h;
@ -2217,7 +2267,7 @@ static void selectScaler_PAR(int width, int height, int pitch) {
if (show_scanlines) {
switch (scale) {
case 4: renderer.scaler = scale4x_scanline; break;
case 3: renderer.scaler = scale3x_scanline; break;
case 3: renderer.scaler = scale3x_grid; break;
case 2: renderer.scaler = scale2x_scanline; break;
default: renderer.scaler = scale1x_scanline; break;
}