Merge pull request #172 from cortex-command-community/gl-postprocessing

GL Postprocessing Shaders and Settings changes

Author: Causeless

Data/Base.rte/GUIs/SettingsGUI.ini

@@ -115,19 +115,6 @@ Name = ButtonQuickBorderless
 Anchor = Left, Top
 Text = Fullscreen
 
-[ButtonQuickUpscaledBorderless]
-ControlType = BUTTON
-Parent = CollectionBoxVideoSettings
-X = 350
-Y = 29
-Width = 120
-Height = 18
-Visible = True
-Enabled = True
-Name = ButtonQuickUpscaledBorderless
-Anchor = Left, Top
-Text = Upscaled Fullscreen
-
 [LabelResolutionSelect]
 ControlType = LABEL
 Parent = CollectionBoxVideoSettings
@@ -185,25 +172,39 @@ Anchor = Left, Top
 Text = Enable VSync
 Checked = Unchecked
 
-[CheckboxIgnoreMultiDisplays]
+[CheckboxFullscreen]
 ControlType = CHECKBOX
 Parent = CollectionBoxVideoSettings
 X = 14
 Y = 155
-Width = 130
+Width = 85
 Height = 16
 Visible = True
 Enabled = True
-Name = CheckboxIgnoreMultiDisplays
+Name = CheckboxFullscreen
 Anchor = Left, Top
-Text = Ignore Multi-Displays
+Text = Fullscreen
+Checked = Unchecked
+
+[CheckboxUseMultiDisplays]
+ControlType = CHECKBOX
+Parent = CollectionBoxVideoSettings
+X = 14
+Y = 175
+Width = 145
+Height = 16
+Visible = True
+Enabled = True
+Name = CheckboxUseMultiDisplays
+Anchor = Left, Top
+Text = Use Multiple Displays
 Checked = Unchecked
 
 [LabelSplitscreenType]
 ControlType = LABEL
 Parent = CollectionBoxVideoSettings
-X = 15
-Y = 175
+X = 14
+Y = 195
 Width = 165
 Height = 16
 Visible = True
@@ -218,7 +219,7 @@ VAlignment = middle
 ControlType = COLLECTIONBOX
 Parent = CollectionBoxVideoSettings
 X = 190
-Y = 175
+Y = 195
 Width = 145
 Height = 15
 Visible = True
@@ -263,7 +264,7 @@ Parent = CollectionBoxVideoSettings
 X = 0
 Y = 75
 Width = 480
-Height = 60
+Height = 40
 Visible = True
 Enabled = True
 Name = CollectionPresetResolution
@@ -319,7 +320,7 @@ Parent = CollectionBoxVideoSettings
 X = 0
 Y = 75
 Width = 480
-Height = 60
+Height = 80
 Visible = True
 Enabled = True
 Name = CollectionCustomResolution
@@ -382,19 +383,19 @@ Enabled = True
 Name = TextboxCustomHeight
 Anchor = Left, Top
 
-[CheckboxCustomUpscaled]
-ControlType = CHECKBOX
+[ComboboxResolutionMultiplier]
+ControlType = COMBOBOX
 Parent = CollectionCustomResolution
 X = 284
 Y = 11
 Width = 60
 Height = 16
 Visible = True
 Enabled = True
-Name = CheckboxCustomUpscaled
+Name = ComboboxResolutionMultiplier
 Anchor = Left, Top
-Checked = Unchecked
-Text = Upscaled
+DropHeight = 48
+DropDownStyle = DropDown
 
 [ButtonApplyCustomResolution]
 ControlType = BUTTON

Data/Base.rte/GUIs/SettingsPauseGUI.ini

@@ -115,19 +115,6 @@ Name = ButtonQuickBorderless
 Anchor = Left, Top
 Text = Fullscreen
 
-[ButtonQuickUpscaledBorderless]
-ControlType = BUTTON
-Parent = CollectionBoxVideoSettings
-X = 350
-Y = 29
-Width = 120
-Height = 18
-Visible = False
-Enabled = False
-Name = ButtonQuickUpscaledBorderless
-Anchor = Left, Top
-Text = Upscaled Fullscreen
-
 [LabelResolutionSelect]
 ControlType = LABEL
 Parent = CollectionBoxVideoSettings
@@ -185,7 +172,21 @@ Anchor = Left, Top
 Text = Enable VSync
 Checked = Unchecked
 
-[CheckboxIgnoreMultiDisplays]
+[CheckboxFullscreen]
+ControlType = CHECKBOX
+Parent = CollectionBoxVideoSettings
+X = 14
+Y = 135
+Width = 85
+Height = 16
+Visible = False
+Enabled = False
+Name = CheckboxFullscreen
+Anchor = Left, Top
+Text = Fullscreen
+Checked = Unchecked
+
+[CheckboxUseMultiDisplays]
 ControlType = CHECKBOX
 Parent = CollectionBoxVideoSettings
 X = 14
@@ -194,9 +195,9 @@ Width = 130
 Height = 16
 Visible = False
 Enabled = False
-Name = CheckboxIgnoreMultiDisplays
+Name = CheckboxUseMultiDisplays
 Anchor = Left, Top
-Text = Ignore Multi-Displays
+Text = Use Multi-Displays
 Checked = Unchecked
 
 [LabelSplitscreenType]
@@ -382,19 +383,20 @@ Enabled = True
 Name = TextboxCustomHeight
 Anchor = Left, Top
 
-[CheckboxCustomUpscaled]
-ControlType = CHECKBOX
+[ComboboxResolutionMultiplier]
+ControlType = COMBOBOX
 Parent = CollectionCustomResolution
 X = 284
 Y = 11
 Width = 60
 Height = 16
 Visible = True
 Enabled = True
-Name = CheckboxCustomUpscaled
+Name = ComboboxResolutionMultiplier
 Anchor = Left, Top
-Checked = Unchecked
-Text = Upscaled
+Text = 2
+DropDownStyle = DropDown
+
 
 [ButtonApplyCustomResolution]
 ControlType = BUTTON
@@ -3789,4 +3791,4 @@ Enabled = True
 Name = TabMiscSettings
 Anchor = Left, Top
 Text = Misc.
-Selected = False
+Selected = False

Data/Base.rte/Shaders/Blit8.frag

@@ -0,0 +1,15 @@
+//Blit8.frag
+#version 330 core
+
+in vec2 textureUV;
+
+out vec4 FragColor;
+
+uniform sampler2D rteTexture;
+uniform sampler1D rtePalette;
+
+void main()
+{
+	float colorIndex = texture(rteTexture, vec2(textureUV.x, -textureUV.y)).r;
+	FragColor = texture(rtePalette, colorIndex);
+}

Data/Base.rte/Shaders/Blit8.vert

@@ -0,0 +1,15 @@
+#version 330 core
+
+layout (location = 0) in vec2 rteVertexPosition;
+layout (location = 1) in vec2 rteTexUV;
+
+out vec2 textureUV;
+
+uniform mat4 rteTransform;
+uniform mat4 rteProjection;
+uniform mat4 rteUVTransform;
+
+void main() {
+    gl_Position = rteProjection * rteTransform * vec4(rteVertexPosition, 0.0, 1.0);
+    textureUV = (rteUVTransform * vec4(rteTexUV, 0.0, 1.0)).xy;
+}

Data/Base.rte/Shaders/PostProcess.frag

@@ -0,0 +1,13 @@
+#version 330 core
+
+in vec2 textureUV;
+
+out vec4 FragColor;
+
+uniform sampler2D rteTexture;
+uniform vec4 rteColor;
+
+
+void main()  {
+    FragColor = texture(rteTexture, textureUV) * rteColor;
+}

Data/Base.rte/Shaders/PostProcess.vert

@@ -0,0 +1,15 @@
+#version 330 core
+
+layout (location = 0) in vec2 rteVertexPosition;
+layout (location = 1) in vec2 rteTexUV;
+
+out vec2 textureUV;
+
+uniform mat4 rteTransform;
+uniform mat4 rteProjection;
+
+
+void main() {
+    gl_Position = rteProjection * rteTransform * vec4(rteVertexPosition, 0.0, 1.0);
+    textureUV = rteTexUV;
+}

Data/Base.rte/Shaders/ScreenBlit.frag

@@ -0,0 +1,24 @@
+#version 330 core
+
+in vec2 textureUV;
+
+out vec4 FragColor;
+
+uniform sampler2D rteTexture;
+uniform sampler2D rteGUITexture;
+
+vec4 texture2DAA(sampler2D tex, vec2 uv) {
+    vec2 texsize = vec2(textureSize(tex,0));
+    vec2 uv_texspace = uv*texsize;
+    vec2 seam = floor(uv_texspace+.5);
+    uv_texspace = (uv_texspace-seam)/fwidth(uv_texspace)+seam;
+    uv_texspace = clamp(uv_texspace, seam-.5, seam+.5);
+    return texture(tex, uv_texspace/texsize);
+}
+
+void main() {
+    vec4 guiColor = texture2DAA(rteGUITexture, textureUV);
+    float guiSolid = step(0.00000001, guiColor.r + guiColor.g + guiColor.b);
+    float blendRatio = max(guiColor.a, guiSolid);
+    FragColor = (texture2DAA(rteTexture, textureUV) * (1- blendRatio)) + guiColor * blendRatio;
+}

Data/Base.rte/Shaders/ScreenBlit.vert

@@ -0,0 +1,14 @@
+#version 330 core
+
+layout (location = 0) in vec2 rteVertexPosition;
+layout (location = 1) in vec2 rteTexUV;
+
+out vec2 textureUV;
+
+uniform mat4 rteTransform;
+uniform mat4 rteProjection;
+
+void main() {
+    gl_Position = rteProjection * rteTransform * vec4(rteVertexPosition.xy, 0.0, 1.0);
+    textureUV = rteTexUV;
+}