Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-18 06:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up.

Browse Source
This commit is contained in:
Martín Lucas Golini
2026-07-25 20:31:52 -03:00
parent c0debbee9f
commit b71ef9522d
8 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/eepp/graphics/renderer/renderer.hpp
View File

@@ -362,6 +362,8 @@ class EE_API Renderer {
void waitForIdle();
protected:
static const Vector3ff& textureColorChannel( Int32 mode );
static Renderer* sSingleton;
enum RendererStateFlags {

2
include/eepp/graphics/renderer/renderergl.hpp
View File

@@ -14,8 +14,6 @@ class EE_API RendererGL : public Renderer {
~RendererGL();
void init();
GraphicsLibraryVersion version();
std::string versionStr();

9
src/eepp/graphics/renderer/renderer.cpp
View File

@@ -589,6 +589,15 @@ bool Renderer::setTextureColorMode( Int32 ) {
return false;
}
const Vector3ff& Renderer::textureColorChannel( Int32 mode ) {
static const Vector3ff channels[] = { { 0.f, 0.f, 0.f },
{ 1.f, 0.f, 0.f },
{ 0.f, 1.f, 0.f },
{ 0.f, 0.f, 1.f },
{ 1.f / 3.f, 1.f / 3.f, 1.f / 3.f } };
return channels[mode];
}
bool Renderer::isLineSmooth() {
return BitOp::readBitKey( &mStateFlags, RSF_LINE_SMOOTH );
}

13
src/eepp/graphics/renderer/renderergl.cpp
View File

@@ -61,10 +61,6 @@ RendererGL::RendererGL() {
RendererGL::~RendererGL() {}
void RendererGL::init() {
Renderer::init();
}
bool RendererGL::ensureSubpixelShader() {
#ifndef EE_GLES1
if ( mSubpixelShader )
@@ -121,6 +117,8 @@ bool RendererGL::setTextureColorMode( Int32 mode ) {
#ifdef EE_GLES1
return false;
#else
if ( mode < 0 || mode > 4 )
return false;
if ( mode != 0 && !ensureSubpixelShader() )
return false;
if ( !mSubpixelShader || !mSubpixelShader->isValid() || mSubpixelChannelLoc == -1 )
@@ -136,12 +134,7 @@ bool RendererGL::setTextureColorMode( Int32 mode ) {
Renderer::setShader( mSubpixelShader.get() );
mUsingSubpixelShader = true;
}
static const Vector3ff channels[] = { { 0.f, 0.f, 0.f },
{ 1.f, 0.f, 0.f },
{ 0.f, 1.f, 0.f },
{ 0.f, 0.f, 1.f },
{ 1.f / 3.f, 1.f / 3.f, 1.f / 3.f } };
mSubpixelShader->setUniform( mSubpixelChannelLoc, channels[mode] );
mSubpixelShader->setUniform( mSubpixelChannelLoc, textureColorChannel( mode ) );
return true;
#endif
}

7
src/eepp/graphics/renderer/renderergl3.cpp
View File

@@ -173,12 +173,7 @@ void RendererGL3::setShader( ShaderProgram* Shader ) {
if ( mTextureColorMode_id != -1 )
mCurShader->setUniform( mTextureColorMode_id, mTextureColorMode );
if ( mTextureColorChannel_id != -1 && mTextureColorMode != 0 ) {
static const Vector3ff channels[] = { { 0.f, 0.f, 0.f },
{ 1.f, 0.f, 0.f },
{ 0.f, 1.f, 0.f },
{ 0.f, 0.f, 1.f },
{ 1.f / 3.f, 1.f / 3.f, 1.f / 3.f } };
mCurShader->setUniform( mTextureColorChannel_id, channels[mTextureColorMode] );
mCurShader->setUniform( mTextureColorChannel_id, textureColorChannel( mTextureColorMode ) );
}
if ( -1 != mAttribsLoc[EEGL_VERTEX_ARRAY] )

7
src/eepp/graphics/renderer/renderergl3cp.cpp
View File

@@ -200,12 +200,7 @@ void RendererGL3CP::setShader( ShaderProgram* Shader ) {
if ( mTextureColorMode_id != -1 )
mCurShader->setUniform( mTextureColorMode_id, mTextureColorMode );
if ( mTextureColorChannel_id != -1 && mTextureColorMode != 0 ) {
static const Vector3ff channels[] = { { 0.f, 0.f, 0.f },
{ 1.f, 0.f, 0.f },
{ 0.f, 1.f, 0.f },
{ 0.f, 0.f, 1.f },
{ 1.f / 3.f, 1.f / 3.f, 1.f / 3.f } };
mCurShader->setUniform( mTextureColorChannel_id, channels[mTextureColorMode] );
mCurShader->setUniform( mTextureColorChannel_id, textureColorChannel( mTextureColorMode ) );
}
if ( -1 != mAttribsLoc[EEGL_VERTEX_ARRAY] )

7
src/eepp/graphics/renderer/renderergles2.cpp
View File

@@ -227,12 +227,7 @@ void RendererGLES2::setShader( ShaderProgram* Shader ) {
if ( mTextureColorMode_id != -1 )
mCurShader->setUniform( mTextureColorMode_id, mTextureColorMode );
if ( mTextureColorChannel_id != -1 && mTextureColorMode != 0 ) {
static const Vector3ff channels[] = { { 0.f, 0.f, 0.f },
{ 1.f, 0.f, 0.f },
{ 0.f, 1.f, 0.f },
{ 0.f, 0.f, 1.f },
{ 1.f / 3.f, 1.f / 3.f, 1.f / 3.f } };
mCurShader->setUniform( mTextureColorChannel_id, channels[mTextureColorMode] );
mCurShader->setUniform( mTextureColorChannel_id, textureColorChannel( mTextureColorMode ) );
}
if ( -1 != mAttribsLoc[EEGL_VERTEX_ARRAY] )

7
src/eepp/graphics/renderer/rendererglshader.cpp
View File

@@ -31,12 +31,7 @@ bool RendererGLShader::setTextureColorMode( Int32 mode ) {
mTextureColorMode = mode;
mCurShader->setUniform( mTextureColorMode_id, mode );
if ( mTextureColorChannel_id != -1 ) {
static const Vector3ff channels[] = { { 0.f, 0.f, 0.f },
{ 1.f, 0.f, 0.f },
{ 0.f, 1.f, 0.f },
{ 0.f, 0.f, 1.f },
{ 1.f / 3.f, 1.f / 3.f, 1.f / 3.f } };
mCurShader->setUniform( mTextureColorChannel_id, channels[mode] );
mCurShader->setUniform( mTextureColorChannel_id, textureColorChannel( mode ) );
}
}
return true;