- remove screenquadscale.vp

ZDoom · Mar 12, 2019 · 0620041 · 0620041
1 parent a26e2cd
commit 0620041
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 18 deletions.
diff --git a/src/rendering/hwrenderer/postprocessing/hw_presentshader.cpp b/src/rendering/hwrenderer/postprocessing/hw_presentshader.cpp
@@ -33,7 +33,7 @@ void FPresentShaderBase::Init(const char * vtx_shader_name, const char * program
 	FString prolog = Uniforms.CreateDeclaration("Uniforms", PresentUniforms::Desc());
 
 	mShader.reset(screen->CreateShaderProgram());
-	mShader->Compile(IShaderProgram::Vertex, "shaders/glsl/screenquadscale.vp", prolog, 330);
+	mShader->Compile(IShaderProgram::Vertex, "shaders/glsl/screenquad.vp", prolog, 330);
 	mShader->Compile(IShaderProgram::Fragment, vtx_shader_name, prolog, 330);
 	mShader->Link(program_name);
 	mShader->SetUniformBufferLocation(Uniforms.BindingPoint(), "Uniforms");

diff --git a/wadsrc/static/shaders/glsl/present.fp b/wadsrc/static/shaders/glsl/present.fp
@@ -29,5 +29,5 @@ vec4 Dither(vec4 c)
 
 void main()
 {
-	FragColor = Dither(ApplyGamma(texture(InputTexture, TexCoord)));
+	FragColor = Dither(ApplyGamma(texture(InputTexture, TexCoord * UVScale)));
 }
diff --git a/wadsrc/static/shaders/glsl/present_checker3d.fp b/wadsrc/static/shaders/glsl/present_checker3d.fp
@@ -23,11 +23,11 @@ void main()
 		) % 2 == 0;
 	vec4 inputColor;
 	if (isLeftEye) {
-		inputColor = texture(LeftEyeTexture, TexCoord);
+		inputColor = texture(LeftEyeTexture, TexCoord * UVScale);
 	}
 	else {
 		// inputColor = vec4(0, 1, 0, 1);
-		inputColor = texture(RightEyeTexture, TexCoord);
+		inputColor = texture(RightEyeTexture, TexCoord * UVScale);
 	}
 	FragColor = ApplyGamma(inputColor);
 }
diff --git a/wadsrc/static/shaders/glsl/present_column3d.fp b/wadsrc/static/shaders/glsl/present_column3d.fp
@@ -21,11 +21,11 @@ void main()
 		) % 2 == 0;
 	vec4 inputColor;
 	if (isLeftEye) {
-		inputColor = texture(LeftEyeTexture, TexCoord);
+		inputColor = texture(LeftEyeTexture, TexCoord * UVScale);
 	}
 	else {
 		// inputColor = vec4(0, 1, 0, 1);
-		inputColor = texture(RightEyeTexture, TexCoord);
+		inputColor = texture(RightEyeTexture, TexCoord * UVScale);
 	}
 	FragColor = ApplyGamma(inputColor);
 }
diff --git a/wadsrc/static/shaders/glsl/present_row3d.fp b/wadsrc/static/shaders/glsl/present_row3d.fp
@@ -21,11 +21,11 @@ void main()
 		) % 2 == 0;
 	vec4 inputColor;
 	if (isLeftEye) {
-		inputColor = texture(LeftEyeTexture, TexCoord);
+		inputColor = texture(LeftEyeTexture, TexCoord * UVScale);
 	}
 	else {
 		// inputColor = vec4(0, 1, 0, 1);
-		inputColor = texture(RightEyeTexture, TexCoord);
+		inputColor = texture(RightEyeTexture, TexCoord * UVScale);
 	}
 	FragColor = ApplyGamma(inputColor);
 }
diff --git a/wadsrc/static/shaders/glsl/screenquadscale.vp b/wadsrc/static/shaders/glsl/screenquadscale.vp