Scale quads after rendering to a screen texture instead of scaling directly. Fixes discontinuities in room editor and menu edges.

This commit is contained in:
elasota
2020-04-25 16:35:34 -04:00
parent ea217285c0
commit 5bb6b074f0
11 changed files with 358 additions and 154 deletions

View File

@@ -1,8 +1,8 @@
static unsigned char gs_shaderData[] = {
68, 88, 66, 67, 231, 194, 75, 38, 6, 25, 110, 45, 187, 225, 136,
211, 34, 239, 174, 118, 1, 0, 0, 0, 44, 6, 0, 0, 5, 0,
68, 88, 66, 67, 75, 29, 59, 91, 67, 226, 130, 211, 218, 1, 246,
35, 4, 77, 147, 90, 1, 0, 0, 0, 4, 3, 0, 0, 5, 0,
0, 0, 52, 0, 0, 0, 224, 0, 0, 0, 56, 1, 0, 0, 108,
1, 0, 0, 176, 5, 0, 0, 82, 68, 69, 70, 164, 0, 0, 0,
1, 0, 0, 136, 2, 0, 0, 82, 68, 69, 70, 164, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 28, 0, 0,
0, 0, 4, 255, 255, 0, 137, 0, 0, 122, 0, 0, 0, 92, 0,
0, 0, 2, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 255,
@@ -23,88 +23,34 @@ static unsigned char gs_shaderData[] = {
78, 44, 0, 0, 0, 1, 0, 0, 0, 8, 0, 0, 0, 32, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0,
0, 0, 0, 15, 0, 0, 0, 83, 86, 95, 84, 65, 82, 71, 69,
84, 0, 171, 171, 83, 72, 68, 82, 60, 4, 0, 0, 64, 0, 0,
0, 15, 1, 0, 0, 88, 24, 0, 4, 0, 112, 16, 0, 0, 0,
84, 0, 171, 171, 83, 72, 68, 82, 20, 1, 0, 0, 64, 0, 0,
0, 69, 0, 0, 0, 88, 24, 0, 4, 0, 112, 16, 0, 0, 0,
0, 0, 68, 68, 0, 0, 88, 16, 0, 4, 0, 112, 16, 0, 1,
0, 0, 0, 85, 85, 0, 0, 98, 16, 0, 3, 50, 16, 16, 0,
1, 0, 0, 0, 101, 0, 0, 3, 242, 32, 16, 0, 0, 0, 0,
0, 104, 0, 0, 2, 5, 0, 0, 0, 11, 0, 0, 5, 18, 0,
16, 0, 0, 0, 0, 0, 10, 16, 16, 0, 1, 0, 0, 0, 12,
0, 0, 5, 34, 0, 16, 0, 0, 0, 0, 0, 26, 16, 16, 0,
1, 0, 0, 0, 50, 0, 0, 13, 194, 0, 16, 0, 0, 0, 0,
0, 6, 4, 16, 128, 65, 0, 0, 0, 0, 0, 0, 0, 2, 64,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 0,
0, 0, 63, 6, 20, 16, 0, 1, 0, 0, 0, 52, 0, 0, 10,
194, 0, 16, 0, 0, 0, 0, 0, 166, 14, 16, 0, 0, 0, 0,
0, 104, 0, 0, 2, 1, 0, 0, 0, 65, 0, 0, 5, 50, 0,
16, 0, 0, 0, 0, 0, 70, 16, 16, 0, 1, 0, 0, 0, 27,
0, 0, 5, 50, 0, 16, 0, 0, 0, 0, 0, 70, 0, 16, 0,
0, 0, 0, 0, 54, 0, 0, 8, 194, 0, 16, 0, 0, 0, 0,
0, 2, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 51, 0, 0, 10, 50, 0, 16, 0, 1,
0, 0, 0, 70, 0, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0,
0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 7, 50, 0, 16, 0, 1, 0, 0, 0, 230, 10,
16, 0, 0, 0, 0, 0, 70, 0, 16, 0, 1, 0, 0, 0, 65,
0, 0, 5, 194, 0, 16, 0, 0, 0, 0, 0, 166, 14, 16, 0,
0, 0, 0, 0, 27, 0, 0, 5, 50, 0, 16, 0, 2, 0, 0,
0, 230, 10, 16, 0, 0, 0, 0, 0, 65, 0, 0, 5, 194, 0,
16, 0, 0, 0, 0, 0, 6, 4, 16, 0, 1, 0, 0, 0, 0,
0, 0, 8, 50, 0, 16, 0, 1, 0, 0, 0, 230, 10, 16, 128,
65, 0, 0, 0, 0, 0, 0, 0, 70, 0, 16, 0, 1, 0, 0,
0, 27, 0, 0, 5, 50, 0, 16, 0, 3, 0, 0, 0, 230, 10,
16, 0, 0, 0, 0, 0, 14, 32, 0, 7, 50, 0, 16, 0, 0,
0, 0, 0, 70, 0, 16, 0, 1, 0, 0, 0, 70, 0, 16, 0,
0, 0, 0, 0, 54, 0, 0, 5, 66, 0, 16, 0, 2, 0, 0,
0, 1, 64, 0, 0, 0, 0, 0, 0, 54, 0, 0, 5, 194, 0,
16, 0, 3, 0, 0, 0, 86, 9, 16, 0, 2, 0, 0, 0, 45,
0, 0, 7, 242, 0, 16, 0, 1, 0, 0, 0, 70, 15, 16, 0,
3, 0, 0, 0, 70, 126, 16, 0, 0, 0, 0, 0, 45, 0, 0,
7, 242, 0, 16, 0, 4, 0, 0, 0, 134, 15, 16, 0, 3, 0,
0, 0, 70, 126, 16, 0, 0, 0, 0, 0, 54, 0, 0, 5, 130,
0, 16, 0, 2, 0, 0, 0, 26, 0, 16, 0, 3, 0, 0, 0,
45, 0, 0, 7, 242, 0, 16, 0, 3, 0, 0, 0, 198, 10, 16,
0, 2, 0, 0, 0, 70, 126, 16, 0, 0, 0, 0, 0, 45, 0,
0, 7, 242, 0, 16, 0, 2, 0, 0, 0, 70, 10, 16, 0, 2,
0, 0, 0, 70, 126, 16, 0, 0, 0, 0, 0, 54, 0, 0, 8,
226, 0, 16, 0, 1, 0, 0, 0, 2, 64, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45, 0,
0, 7, 242, 0, 16, 0, 1, 0, 0, 0, 70, 14, 16, 0, 1,
0, 0, 0, 70, 126, 16, 0, 1, 0, 0, 0, 56, 0, 0, 7,
114, 0, 16, 0, 1, 0, 0, 0, 6, 0, 16, 0, 0, 0, 0,
0, 70, 2, 16, 0, 1, 0, 0, 0, 54, 0, 0, 8, 226, 0,
16, 0, 3, 0, 0, 0, 2, 64, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45, 0, 0, 7,
242, 0, 16, 0, 3, 0, 0, 0, 70, 14, 16, 0, 3, 0, 0,
0, 70, 126, 16, 0, 1, 0, 0, 0, 0, 0, 0, 11, 194, 0,
16, 0, 0, 0, 0, 0, 6, 4, 16, 128, 65, 0, 0, 0, 0,
0, 0, 0, 2, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 128, 63, 0, 0, 128, 63, 50, 0, 0, 9, 114, 0, 16,
0, 1, 0, 0, 0, 166, 10, 16, 0, 0, 0, 0, 0, 70, 2,
16, 0, 3, 0, 0, 0, 70, 2, 16, 0, 1, 0, 0, 0, 56,
0, 0, 7, 114, 0, 16, 0, 1, 0, 0, 0, 86, 5, 16, 0,
0, 0, 0, 0, 70, 2, 16, 0, 1, 0, 0, 0, 54, 0, 0,
8, 226, 0, 16, 0, 4, 0, 0, 0, 2, 64, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45,
0, 0, 7, 242, 0, 16, 0, 3, 0, 0, 0, 70, 14, 16, 0,
4, 0, 0, 0, 70, 126, 16, 0, 1, 0, 0, 0, 56, 0, 0,
7, 114, 0, 16, 0, 3, 0, 0, 0, 6, 0, 16, 0, 0, 0,
0, 0, 70, 2, 16, 0, 3, 0, 0, 0, 54, 0, 0, 8, 226,
0, 16, 0, 2, 0, 0, 0, 2, 64, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 45, 0, 0,
7, 242, 0, 16, 0, 2, 0, 0, 0, 70, 14, 16, 0, 2, 0,
0, 0, 70, 126, 16, 0, 1, 0, 0, 0, 50, 0, 0, 9, 114,
0, 16, 0, 0, 0, 0, 0, 166, 10, 16, 0, 0, 0, 0, 0,
70, 2, 16, 0, 2, 0, 0, 0, 70, 2, 16, 0, 3, 0, 0,
0, 50, 0, 0, 9, 114, 32, 16, 0, 0, 0, 0, 0, 246, 15,
16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 70,
2, 16, 0, 1, 0, 0, 0, 54, 0, 0, 5, 130, 32, 16, 0,
0, 0, 0, 0, 1, 64, 0, 0, 0, 0, 128, 63, 62, 0, 0,
1, 83, 84, 65, 84, 116, 0, 0, 0, 36, 0, 0, 0, 5, 0,
0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 17, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 45, 0, 0, 7, 242, 0, 16, 0, 0,
0, 0, 0, 70, 14, 16, 0, 0, 0, 0, 0, 70, 126, 16, 0,
0, 0, 0, 0, 54, 0, 0, 8, 226, 0, 16, 0, 0, 0, 0,
0, 2, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 45, 0, 0, 7, 242, 0, 16, 0, 0,
0, 0, 0, 70, 14, 16, 0, 0, 0, 0, 0, 70, 126, 16, 0,
1, 0, 0, 0, 54, 0, 0, 5, 114, 32, 16, 0, 0, 0, 0,
0, 70, 2, 16, 0, 0, 0, 0, 0, 54, 0, 0, 5, 130, 32,
16, 0, 0, 0, 0, 0, 1, 64, 0, 0, 0, 0, 128, 63, 62,
0, 0, 1, 83, 84, 65, 84, 116, 0, 0, 0, 9, 0, 0, 0,
1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0,
0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0,
0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
};
namespace GpBinarizedShaders