From 0fa2f2c7ae514292dfc07a2d3233d88a85fc5152 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Tue, 20 Dec 2016 13:50:07 +0100 Subject: [PATCH] Remove more now-unused code --- GPU/Common/ShaderId.cpp | 6 ------ GPU/Common/ShaderId.h | 1 - GPU/GLES/ShaderManager.cpp | 4 ---- GPU/GLES/VertexShaderGenerator.cpp | 5 +---- GPU/Vulkan/ShaderManagerVulkan.cpp | 5 ----- GPU/Vulkan/VertexShaderGeneratorVulkan.cpp | 5 +---- 6 files changed, 2 insertions(+), 24 deletions(-) diff --git a/GPU/Common/ShaderId.cpp b/GPU/Common/ShaderId.cpp index 98d55089bf..d3b55b70ca 100644 --- a/GPU/Common/ShaderId.cpp +++ b/GPU/Common/ShaderId.cpp @@ -42,7 +42,6 @@ std::string VertexShaderDesc(const ShaderID &id) { } if (id.Bits(VS_BIT_MATERIAL_UPDATE, 3)) desc << "MatUp:" << id.Bits(VS_BIT_MATERIAL_UPDATE, 3) << " "; if (id.Bits(VS_BIT_WEIGHT_FMTSCALE, 2)) desc << "WScale " << id.Bits(VS_BIT_WEIGHT_FMTSCALE, 2) << " "; - if (id.Bits(VS_BIT_TEXCOORD_FMTSCALE, 2)) desc << "TCScale " << id.Bits(VS_BIT_TEXCOORD_FMTSCALE, 2) << " "; if (id.Bit(VS_BIT_FLATSHADE)) desc << "Flat "; // TODO: More... @@ -119,11 +118,6 @@ void ComputeVertexShaderID(ShaderID *id_out, u32 vertType, bool useHWTransform) id.SetBit(VS_BIT_NORM_REVERSE, gstate.areNormalsReversed()); id.SetBit(VS_BIT_HAS_TEXCOORD, hasTexcoord); - if (doTextureProjection && gstate.getUVProjMode() == GE_PROJMAP_UV) { - id.SetBits(VS_BIT_TEXCOORD_FMTSCALE, 2, (vertType & GE_VTYPE_TC_MASK) >> GE_VTYPE_TC_SHIFT); // two bits - } else { - id.SetBits(VS_BIT_TEXCOORD_FMTSCALE, 2, 3); // float - no scaling - } } id.SetBit(VS_BIT_FLATSHADE, doFlatShading); diff --git a/GPU/Common/ShaderId.h b/GPU/Common/ShaderId.h index 683d1db74e..6c6f32aa6c 100644 --- a/GPU/Common/ShaderId.h +++ b/GPU/Common/ShaderId.h @@ -37,7 +37,6 @@ enum { VS_BIT_LIGHT3_ENABLE = 55, VS_BIT_LIGHTING_ENABLE = 56, VS_BIT_WEIGHT_FMTSCALE = 57, // only two bits, 1 free after - VS_BIT_TEXCOORD_FMTSCALE = 60, VS_BIT_FLATSHADE = 62, // 1 free after }; diff --git a/GPU/GLES/ShaderManager.cpp b/GPU/GLES/ShaderManager.cpp index 80b7c40644..d0fb2c4a32 100644 --- a/GPU/GLES/ShaderManager.cpp +++ b/GPU/GLES/ShaderManager.cpp @@ -536,10 +536,6 @@ void LinkedShader::UpdateUniforms(u32 vertType, const ShaderID &vsid) { const int h = gstate.getTextureHeight(0); const float widthFactor = (float)w * invW; const float heightFactor = (float)h * invH; - - static const float rescale[4] = {1.0f, 2*127.5f/128.f, 2*32767.5f/32768.f, 1.0f}; - const float factor = rescale[(vertType & GE_VTYPE_TC_MASK) >> GE_VTYPE_TC_SHIFT]; - float uvscaleoff[4]; uvscaleoff[0] = widthFactor; uvscaleoff[1] = heightFactor; diff --git a/GPU/GLES/VertexShaderGenerator.cpp b/GPU/GLES/VertexShaderGenerator.cpp index 47b7876b31..ed17abd76f 100644 --- a/GPU/GLES/VertexShaderGenerator.cpp +++ b/GPU/GLES/VertexShaderGenerator.cpp @@ -192,7 +192,6 @@ void GenerateVertexShader(const ShaderID &id, char *buffer) { numBoneWeights = 1 + id.Bits(VS_BIT_BONES, 3); WRITE(p, "%s", boneWeightDecl[numBoneWeights]); } - int texFmtScale = id.Bits(VS_BIT_TEXCOORD_FMTSCALE, 2); if (useHWTransform) WRITE(p, "%s vec3 position;\n", attribute); @@ -610,9 +609,7 @@ void GenerateVertexShader(const ShaderID &id, char *buffer) { { // prescale is false here. if (hasTexcoord) { - static const char *rescaleuv[4] = {"", " * 1.9921875", " * 1.999969482421875", ""}; // 2*127.5f/128.f, 2*32767.5f/32768.f, 1.0f}; - const char *factor = rescaleuv[texFmtScale]; - temp_tc = StringFromFormat("vec4(texcoord.xy %s, 0.0, 1.0)", factor); + temp_tc = "vec4(texcoord.xy, 0.0, 1.0)"; } else { temp_tc = "vec4(0.0, 0.0, 0.0, 1.0)"; } diff --git a/GPU/Vulkan/ShaderManagerVulkan.cpp b/GPU/Vulkan/ShaderManagerVulkan.cpp index 5987580f1b..b7c6c52220 100644 --- a/GPU/Vulkan/ShaderManagerVulkan.cpp +++ b/GPU/Vulkan/ShaderManagerVulkan.cpp @@ -294,11 +294,6 @@ void ShaderManagerVulkan::BaseUpdateUniforms(int dirtyUniforms) { const int h = gstate.getTextureHeight(0); const float widthFactor = (float)w * invW; const float heightFactor = (float)h * invH; - - static const float rescale[4] = { 1.0f, 2 * 127.5f / 128.f, 2 * 32767.5f / 32768.f, 1.0f }; - const float factor = rescale[(gstate.vertType & GE_VTYPE_TC_MASK) >> GE_VTYPE_TC_SHIFT]; - - float uvscaleoff[4]; ub_base.uvScaleOffset[0] = widthFactor; ub_base.uvScaleOffset[1] = heightFactor; ub_base.uvScaleOffset[2] = 0.0f; diff --git a/GPU/Vulkan/VertexShaderGeneratorVulkan.cpp b/GPU/Vulkan/VertexShaderGeneratorVulkan.cpp index 433c2b3ddb..dbb7e479fd 100644 --- a/GPU/Vulkan/VertexShaderGeneratorVulkan.cpp +++ b/GPU/Vulkan/VertexShaderGeneratorVulkan.cpp @@ -163,7 +163,6 @@ bool GenerateVulkanGLSLVertexShader(const ShaderID &id, char *buffer, bool *uses numBoneWeights = 1 + id.Bits(VS_BIT_BONES, 3); WRITE(p, "%s", boneWeightDecl[numBoneWeights]); } - int texFmtScale = id.Bits(VS_BIT_TEXCOORD_FMTSCALE, 2); if (useHWTransform) WRITE(p, "layout (location = %d) in vec3 position;\n", PspAttributeLocation::POSITION); @@ -462,9 +461,7 @@ bool GenerateVulkanGLSLVertexShader(const ShaderID &id, char *buffer, bool *uses { // scaleUV is false here. if (hasTexcoord) { - static const char *rescaleuv[4] = { "", " * 1.9921875", " * 1.999969482421875", "" }; // 2*127.5f/128.f, 2*32767.5f/32768.f, 1.0f}; - const char *factor = rescaleuv[texFmtScale]; - temp_tc = StringFromFormat("vec4(texcoord.xy %s, 0.0, 1.0)", factor); + temp_tc = "vec4(texcoord.xy, 0.0, 1.0)"; } else { temp_tc = "vec4(0.0, 0.0, 0.0, 1.0)"; }