MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-02 09:03:37 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Sergey Lipskiy 2021-10-12 19:22:22 +07:00
parent 3d5a39e647
commit ada73c60ee
18 changed files with 74 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/GLideNUI/Settings.cpp
View File

@ -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);

2
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.h
View File

@ -127,8 +127,6 @@ private:
std::unique_ptr<CombinerProgramUniformFactory> m_uniformFactory;
opengl::CachedUseProgram * m_useProgram;
bool m_useCoverage = false;
};
}

14
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderAccurate.cpp
View File

@ -1,15 +1,9 @@
#include <iomanip> // for setprecision
#include <assert.h>
#include <Log.h>
#include <Config.h>
#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<CombinerProgramUniformFactoryAccurate>(_glinfo),
std::make_unique<VertexShaderTexturedTriangle>(_glinfo))

5
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderAccurate.h
View File

@ -1,10 +1,8 @@
#pragma once
#include <Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderCommon.h>
#include"glsl_CombinerProgramBuilderCommon.h"
namespace glsl {
class CombinerProgramUniformFactory;
class CombinerProgramBuilderAccurate : public glsl::CombinerProgramBuilderCommon
{
public:
@ -43,4 +41,3 @@ private:
};
}

14
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderCommon.cpp
View File

@ -1,3 +1,5 @@
#include "glsl_CombinerProgramBuilderCommon.h"
#include <iomanip> // for setprecision
#include <assert.h>
#include <Log.h>
@ -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<CombinerProgramUniformFactory> _uniformFactory,
std::unique_ptr<ShaderPart> _vertexTexturedTriangle)
@ -1678,4 +1684,4 @@ void CombinerProgramBuilderCommon::_writeShaderN64DepthRender(std::stringstream&
m_shaderN64DepthRender->write(ssShader);
}
}
}

5
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderCommon.h
View File

@ -1,10 +1,8 @@
#pragma once
#include <Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.h>
#include "glsl_CombinerProgramBuilder.h"
namespace glsl {
class CombinerProgramUniformFactory;
class CombinerProgramBuilderCommon : public glsl::CombinerProgramBuilder
{
public:
@ -115,4 +113,3 @@ private:
};
}

16
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderFast.cpp
View File

@ -1,15 +1,9 @@
#include <iomanip> // for setprecision
#include <assert.h>
#include <Log.h>
#include <Config.h>
#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<CombinerProgramUniformFactoryFast>(_glinfo),
std::make_unique<VertexShaderTexturedTriangleFast>(_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);
}
}

5
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderFast.h
View File

@ -1,10 +1,8 @@
#pragma once
#include <Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilderCommon.h>
#include "glsl_CombinerProgramBuilderCommon.h"
namespace glsl {
class CombinerProgramUniformFactory;
class CombinerProgramBuilderFast : public glsl::CombinerProgramBuilderCommon
{
public:
@ -44,4 +42,3 @@ private:
};
}

1
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramImpl.h
View File

@ -3,6 +3,7 @@
#include <vector>
#include <Graphics/CombinerProgram.h>
#include <Graphics/ObjectHandle.h>
#include <Graphics/OpenGLContext/GLFunctions.h>
#include "glsl_CombinerInputs.h"
namespace opengl {

20
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp
View File

@ -1,25 +1,9 @@
#include <algorithm>
#include <cmath>
#include <Config.h>
#include "glsl_CombinerProgramUniformFactory.h"
#include <Config.h>
#include <Graphics/Parameters.h>
#include <Graphics/Context.h>
#include <Textures.h>
#include <NoiseTexture.h>
#include <FrameBuffer.h>
#include <DisplayWindow.h>
#include <Debugger.h>
#include <GBI.h>
#include <RSP.h>
#include <gSP.h>
#include <gDP.h>
#include <VI.h>
#ifdef min
#undef min
#endif
namespace glsl {
CombinerProgramUniformFactory::CombinerProgramUniformFactory(const opengl::GLInfo &_glInfo)

1
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.h
View File

@ -85,4 +85,3 @@ protected:
const opengl::GLInfo & m_glInfo;
};
}

22
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.cpp
View File

@ -1,26 +1,18 @@
#include <algorithm>
#include <cmath>
#include <Config.h>
#include "glsl_CombinerProgramUniformFactoryAccurate.h"
#include <Graphics/Parameters.h>
#include <Graphics/Context.h>
#include <Config.h>
#include <Textures.h>
#include <NoiseTexture.h>
#include <FrameBuffer.h>
#include <DisplayWindow.h>
#include <Debugger.h>
#include <GBI.h>
#include <RSP.h>
#include <gSP.h>
#include <gDP.h>
#include <VI.h>
#include <cmath>
#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)
{
}

25
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryAccurate.h
View File

@ -1,28 +1,25 @@
#pragma once
#include <Graphics/OpenGLContext/opengl_GLInfo.h>
#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;
};
}

13
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryCommon.cpp
View File

@ -1,5 +1,6 @@
#include <Config.h>
#include "glsl_CombinerProgramUniformFactoryCommon.h"
#include <Config.h>
#include <Graphics/Parameters.h>
#include <Graphics/Context.h>
@ -7,15 +8,11 @@
#include <NoiseTexture.h>
#include <FrameBuffer.h>
#include <DisplayWindow.h>
#include <Debugger.h>
#include <GBI.h>
#include <RSP.h>
#include <gSP.h>
#include <gDP.h>
#include <VI.h>
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
{

1
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryCommon.h
View File

@ -158,4 +158,3 @@ private:
};
}

22
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryFast.cpp
View File

@ -1,26 +1,19 @@
#include <algorithm>
#include <cmath>
#include <Config.h>
#include "glsl_CombinerProgramUniformFactoryFast.h"
#include <Graphics/Parameters.h>
#include <Graphics/Context.h>
#include <Config.h>
#include <Textures.h>
#include <NoiseTexture.h>
#include <FrameBuffer.h>
#include <DisplayWindow.h>
#include <Debugger.h>
#include <GBI.h>
#include <RSP.h>
#include <gSP.h>
#include <gDP.h>
#include <VI.h>
#include <FrameBuffer.h>
#include <cmath>
#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
{

18
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactoryFast.h
View File

@ -1,26 +1,26 @@
#pragma once
#include <Graphics/OpenGLContext/opengl_GLInfo.h>
#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;
};
}
}

2
src/inc/freetype/include/config/ftconfig.h
View File

@ -452,7 +452,7 @@ FT_BEGIN_HEADER
FT_MulFix_i386( FT_Int32 a,
FT_Int32 b )
{
register FT_Int32 result;
FT_Int32 result;
__asm
{