From ada73c60ee204cae28ec3a4486937ec8f989f3b2 Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Tue, 12 Oct 2021 19:22:22 +0700 Subject: [PATCH] Code cleanup --- src/GLideNUI/Settings.cpp | 4 +-- .../GLSL/glsl_CombinerProgramBuilder.h | 2 -- .../glsl_CombinerProgramBuilderAccurate.cpp | 14 +++++------ .../glsl_CombinerProgramBuilderAccurate.h | 5 +--- .../glsl_CombinerProgramBuilderCommon.cpp | 14 ++++++++--- .../GLSL/glsl_CombinerProgramBuilderCommon.h | 5 +--- .../GLSL/glsl_CombinerProgramBuilderFast.cpp | 16 +++++------- .../GLSL/glsl_CombinerProgramBuilderFast.h | 5 +--- .../GLSL/glsl_CombinerProgramImpl.h | 1 + .../glsl_CombinerProgramUniformFactory.cpp | 20 ++------------- .../GLSL/glsl_CombinerProgramUniformFactory.h | 1 - ..._CombinerProgramUniformFactoryAccurate.cpp | 22 ++++++---------- ...sl_CombinerProgramUniformFactoryAccurate.h | 25 ++++++++----------- ...sl_CombinerProgramUniformFactoryCommon.cpp | 13 +++++----- ...glsl_CombinerProgramUniformFactoryCommon.h | 1 - ...glsl_CombinerProgramUniformFactoryFast.cpp | 22 +++++++--------- .../glsl_CombinerProgramUniformFactoryFast.h | 18 ++++++------- src/inc/freetype/include/config/ftconfig.h | 2 +- 18 files changed, 74 insertions(+), 116 deletions(-) diff --git a/src/GLideNUI/Settings.cpp b/src/GLideNUI/Settings.cpp index 5685f575..a2633750 100644 --- a/src/GLideNUI/Settings.cpp +++ b/src/GLideNUI/Settings.cpp @@ -48,7 +48,7 @@ void _loadSettings(QSettings & settings) config.generalEmulation.enableHiresNoiseDithering = settings.value("enableHiresNoiseDithering", config.generalEmulation.enableHiresNoiseDithering).toInt(); config.generalEmulation.rdramImageDitheringMode = settings.value("rdramImageDitheringMode", config.generalEmulation.rdramImageDitheringMode).toInt(); config.generalEmulation.enableLOD = settings.value("enableLOD", config.generalEmulation.enableLOD).toInt(); - config.generalEmulation.enableInaccurateTextureCoordinates = settings.value("enableFastInaccurateShaders", config.generalEmulation.enableInaccurateTextureCoordinates).toInt(); + config.generalEmulation.enableInaccurateTextureCoordinates = settings.value("enableInaccurateTextureCoordinates", config.generalEmulation.enableInaccurateTextureCoordinates).toInt(); config.generalEmulation.enableHWLighting = settings.value("enableHWLighting", config.generalEmulation.enableHWLighting).toInt(); config.generalEmulation.enableCoverage = settings.value("enableCoverage", config.generalEmulation.enableCoverage).toInt(); config.generalEmulation.enableShadersStorage = settings.value("enableShadersStorage", config.generalEmulation.enableShadersStorage).toInt(); @@ -194,7 +194,7 @@ void _writeSettingsToFile(const QString & filename) settings.setValue("enableHiresNoiseDithering", config.generalEmulation.enableHiresNoiseDithering); settings.setValue("rdramImageDitheringMode", config.generalEmulation.rdramImageDitheringMode); settings.setValue("enableLOD", config.generalEmulation.enableLOD); - settings.setValue("enableFastInaccurateShaders", config.generalEmulation.enableInaccurateTextureCoordinates); + settings.setValue("enableInaccurateTextureCoordinates", config.generalEmulation.enableInaccurateTextureCoordinates); settings.setValue("enableHWLighting", config.generalEmulation.enableHWLighting); settings.setValue("enableCoverage", config.generalEmulation.enableCoverage); settings.setValue("enableShadersStorage", config.generalEmulation.enableShadersStorage); diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.h b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.h index 6910baff..cbc660b3 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.h +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.h @@ -127,8 +127,6 @@ private: std::unique_ptr m_uniformFactory; opengl::CachedUseProgram * m_useProgram; bool m_useCoverage = false; - }; } - diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderAccurate.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderAccurate.cpp index ef594ade..6514520f 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderAccurate.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderAccurate.cpp @@ -1,15 +1,9 @@ -#include // for setprecision -#include -#include #include -#include "glsl_Utils.h" -#include "glsl_CombinerInputs.h" -#include "glsl_CombinerProgramImpl.h" #include "glsl_CombinerProgramBuilderAccurate.h" #include "glsl_CombinerProgramUniformFactoryAccurate.h" -#include "GraphicsDrawer.h" -namespace glsl { +namespace { +using namespace glsl; class VertexShaderTexturedTriangle : public ShaderPart { @@ -1145,6 +1139,10 @@ public: } }; +} // nameless namespace + +namespace glsl { + CombinerProgramBuilderAccurate::CombinerProgramBuilderAccurate(const opengl::GLInfo & _glinfo, opengl::CachedUseProgram * _useProgram) : CombinerProgramBuilderCommon(_glinfo, _useProgram, std::make_unique(_glinfo), std::make_unique(_glinfo)) diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderAccurate.h b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderAccurate.h index bb12510d..80054ca9 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderAccurate.h +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderAccurate.h @@ -1,10 +1,8 @@ #pragma once -#include +#include"glsl_CombinerProgramBuilderCommon.h" namespace glsl { -class CombinerProgramUniformFactory; - class CombinerProgramBuilderAccurate : public glsl::CombinerProgramBuilderCommon { public: @@ -43,4 +41,3 @@ private: }; } - diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderCommon.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderCommon.cpp index a2286793..3cec1082 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderCommon.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderCommon.cpp @@ -1,3 +1,5 @@ +#include "glsl_CombinerProgramBuilderCommon.h" + #include // for setprecision #include #include @@ -5,11 +7,11 @@ #include "glsl_Utils.h" #include "glsl_CombinerInputs.h" #include "glsl_CombinerProgramImpl.h" -#include "glsl_CombinerProgramBuilderCommon.h" #include "glsl_CombinerProgramUniformFactory.h" #include "GraphicsDrawer.h" -namespace glsl { +namespace { +using namespace glsl; /*---------------ShaderParts-------------*/ @@ -136,7 +138,7 @@ public: "OUT highp vec2 vTexCoord0; \n" "OUT highp vec2 vTexCoord1; \n" "OUT lowp vec4 vShadeColor; \n" - "OUT highp vec4 vBaryCoords;" + "OUT highp vec4 vBaryCoords; \n" ; if (!_glinfo.isGLESX || _glinfo.noPerspective) m_part += "noperspective OUT lowp vec4 vShadeColorNoperspective;\n"; @@ -1409,6 +1411,10 @@ GLuint _createVertexShader(ShaderPart * _header, ShaderPart * _body, ShaderPart return shader_object; } +} // nameless namespace + +namespace glsl { + CombinerProgramBuilderCommon::CombinerProgramBuilderCommon(const opengl::GLInfo & _glinfo, opengl::CachedUseProgram * _useProgram, std::unique_ptr _uniformFactory, std::unique_ptr _vertexTexturedTriangle) @@ -1678,4 +1684,4 @@ void CombinerProgramBuilderCommon::_writeShaderN64DepthRender(std::stringstream& m_shaderN64DepthRender->write(ssShader); } -} \ No newline at end of file +} diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderCommon.h b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderCommon.h index d7fa6177..cc7f76bd 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderCommon.h +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderCommon.h @@ -1,10 +1,8 @@ #pragma once -#include +#include "glsl_CombinerProgramBuilder.h" namespace glsl { -class CombinerProgramUniformFactory; - class CombinerProgramBuilderCommon : public glsl::CombinerProgramBuilder { public: @@ -115,4 +113,3 @@ private: }; } - diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderFast.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderFast.cpp index 2dfcdbb9..05f0d378 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderFast.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderFast.cpp @@ -1,15 +1,9 @@ -#include // for setprecision -#include -#include #include -#include "glsl_Utils.h" -#include "glsl_CombinerInputs.h" -#include "glsl_CombinerProgramImpl.h" #include "glsl_CombinerProgramBuilderFast.h" #include "glsl_CombinerProgramUniformFactoryFast.h" -#include "GraphicsDrawer.h" -namespace glsl { +namespace { +using namespace glsl; class VertexShaderTexturedTriangleFast : public ShaderPart { @@ -1091,6 +1085,10 @@ public: } }; +} // nameless namespace + +namespace glsl { + CombinerProgramBuilderFast::CombinerProgramBuilderFast(const opengl::GLInfo & _glinfo, opengl::CachedUseProgram * _useProgram) : CombinerProgramBuilderCommon(_glinfo, _useProgram, std::make_unique(_glinfo), std::make_unique(_glinfo)) @@ -1109,7 +1107,6 @@ CombinerProgramBuilderFast::CombinerProgramBuilderFast(const opengl::GLInfo & _g , m_shaderReadtexCopyMode(new ShaderReadtexCopyModeFast(_glinfo)) , m_shaderClampWrapMirror(new ShaderClampWrapMirror(_glinfo)) { - } void CombinerProgramBuilderFast::_writeFragmentGlobalVariablesTex(std::stringstream& ssShader) const @@ -1182,5 +1179,4 @@ void CombinerProgramBuilderFast::_writeShaderReadtexCopyMode(std::stringstream& m_shaderReadtexCopyMode->write(ssShader); } - } diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderFast.h b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderFast.h index cf343967..37baa7c8 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderFast.h +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderFast.h @@ -1,10 +1,8 @@ #pragma once -#include +#include "glsl_CombinerProgramBuilderCommon.h" namespace glsl { -class CombinerProgramUniformFactory; - class CombinerProgramBuilderFast : public glsl::CombinerProgramBuilderCommon { public: @@ -44,4 +42,3 @@ private: }; } - diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramImpl.h b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramImpl.h index 3c3dff5a..219861e4 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramImpl.h +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramImpl.h @@ -3,6 +3,7 @@ #include #include #include +#include #include "glsl_CombinerInputs.h" namespace opengl { diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp index bd71aa5b..798dab25 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp @@ -1,25 +1,9 @@ -#include -#include -#include #include "glsl_CombinerProgramUniformFactory.h" + +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef min -#undef min -#endif - namespace glsl { CombinerProgramUniformFactory::CombinerProgramUniformFactory(const opengl::GLInfo &_glInfo) diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.h b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.h index 9f693a13..3f1b2a33 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.h +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.h @@ -85,4 +85,3 @@ protected: const opengl::GLInfo & m_glInfo; }; } - diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.cpp index bca677e6..b38b8594 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.cpp @@ -1,26 +1,18 @@ -#include -#include -#include #include "glsl_CombinerProgramUniformFactoryAccurate.h" -#include -#include +#include #include -#include -#include #include #include -#include -#include -#include -#include -#include + +#include #ifdef min #undef min #endif -namespace glsl { +namespace { +using namespace glsl; class URasterInfo : public UniformGroup { public: @@ -357,7 +349,10 @@ private: fv2Uniform uBilinearOffset; }; +} // nameless namespace + /*---------------CombinerProgramUniformFactoryCommon-------------*/ +namespace glsl { void CombinerProgramUniformFactoryAccurate::_addRasterInfo(GLuint _program, UniformGroups &_uniforms) const { @@ -390,7 +385,6 @@ void CombinerProgramUniformFactoryAccurate::_addClampWrapMirrorEngine(GLuint _pr CombinerProgramUniformFactoryAccurate::CombinerProgramUniformFactoryAccurate(const opengl::GLInfo & _glInfo) : CombinerProgramUniformFactoryCommon(_glInfo) - , m_glInfo(_glInfo) { } diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.h b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.h index 415e3d34..a0741475 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.h +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.h @@ -1,28 +1,25 @@ #pragma once -#include #include "glsl_CombinerProgramImpl.h" #include "glsl_CombinerProgramUniformFactoryCommon.h" namespace glsl { - class CombinerProgramUniformFactoryAccurate : public CombinerProgramUniformFactoryCommon { - public: - CombinerProgramUniformFactoryAccurate(const opengl::GLInfo & _glInfo); - private: +class CombinerProgramUniformFactoryAccurate : public CombinerProgramUniformFactoryCommon { +public: + CombinerProgramUniformFactoryAccurate(const opengl::GLInfo & _glInfo); - virtual void _addRasterInfo(GLuint _program, UniformGroups &_uniforms) const override; +private: + void _addRasterInfo(GLuint _program, UniformGroups &_uniforms) const override; - virtual void _addMipmap(GLuint _program, UniformGroups &_uniforms) const override; + void _addMipmap(GLuint _program, UniformGroups &_uniforms) const override; - virtual void _addMipmap2(GLuint _program, UniformGroups &_uniforms) const override; + void _addMipmap2(GLuint _program, UniformGroups &_uniforms) const override; - virtual void _addTextureSize(GLuint _program, UniformGroups &_uniforms, bool _usesTile0, bool _usesTile1) const override; + void _addTextureSize(GLuint _program, UniformGroups &_uniforms, bool _usesTile0, bool _usesTile1) const override; - virtual void _addTextureParams(GLuint _program, UniformGroups &_uniforms, bool _usesTile0, bool _usesTile1) const override; + void _addTextureParams(GLuint _program, UniformGroups &_uniforms, bool _usesTile0, bool _usesTile1) const override; - virtual void _addClampWrapMirrorEngine(GLuint _program, UniformGroups &_uniforms, bool _usesTile0, bool _usesTile1) const override; + void _addClampWrapMirrorEngine(GLuint _program, UniformGroups &_uniforms, bool _usesTile0, bool _usesTile1) const override; +}; - const opengl::GLInfo &m_glInfo; - }; } - diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryCommon.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryCommon.cpp index 44f73306..019f4f1c 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryCommon.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryCommon.cpp @@ -1,5 +1,6 @@ -#include #include "glsl_CombinerProgramUniformFactoryCommon.h" + +#include #include #include @@ -7,15 +8,11 @@ #include #include #include -#include -#include #include -#include -#include #include -namespace glsl { - +namespace { +using namespace glsl; /*---------------UniformGroup-------------*/ class UNoiseTex : public UniformGroup @@ -762,8 +759,10 @@ private: fv3Uniform uLightColor[8]; }; +} //nameless namespace /*---------------CombinerProgramUniformFactoryCommon-------------*/ +namespace glsl { void CombinerProgramUniformFactoryCommon::_addNoiseTex(GLuint _program, UniformGroups &_uniforms) const { diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryCommon.h b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryCommon.h index 3457b8e8..a9a96d64 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryCommon.h +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryCommon.h @@ -158,4 +158,3 @@ private: }; } - diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryFast.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryFast.cpp index d06f67be..489d44e8 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryFast.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryFast.cpp @@ -1,26 +1,19 @@ -#include -#include -#include #include "glsl_CombinerProgramUniformFactoryFast.h" -#include -#include +#include #include -#include -#include #include #include -#include -#include -#include -#include -#include +#include + +#include #ifdef min #undef min #endif -namespace glsl { +namespace { +using namespace glsl; class URasterInfoFast : public UniformGroup { public: @@ -393,7 +386,10 @@ private: fv2Uniform uTexScale1; }; +} //nameless namespace + /*---------------CombinerProgramUniformFactoryCommon-------------*/ +namespace glsl { void CombinerProgramUniformFactoryFast::_addRasterInfo(GLuint _program, UniformGroups &_uniforms) const { diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryFast.h b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryFast.h index 9f004b7a..8abf8456 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryFast.h +++ b/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryFast.h @@ -1,26 +1,26 @@ #pragma once -#include #include "glsl_CombinerProgramImpl.h" #include "glsl_CombinerProgramUniformFactoryCommon.h" namespace glsl { -class CombinerProgramUniformFactoryFast : public CombinerProgramUniformFactoryCommon { +class CombinerProgramUniformFactoryFast : public CombinerProgramUniformFactoryCommon +{ public: CombinerProgramUniformFactoryFast(const opengl::GLInfo & _glInfo); private: - virtual void _addRasterInfo(GLuint _program, UniformGroups &_uniforms) const override; + void _addRasterInfo(GLuint _program, UniformGroups &_uniforms) const override; - virtual void _addMipmap(GLuint _program, UniformGroups &_uniforms) const override; + void _addMipmap(GLuint _program, UniformGroups &_uniforms) const override; - virtual void _addMipmap2(GLuint _program, UniformGroups &_uniforms) const override; + void _addMipmap2(GLuint _program, UniformGroups &_uniforms) const override; - virtual void _addTextureSize(GLuint _program, UniformGroups &_uniforms, bool _usesTile0, bool _usesTile1) const override; + void _addTextureSize(GLuint _program, UniformGroups &_uniforms, bool _usesTile0, bool _usesTile1) const override; - virtual void _addTextureParams(GLuint _program, UniformGroups &_uniforms, bool _usesTile0, bool _usesTile1) const override; + void _addTextureParams(GLuint _program, UniformGroups &_uniforms, bool _usesTile0, bool _usesTile1) const override; - virtual void _addClampWrapMirrorEngine(GLuint _program, UniformGroups &_uniforms, bool _usesTile0, bool _usesTile1) const override; + void _addClampWrapMirrorEngine(GLuint _program, UniformGroups &_uniforms, bool _usesTile0, bool _usesTile1) const override; }; -} +} diff --git a/src/inc/freetype/include/config/ftconfig.h b/src/inc/freetype/include/config/ftconfig.h index d98a3116..f5b35e94 100644 --- a/src/inc/freetype/include/config/ftconfig.h +++ b/src/inc/freetype/include/config/ftconfig.h @@ -452,7 +452,7 @@ FT_BEGIN_HEADER FT_MulFix_i386( FT_Int32 a, FT_Int32 b ) { - register FT_Int32 result; + FT_Int32 result; __asm {