diff --git a/AerofoilSDL/ShaderCode/Functions.h b/AerofoilSDL/ShaderCode/Functions.h index 372f77d..bb05cad 100644 --- a/AerofoilSDL/ShaderCode/Functions.h +++ b/AerofoilSDL/ShaderCode/Functions.h @@ -58,7 +58,7 @@ "vec4 ApplyDesaturation(float desaturation, vec4 color)\n"\ "{\n"\ " // This is intentionally done in gamma space\n"\ -" if (desaturation == 0.0)\n"\ +" if (desaturation == 0.0 || (color.r == 1.0 && color.g == 1.0 && color.b == 0.0))\n"\ " return color;\n"\ "\n"\ " float grayLevel = dot(color.rgb, vec3(3.0, 6.0, 1.0) / 10.0);\n"\ diff --git a/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadPaletteP_D3D11.cpp b/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadPaletteP_D3D11.cpp index e612160..e1e3dd9 100644 --- a/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadPaletteP_D3D11.cpp +++ b/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadPaletteP_D3D11.cpp @@ -1,8 +1,8 @@ static unsigned char gs_shaderData[] = { - 68, 88, 66, 67, 200, 182, 33, 104, 202, 4, 76, 179, 221, 223, 225, - 247, 101, 77, 248, 3, 1, 0, 0, 0, 12, 8, 0, 0, 5, 0, + 68, 88, 66, 67, 183, 33, 168, 132, 150, 47, 5, 18, 245, 254, 40, + 246, 168, 148, 158, 158, 1, 0, 0, 0, 176, 8, 0, 0, 5, 0, 0, 0, 52, 0, 0, 0, 172, 2, 0, 0, 4, 3, 0, 0, 56, - 3, 0, 0, 144, 7, 0, 0, 82, 68, 69, 70, 112, 2, 0, 0, + 3, 0, 0, 52, 8, 0, 0, 82, 68, 69, 70, 112, 2, 0, 0, 1, 0, 0, 0, 180, 0, 0, 0, 3, 0, 0, 0, 28, 0, 0, 0, 0, 4, 255, 255, 0, 137, 0, 0, 72, 2, 0, 0, 124, 0, 0, 0, 2, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 255, @@ -54,7 +54,7 @@ static unsigned char gs_shaderData[] = { 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, 80, 4, 0, 0, 64, 0, 0, 0, 20, 1, 0, 0, + 72, 68, 82, 244, 4, 0, 0, 64, 0, 0, 0, 61, 1, 0, 0, 89, 0, 0, 4, 70, 142, 32, 0, 0, 0, 0, 0, 3, 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, @@ -93,50 +93,61 @@ static unsigned char gs_shaderData[] = { 64, 0, 0, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 63, 29, 0, 0, 7, 18, 0, 16, 0, 1, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, 0, 58, 0, 16, 0, 0, 0, - 0, 0, 13, 0, 4, 3, 10, 0, 16, 0, 1, 0, 0, 0, 57, + 0, 0, 13, 0, 4, 3, 10, 0, 16, 0, 1, 0, 0, 0, 24, 0, 0, 8, 18, 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, - 0, 16, 0, 0, 10, 34, 0, 16, 0, 1, 0, 0, 0, 70, 2, - 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 154, 153, 153, 62, 154, - 153, 25, 63, 205, 204, 204, 61, 0, 0, 0, 0, 0, 0, 0, 9, - 66, 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 128, 65, 0, 0, - 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 64, 0, 0, 0, 0, - 128, 63, 56, 0, 0, 8, 34, 0, 16, 0, 1, 0, 0, 0, 26, - 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 50, 0, 0, 9, 226, 0, 16, 0, 1, 0, 0, - 0, 6, 9, 16, 0, 0, 0, 0, 0, 166, 10, 16, 0, 1, 0, - 0, 0, 86, 5, 16, 0, 1, 0, 0, 0, 55, 0, 0, 9, 114, - 0, 16, 0, 0, 0, 0, 0, 6, 0, 16, 0, 1, 0, 0, 0, - 150, 7, 16, 0, 1, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, - 0, 29, 0, 0, 10, 114, 0, 16, 0, 1, 0, 0, 0, 2, 64, - 0, 0, 230, 174, 37, 61, 230, 174, 37, 61, 230, 174, 37, 61, 0, - 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 56, 0, 0, 10, - 114, 0, 16, 0, 2, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, - 0, 2, 64, 0, 0, 145, 131, 158, 61, 145, 131, 158, 61, 145, 131, - 158, 61, 0, 0, 0, 0, 0, 0, 0, 10, 114, 0, 16, 0, 0, - 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, - 174, 71, 97, 61, 174, 71, 97, 61, 174, 71, 97, 61, 0, 0, 0, - 0, 56, 0, 0, 10, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, - 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 110, 167, 114, 63, 110, - 167, 114, 63, 110, 167, 114, 63, 0, 0, 0, 0, 47, 0, 0, 5, - 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, - 0, 56, 0, 0, 10, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, - 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 154, 153, 25, 64, 154, - 153, 25, 64, 154, 153, 25, 64, 0, 0, 0, 0, 25, 0, 0, 5, - 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, - 0, 55, 0, 0, 9, 114, 32, 16, 0, 0, 0, 0, 0, 70, 2, - 16, 0, 1, 0, 0, 0, 70, 2, 16, 0, 2, 0, 0, 0, 70, - 2, 16, 0, 0, 0, 0, 0, 54, 0, 0, 5, 130, 32, 16, 0, - 0, 0, 0, 0, 58, 0, 16, 0, 0, 0, 0, 0, 62, 0, 0, - 1, 83, 84, 65, 84, 116, 0, 0, 0, 33, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 15, 0, 0, 0, 4, - 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 24, 0, 0, 10, 226, 0, 16, 0, 1, 0, 0, 0, 6, 9, + 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 0, 0, 0, 0, 0, + 0, 128, 63, 0, 0, 128, 63, 0, 0, 0, 0, 1, 0, 0, 7, + 34, 0, 16, 0, 1, 0, 0, 0, 42, 0, 16, 0, 1, 0, 0, + 0, 26, 0, 16, 0, 1, 0, 0, 0, 1, 0, 0, 7, 34, 0, + 16, 0, 1, 0, 0, 0, 58, 0, 16, 0, 1, 0, 0, 0, 26, + 0, 16, 0, 1, 0, 0, 0, 60, 0, 0, 7, 18, 0, 16, 0, + 1, 0, 0, 0, 26, 0, 16, 0, 1, 0, 0, 0, 10, 0, 16, + 0, 1, 0, 0, 0, 16, 0, 0, 10, 34, 0, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 154, + 153, 153, 62, 154, 153, 25, 63, 205, 204, 204, 61, 0, 0, 0, 0, + 0, 0, 0, 9, 66, 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, + 128, 65, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 128, 63, 56, 0, 0, 8, 34, 0, 16, 0, 1, + 0, 0, 0, 26, 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 0, + 0, 0, 0, 0, 2, 0, 0, 0, 50, 0, 0, 9, 226, 0, 16, + 0, 1, 0, 0, 0, 6, 9, 16, 0, 0, 0, 0, 0, 166, 10, + 16, 0, 1, 0, 0, 0, 86, 5, 16, 0, 1, 0, 0, 0, 55, + 0, 0, 9, 114, 0, 16, 0, 0, 0, 0, 0, 6, 0, 16, 0, + 1, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 150, 7, 16, + 0, 1, 0, 0, 0, 29, 0, 0, 10, 114, 0, 16, 0, 1, 0, + 0, 0, 2, 64, 0, 0, 230, 174, 37, 61, 230, 174, 37, 61, 230, + 174, 37, 61, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, + 56, 0, 0, 10, 114, 0, 16, 0, 2, 0, 0, 0, 70, 2, 16, + 0, 0, 0, 0, 0, 2, 64, 0, 0, 145, 131, 158, 61, 145, 131, + 158, 61, 145, 131, 158, 61, 0, 0, 0, 0, 52, 0, 0, 10, 114, + 0, 16, 0, 0, 0, 0, 0, 70, 2, 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, 0, 0, 0, 10, 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 174, + 71, 97, 61, 174, 71, 97, 61, 174, 71, 97, 61, 0, 0, 0, 0, + 56, 0, 0, 10, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, + 0, 0, 0, 0, 0, 2, 64, 0, 0, 110, 167, 114, 63, 110, 167, + 114, 63, 110, 167, 114, 63, 0, 0, 0, 0, 47, 0, 0, 5, 114, + 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, + 56, 0, 0, 10, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, + 0, 0, 0, 0, 0, 2, 64, 0, 0, 154, 153, 25, 64, 154, 153, + 25, 64, 154, 153, 25, 64, 0, 0, 0, 0, 25, 0, 0, 5, 114, + 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, + 55, 0, 0, 9, 114, 32, 16, 0, 0, 0, 0, 0, 70, 2, 16, + 0, 1, 0, 0, 0, 70, 2, 16, 0, 2, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, 54, 0, 0, 5, 130, 32, 16, 0, 0, + 0, 0, 0, 58, 0, 16, 0, 0, 0, 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 116, 0, 0, 0, 38, 0, 0, 0, 3, 0, 0, + 0, 0, 0, 0, 0, 2, 0, 0, 0, 17, 0, 0, 0, 4, 0, + 0, 0, 4, 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, 0, 0, 0, 2, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 4, - 0, 0, 0, 2, 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, 4, 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 diff --git a/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadPaletteP_ICC_D3D11.cpp b/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadPaletteP_ICC_D3D11.cpp index 668b1a9..6502bf5 100644 --- a/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadPaletteP_ICC_D3D11.cpp +++ b/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadPaletteP_ICC_D3D11.cpp @@ -1,8 +1,8 @@ static unsigned char gs_shaderData[] = { - 68, 88, 66, 67, 124, 220, 109, 55, 227, 43, 211, 66, 26, 106, 247, - 85, 84, 5, 208, 10, 1, 0, 0, 0, 208, 7, 0, 0, 5, 0, + 68, 88, 66, 67, 91, 245, 0, 26, 141, 247, 8, 90, 250, 198, 29, + 196, 50, 53, 108, 15, 1, 0, 0, 0, 76, 8, 0, 0, 5, 0, 0, 0, 52, 0, 0, 0, 172, 2, 0, 0, 4, 3, 0, 0, 56, - 3, 0, 0, 84, 7, 0, 0, 82, 68, 69, 70, 112, 2, 0, 0, + 3, 0, 0, 208, 7, 0, 0, 82, 68, 69, 70, 112, 2, 0, 0, 1, 0, 0, 0, 180, 0, 0, 0, 3, 0, 0, 0, 28, 0, 0, 0, 0, 4, 255, 255, 0, 137, 0, 0, 72, 2, 0, 0, 124, 0, 0, 0, 2, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0, 255, @@ -54,7 +54,7 @@ static unsigned char gs_shaderData[] = { 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, 20, 4, 0, 0, 64, 0, 0, 0, 5, 1, 0, 0, + 72, 68, 82, 144, 4, 0, 0, 64, 0, 0, 0, 36, 1, 0, 0, 89, 0, 0, 4, 70, 142, 32, 0, 0, 0, 0, 0, 3, 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, @@ -93,46 +93,54 @@ static unsigned char gs_shaderData[] = { 64, 0, 0, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 63, 29, 0, 0, 7, 18, 0, 16, 0, 1, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, 0, 58, 0, 16, 0, 0, 0, - 0, 0, 13, 0, 4, 3, 10, 0, 16, 0, 1, 0, 0, 0, 57, + 0, 0, 13, 0, 4, 3, 10, 0, 16, 0, 1, 0, 0, 0, 24, 0, 0, 8, 18, 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, - 0, 16, 0, 0, 10, 34, 0, 16, 0, 1, 0, 0, 0, 70, 2, - 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 154, 153, 153, 62, 154, - 153, 25, 63, 205, 204, 204, 61, 0, 0, 0, 0, 0, 0, 0, 9, - 66, 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 128, 65, 0, 0, - 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 64, 0, 0, 0, 0, - 128, 63, 56, 0, 0, 8, 34, 0, 16, 0, 1, 0, 0, 0, 26, - 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 50, 0, 0, 9, 226, 0, 16, 0, 1, 0, 0, - 0, 6, 9, 16, 0, 0, 0, 0, 0, 166, 10, 16, 0, 1, 0, - 0, 0, 86, 5, 16, 0, 1, 0, 0, 0, 55, 32, 0, 9, 114, - 0, 16, 0, 0, 0, 0, 0, 6, 0, 16, 0, 1, 0, 0, 0, - 150, 7, 16, 0, 1, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, - 0, 47, 0, 0, 5, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, - 16, 0, 0, 0, 0, 0, 56, 0, 0, 10, 114, 0, 16, 0, 0, - 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, - 102, 102, 230, 63, 102, 102, 230, 63, 102, 102, 230, 63, 0, 0, 0, - 0, 25, 0, 0, 5, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, - 16, 0, 0, 0, 0, 0, 56, 0, 0, 10, 114, 0, 16, 0, 1, - 0, 0, 0, 86, 5, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, - 150, 246, 160, 189, 43, 199, 117, 63, 40, 177, 243, 60, 0, 0, 0, - 0, 50, 0, 0, 12, 114, 0, 16, 0, 1, 0, 0, 0, 6, 0, - 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 87, 203, 136, 63, 86, - 131, 197, 60, 225, 104, 227, 58, 0, 0, 0, 0, 70, 2, 16, 0, - 1, 0, 0, 0, 50, 32, 0, 12, 114, 32, 16, 0, 0, 0, 0, - 0, 166, 10, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 5, 9, - 34, 60, 158, 151, 129, 60, 194, 240, 119, 63, 0, 0, 0, 0, 70, - 2, 16, 0, 1, 0, 0, 0, 54, 0, 0, 5, 130, 32, 16, 0, - 0, 0, 0, 0, 58, 0, 16, 0, 0, 0, 0, 0, 62, 0, 0, - 1, 83, 84, 65, 84, 116, 0, 0, 0, 31, 0, 0, 0, 2, 0, - 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 14, 0, 0, 0, 4, - 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 24, 0, 0, 10, 226, 0, 16, 0, 1, 0, 0, 0, 6, 9, + 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 0, 0, 0, 0, 0, + 0, 128, 63, 0, 0, 128, 63, 0, 0, 0, 0, 1, 0, 0, 7, + 34, 0, 16, 0, 1, 0, 0, 0, 42, 0, 16, 0, 1, 0, 0, + 0, 26, 0, 16, 0, 1, 0, 0, 0, 1, 0, 0, 7, 34, 0, + 16, 0, 1, 0, 0, 0, 58, 0, 16, 0, 1, 0, 0, 0, 26, + 0, 16, 0, 1, 0, 0, 0, 60, 0, 0, 7, 18, 0, 16, 0, + 1, 0, 0, 0, 26, 0, 16, 0, 1, 0, 0, 0, 10, 0, 16, + 0, 1, 0, 0, 0, 16, 0, 0, 10, 34, 0, 16, 0, 1, 0, + 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 154, + 153, 153, 62, 154, 153, 25, 63, 205, 204, 204, 61, 0, 0, 0, 0, + 0, 0, 0, 9, 66, 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, + 128, 65, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 128, 63, 56, 0, 0, 8, 34, 0, 16, 0, 1, + 0, 0, 0, 26, 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 0, + 0, 0, 0, 0, 2, 0, 0, 0, 50, 0, 0, 9, 226, 0, 16, + 0, 1, 0, 0, 0, 6, 9, 16, 0, 0, 0, 0, 0, 166, 10, + 16, 0, 1, 0, 0, 0, 86, 5, 16, 0, 1, 0, 0, 0, 55, + 32, 0, 9, 114, 0, 16, 0, 0, 0, 0, 0, 6, 0, 16, 0, + 1, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 150, 7, 16, + 0, 1, 0, 0, 0, 47, 0, 0, 5, 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 56, 0, 0, 10, 114, + 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 102, 102, 230, 63, 102, 102, 230, 63, 102, 102, 230, + 63, 0, 0, 0, 0, 25, 0, 0, 5, 114, 0, 16, 0, 0, 0, + 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 56, 0, 0, 10, 114, + 0, 16, 0, 1, 0, 0, 0, 86, 5, 16, 0, 0, 0, 0, 0, + 2, 64, 0, 0, 150, 246, 160, 189, 43, 199, 117, 63, 40, 177, 243, + 60, 0, 0, 0, 0, 50, 0, 0, 12, 114, 0, 16, 0, 1, 0, + 0, 0, 6, 0, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 87, + 203, 136, 63, 86, 131, 197, 60, 225, 104, 227, 58, 0, 0, 0, 0, + 70, 2, 16, 0, 1, 0, 0, 0, 50, 32, 0, 12, 114, 32, 16, + 0, 0, 0, 0, 0, 166, 10, 16, 0, 0, 0, 0, 0, 2, 64, + 0, 0, 5, 9, 34, 60, 158, 151, 129, 60, 194, 240, 119, 63, 0, + 0, 0, 0, 70, 2, 16, 0, 1, 0, 0, 0, 54, 0, 0, 5, + 130, 32, 16, 0, 0, 0, 0, 0, 58, 0, 16, 0, 0, 0, 0, + 0, 62, 0, 0, 1, 83, 84, 65, 84, 116, 0, 0, 0, 35, 0, + 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 15, + 0, 0, 0, 4, 0, 0, 0, 4, 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, 2, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 3, - 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, 2, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, + 0, 0, 0, 3, 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 diff --git a/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadRGBP_D3D11.cpp b/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadRGBP_D3D11.cpp index 887a0bb..befddf0 100644 --- a/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadRGBP_D3D11.cpp +++ b/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadRGBP_D3D11.cpp @@ -1,8 +1,8 @@ static unsigned char gs_shaderData[] = { - 68, 88, 66, 67, 70, 73, 170, 202, 197, 249, 120, 87, 61, 204, 7, - 189, 64, 34, 147, 57, 1, 0, 0, 0, 144, 7, 0, 0, 5, 0, + 68, 88, 66, 67, 134, 184, 60, 11, 56, 236, 116, 213, 80, 103, 169, + 81, 62, 1, 57, 206, 1, 0, 0, 0, 52, 8, 0, 0, 5, 0, 0, 0, 52, 0, 0, 0, 124, 2, 0, 0, 212, 2, 0, 0, 8, - 3, 0, 0, 20, 7, 0, 0, 82, 68, 69, 70, 64, 2, 0, 0, + 3, 0, 0, 184, 7, 0, 0, 82, 68, 69, 70, 64, 2, 0, 0, 1, 0, 0, 0, 132, 0, 0, 0, 2, 0, 0, 0, 28, 0, 0, 0, 0, 4, 255, 255, 0, 137, 0, 0, 24, 2, 0, 0, 92, 0, 0, 0, 2, 0, 0, 0, 5, 0, 0, 0, 4, 0, 0, 0, 255, @@ -51,7 +51,7 @@ static unsigned char gs_shaderData[] = { 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, - 4, 4, 0, 0, 64, 0, 0, 0, 1, 1, 0, 0, 89, 0, 0, + 168, 4, 0, 0, 64, 0, 0, 0, 42, 1, 0, 0, 89, 0, 0, 4, 70, 142, 32, 0, 0, 0, 0, 0, 3, 0, 0, 0, 88, 24, 0, 4, 0, 112, 16, 0, 0, 0, 0, 0, 85, 85, 0, 0, 98, 16, 0, 3, 50, 16, 16, 0, 1, 0, 0, 0, 101, 0, 0, 3, @@ -85,50 +85,60 @@ static unsigned char gs_shaderData[] = { 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 63, 29, 0, 0, 7, 18, 0, 16, 0, 1, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, 0, 58, 0, 16, 0, 0, 0, 0, 0, 13, 0, - 4, 3, 10, 0, 16, 0, 1, 0, 0, 0, 57, 0, 0, 8, 18, + 4, 3, 10, 0, 16, 0, 1, 0, 0, 0, 24, 0, 0, 8, 18, 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, 0, 16, 0, 0, - 10, 34, 0, 16, 0, 1, 0, 0, 0, 70, 2, 16, 0, 0, 0, - 0, 0, 2, 64, 0, 0, 154, 153, 153, 62, 154, 153, 25, 63, 205, - 204, 204, 61, 0, 0, 0, 0, 0, 0, 0, 9, 66, 0, 16, 0, - 1, 0, 0, 0, 10, 128, 32, 128, 65, 0, 0, 0, 0, 0, 0, - 0, 2, 0, 0, 0, 1, 64, 0, 0, 0, 0, 128, 63, 56, 0, - 0, 8, 34, 0, 16, 0, 1, 0, 0, 0, 26, 0, 16, 0, 1, - 0, 0, 0, 10, 128, 32, 0, 0, 0, 0, 0, 2, 0, 0, 0, - 50, 0, 0, 9, 226, 0, 16, 0, 1, 0, 0, 0, 6, 9, 16, - 0, 0, 0, 0, 0, 166, 10, 16, 0, 1, 0, 0, 0, 86, 5, - 16, 0, 1, 0, 0, 0, 55, 0, 0, 9, 114, 0, 16, 0, 0, - 0, 0, 0, 6, 0, 16, 0, 1, 0, 0, 0, 150, 7, 16, 0, - 1, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 29, 0, 0, - 10, 114, 0, 16, 0, 1, 0, 0, 0, 2, 64, 0, 0, 230, 174, - 37, 61, 230, 174, 37, 61, 230, 174, 37, 61, 0, 0, 0, 0, 70, - 2, 16, 0, 0, 0, 0, 0, 56, 0, 0, 10, 114, 0, 16, 0, - 2, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 2, 64, 0, - 0, 145, 131, 158, 61, 145, 131, 158, 61, 145, 131, 158, 61, 0, 0, - 0, 0, 0, 0, 0, 10, 114, 0, 16, 0, 0, 0, 0, 0, 70, - 2, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 174, 71, 97, 61, - 174, 71, 97, 61, 174, 71, 97, 61, 0, 0, 0, 0, 56, 0, 0, - 10, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, - 0, 0, 2, 64, 0, 0, 110, 167, 114, 63, 110, 167, 114, 63, 110, - 167, 114, 63, 0, 0, 0, 0, 47, 0, 0, 5, 114, 0, 16, 0, - 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 56, 0, 0, - 10, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, - 0, 0, 2, 64, 0, 0, 154, 153, 25, 64, 154, 153, 25, 64, 154, - 153, 25, 64, 0, 0, 0, 0, 25, 0, 0, 5, 114, 0, 16, 0, - 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 55, 0, 0, - 9, 114, 32, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 1, 0, - 0, 0, 70, 2, 16, 0, 2, 0, 0, 0, 70, 2, 16, 0, 0, - 0, 0, 0, 54, 0, 0, 5, 130, 32, 16, 0, 0, 0, 0, 0, - 58, 0, 16, 0, 0, 0, 0, 0, 62, 0, 0, 1, 83, 84, 65, - 84, 116, 0, 0, 0, 31, 0, 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 0, 15, 0, 0, 0, 4, 0, 0, 0, 1, - 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, 0, 24, 0, 0, + 10, 226, 0, 16, 0, 1, 0, 0, 0, 6, 9, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, 0, 0, 0, 0, 0, 0, 128, 63, 0, + 0, 128, 63, 0, 0, 0, 0, 1, 0, 0, 7, 34, 0, 16, 0, + 1, 0, 0, 0, 42, 0, 16, 0, 1, 0, 0, 0, 26, 0, 16, + 0, 1, 0, 0, 0, 1, 0, 0, 7, 34, 0, 16, 0, 1, 0, + 0, 0, 58, 0, 16, 0, 1, 0, 0, 0, 26, 0, 16, 0, 1, + 0, 0, 0, 60, 0, 0, 7, 18, 0, 16, 0, 1, 0, 0, 0, + 26, 0, 16, 0, 1, 0, 0, 0, 10, 0, 16, 0, 1, 0, 0, + 0, 16, 0, 0, 10, 34, 0, 16, 0, 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 154, 153, 153, 62, 154, + 153, 25, 63, 205, 204, 204, 61, 0, 0, 0, 0, 0, 0, 0, 9, + 66, 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 128, 65, 0, 0, + 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 64, 0, 0, 0, 0, + 128, 63, 56, 0, 0, 8, 34, 0, 16, 0, 1, 0, 0, 0, 26, + 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 50, 0, 0, 9, 226, 0, 16, 0, 1, 0, 0, + 0, 6, 9, 16, 0, 0, 0, 0, 0, 166, 10, 16, 0, 1, 0, + 0, 0, 86, 5, 16, 0, 1, 0, 0, 0, 55, 0, 0, 9, 114, + 0, 16, 0, 0, 0, 0, 0, 6, 0, 16, 0, 1, 0, 0, 0, + 70, 2, 16, 0, 0, 0, 0, 0, 150, 7, 16, 0, 1, 0, 0, + 0, 29, 0, 0, 10, 114, 0, 16, 0, 1, 0, 0, 0, 2, 64, + 0, 0, 230, 174, 37, 61, 230, 174, 37, 61, 230, 174, 37, 61, 0, + 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 56, 0, 0, 10, + 114, 0, 16, 0, 2, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, + 0, 2, 64, 0, 0, 145, 131, 158, 61, 145, 131, 158, 61, 145, 131, + 158, 61, 0, 0, 0, 0, 52, 0, 0, 10, 114, 0, 16, 0, 0, + 0, 0, 0, 70, 2, 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, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 4, 0, 0, 0, 2, + 0, 0, 0, 0, 10, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 174, 71, 97, 61, 174, + 71, 97, 61, 174, 71, 97, 61, 0, 0, 0, 0, 56, 0, 0, 10, + 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, + 0, 2, 64, 0, 0, 110, 167, 114, 63, 110, 167, 114, 63, 110, 167, + 114, 63, 0, 0, 0, 0, 47, 0, 0, 5, 114, 0, 16, 0, 0, + 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 56, 0, 0, 10, + 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, + 0, 2, 64, 0, 0, 154, 153, 25, 64, 154, 153, 25, 64, 154, 153, + 25, 64, 0, 0, 0, 0, 25, 0, 0, 5, 114, 0, 16, 0, 0, + 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 55, 0, 0, 9, + 114, 32, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 1, 0, 0, + 0, 70, 2, 16, 0, 2, 0, 0, 0, 70, 2, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 5, 130, 32, 16, 0, 0, 0, 0, 0, 58, + 0, 16, 0, 0, 0, 0, 0, 62, 0, 0, 1, 83, 84, 65, 84, + 116, 0, 0, 0, 36, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, + 0, 2, 0, 0, 0, 17, 0, 0, 0, 4, 0, 0, 0, 4, 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, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 3, 0, 0, 0, 4, 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, }; namespace GpBinarizedShaders diff --git a/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadRGBP_ICC_D3D11.cpp b/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadRGBP_ICC_D3D11.cpp index 7c4c9b8..a96dd63 100644 --- a/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadRGBP_ICC_D3D11.cpp +++ b/GpDisplayDriver_D3D11/CompiledShaders/DrawQuadRGBP_ICC_D3D11.cpp @@ -1,8 +1,8 @@ static unsigned char gs_shaderData[] = { - 68, 88, 66, 67, 108, 52, 221, 105, 109, 174, 81, 46, 155, 29, 71, - 86, 93, 178, 121, 166, 1, 0, 0, 0, 84, 7, 0, 0, 5, 0, + 68, 88, 66, 67, 57, 37, 253, 18, 22, 100, 108, 128, 58, 208, 65, + 95, 40, 243, 207, 218, 1, 0, 0, 0, 208, 7, 0, 0, 5, 0, 0, 0, 52, 0, 0, 0, 124, 2, 0, 0, 212, 2, 0, 0, 8, - 3, 0, 0, 216, 6, 0, 0, 82, 68, 69, 70, 64, 2, 0, 0, + 3, 0, 0, 84, 7, 0, 0, 82, 68, 69, 70, 64, 2, 0, 0, 1, 0, 0, 0, 132, 0, 0, 0, 2, 0, 0, 0, 28, 0, 0, 0, 0, 4, 255, 255, 0, 137, 0, 0, 24, 2, 0, 0, 92, 0, 0, 0, 2, 0, 0, 0, 5, 0, 0, 0, 4, 0, 0, 0, 255, @@ -51,7 +51,7 @@ static unsigned char gs_shaderData[] = { 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, - 200, 3, 0, 0, 64, 0, 0, 0, 242, 0, 0, 0, 89, 0, 0, + 68, 4, 0, 0, 64, 0, 0, 0, 17, 1, 0, 0, 89, 0, 0, 4, 70, 142, 32, 0, 0, 0, 0, 0, 3, 0, 0, 0, 88, 24, 0, 4, 0, 112, 16, 0, 0, 0, 0, 0, 85, 85, 0, 0, 98, 16, 0, 3, 50, 16, 16, 0, 1, 0, 0, 0, 101, 0, 0, 3, @@ -85,46 +85,54 @@ static unsigned char gs_shaderData[] = { 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 63, 29, 0, 0, 7, 18, 0, 16, 0, 1, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, 0, 58, 0, 16, 0, 0, 0, 0, 0, 13, 0, - 4, 3, 10, 0, 16, 0, 1, 0, 0, 0, 57, 0, 0, 8, 18, + 4, 3, 10, 0, 16, 0, 1, 0, 0, 0, 24, 0, 0, 8, 18, 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, 0, 16, 0, 0, - 10, 34, 0, 16, 0, 1, 0, 0, 0, 70, 2, 16, 0, 0, 0, - 0, 0, 2, 64, 0, 0, 154, 153, 153, 62, 154, 153, 25, 63, 205, - 204, 204, 61, 0, 0, 0, 0, 0, 0, 0, 9, 66, 0, 16, 0, - 1, 0, 0, 0, 10, 128, 32, 128, 65, 0, 0, 0, 0, 0, 0, - 0, 2, 0, 0, 0, 1, 64, 0, 0, 0, 0, 128, 63, 56, 0, - 0, 8, 34, 0, 16, 0, 1, 0, 0, 0, 26, 0, 16, 0, 1, - 0, 0, 0, 10, 128, 32, 0, 0, 0, 0, 0, 2, 0, 0, 0, - 50, 0, 0, 9, 226, 0, 16, 0, 1, 0, 0, 0, 6, 9, 16, - 0, 0, 0, 0, 0, 166, 10, 16, 0, 1, 0, 0, 0, 86, 5, - 16, 0, 1, 0, 0, 0, 55, 32, 0, 9, 114, 0, 16, 0, 0, - 0, 0, 0, 6, 0, 16, 0, 1, 0, 0, 0, 150, 7, 16, 0, - 1, 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 47, 0, 0, - 5, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, - 0, 0, 56, 0, 0, 10, 114, 0, 16, 0, 0, 0, 0, 0, 70, - 2, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 102, 102, 230, 63, - 102, 102, 230, 63, 102, 102, 230, 63, 0, 0, 0, 0, 25, 0, 0, - 5, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, 16, 0, 0, 0, - 0, 0, 56, 0, 0, 10, 114, 0, 16, 0, 1, 0, 0, 0, 86, - 5, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 150, 246, 160, 189, - 43, 199, 117, 63, 40, 177, 243, 60, 0, 0, 0, 0, 50, 0, 0, - 12, 114, 0, 16, 0, 1, 0, 0, 0, 6, 0, 16, 0, 0, 0, - 0, 0, 2, 64, 0, 0, 87, 203, 136, 63, 86, 131, 197, 60, 225, - 104, 227, 58, 0, 0, 0, 0, 70, 2, 16, 0, 1, 0, 0, 0, - 50, 32, 0, 12, 114, 32, 16, 0, 0, 0, 0, 0, 166, 10, 16, - 0, 0, 0, 0, 0, 2, 64, 0, 0, 5, 9, 34, 60, 158, 151, - 129, 60, 194, 240, 119, 63, 0, 0, 0, 0, 70, 2, 16, 0, 1, - 0, 0, 0, 54, 0, 0, 5, 130, 32, 16, 0, 0, 0, 0, 0, - 58, 0, 16, 0, 0, 0, 0, 0, 62, 0, 0, 1, 83, 84, 65, - 84, 116, 0, 0, 0, 29, 0, 0, 0, 2, 0, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 0, 14, 0, 0, 0, 4, 0, 0, 0, 1, - 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 1, 64, 0, 0, 0, 0, 0, 0, 24, 0, 0, + 10, 226, 0, 16, 0, 1, 0, 0, 0, 6, 9, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, 0, 0, 0, 0, 0, 0, 128, 63, 0, + 0, 128, 63, 0, 0, 0, 0, 1, 0, 0, 7, 34, 0, 16, 0, + 1, 0, 0, 0, 42, 0, 16, 0, 1, 0, 0, 0, 26, 0, 16, + 0, 1, 0, 0, 0, 1, 0, 0, 7, 34, 0, 16, 0, 1, 0, + 0, 0, 58, 0, 16, 0, 1, 0, 0, 0, 26, 0, 16, 0, 1, + 0, 0, 0, 60, 0, 0, 7, 18, 0, 16, 0, 1, 0, 0, 0, + 26, 0, 16, 0, 1, 0, 0, 0, 10, 0, 16, 0, 1, 0, 0, + 0, 16, 0, 0, 10, 34, 0, 16, 0, 1, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 154, 153, 153, 62, 154, + 153, 25, 63, 205, 204, 204, 61, 0, 0, 0, 0, 0, 0, 0, 9, + 66, 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 128, 65, 0, 0, + 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 64, 0, 0, 0, 0, + 128, 63, 56, 0, 0, 8, 34, 0, 16, 0, 1, 0, 0, 0, 26, + 0, 16, 0, 1, 0, 0, 0, 10, 128, 32, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 50, 0, 0, 9, 226, 0, 16, 0, 1, 0, 0, + 0, 6, 9, 16, 0, 0, 0, 0, 0, 166, 10, 16, 0, 1, 0, + 0, 0, 86, 5, 16, 0, 1, 0, 0, 0, 55, 32, 0, 9, 114, + 0, 16, 0, 0, 0, 0, 0, 6, 0, 16, 0, 1, 0, 0, 0, + 70, 2, 16, 0, 0, 0, 0, 0, 150, 7, 16, 0, 1, 0, 0, + 0, 47, 0, 0, 5, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, 56, 0, 0, 10, 114, 0, 16, 0, 0, + 0, 0, 0, 70, 2, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, + 102, 102, 230, 63, 102, 102, 230, 63, 102, 102, 230, 63, 0, 0, 0, + 0, 25, 0, 0, 5, 114, 0, 16, 0, 0, 0, 0, 0, 70, 2, + 16, 0, 0, 0, 0, 0, 56, 0, 0, 10, 114, 0, 16, 0, 1, + 0, 0, 0, 86, 5, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, + 150, 246, 160, 189, 43, 199, 117, 63, 40, 177, 243, 60, 0, 0, 0, + 0, 50, 0, 0, 12, 114, 0, 16, 0, 1, 0, 0, 0, 6, 0, + 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 87, 203, 136, 63, 86, + 131, 197, 60, 225, 104, 227, 58, 0, 0, 0, 0, 70, 2, 16, 0, + 1, 0, 0, 0, 50, 32, 0, 12, 114, 32, 16, 0, 0, 0, 0, + 0, 166, 10, 16, 0, 0, 0, 0, 0, 2, 64, 0, 0, 5, 9, + 34, 60, 158, 151, 129, 60, 194, 240, 119, 63, 0, 0, 0, 0, 70, + 2, 16, 0, 1, 0, 0, 0, 54, 0, 0, 5, 130, 32, 16, 0, + 0, 0, 0, 0, 58, 0, 16, 0, 0, 0, 0, 0, 62, 0, 0, + 1, 83, 84, 65, 84, 116, 0, 0, 0, 33, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 15, 0, 0, 0, 4, + 0, 0, 0, 4, 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, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, 2, + 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, 3, 0, 0, 0, 3, + 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, 0, 0, 0, 0, 0, - 0, + 0, 0, 0, 0, 0, }; namespace GpBinarizedShaders diff --git a/ShaderSrc/Functions.h b/ShaderSrc/Functions.h index 17cc3c9..00f383e 100644 --- a/ShaderSrc/Functions.h +++ b/ShaderSrc/Functions.h @@ -3,7 +3,7 @@ float SRGBToLinear(float v) if (v <= 0.04045) return v * (1.0 / 12.92); else - return pow(((v + 0.055) * (1.0 / 1.055)), 2.4); + return pow(((max(v, 0.0) + 0.055) * (1.0 / 1.055)), 2.4); } float2 SRGBToLinear(float2 v) @@ -47,8 +47,8 @@ float4 ApplyFlicker(int2 coordinate, int startThreshold, int endThreshold, float float4 ApplyDesaturation(float desaturation, float4 color) { - // This is intentionally done in gamma space - if (desaturation == 0.0) + // This is intentionally done in gamma space, and keeps solid yellow + if (desaturation == 0.0 || all(color.rgb == float3(1.0, 1.0, 0.0))) return color; float grayLevel = dot(color.rgb, float3(3.0, 6.0, 1.0) / 10.0);