TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-11 08:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move border to gfxglstateblock

Browse source
This commit is contained in:
marauder2k7 2023-07-19 16:33:01 +01:00
parent 63b2aba467
commit e0119efbb5
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Engine/source/gfx/gl/gfxGLStateBlock.cpp
View file

@ -56,6 +56,15 @@ GFXGLStateBlock::GFXGLStateBlock(const GFXStateBlockDesc& desc) :
glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GFXGLTextureAddress[ssd.addressModeV]); glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GFXGLTextureAddress[ssd.addressModeV]);
glSamplerParameteri(id, GL_TEXTURE_WRAP_R, GFXGLTextureAddress[ssd.addressModeW]); glSamplerParameteri(id, GL_TEXTURE_WRAP_R, GFXGLTextureAddress[ssd.addressModeW]);
if (ssd.addressModeU == GFXAddressBorder ||
ssd.addressModeV == GFXAddressBorder ||
ssd.addressModeW == GFXAddressBorder)
{
LinearColorF bc = LinearColorF(ssd.borderColor);
GLfloat color[4] = { bc.red, bc.green, bc.blue, bc.alpha };
glSamplerParameterfv(id, GL_TEXTURE_BORDER_COLOR, color);
}
//compare modes //compare modes
const bool comparison = ssd.samplerFunc != GFXCmpNever; const bool comparison = ssd.samplerFunc != GFXCmpNever;
glSamplerParameteri(id, GL_TEXTURE_COMPARE_MODE, comparison ? GL_COMPARE_R_TO_TEXTURE_ARB : GL_NONE ); glSamplerParameteri(id, GL_TEXTURE_COMPARE_MODE, comparison ? GL_COMPARE_R_TO_TEXTURE_ARB : GL_NONE );

3
Engine/source/gfx/gl/gfxGLTextureObject.cpp
View file

@ -220,9 +220,6 @@ void GFXGLTextureObject::initSamplerState(const GFXSamplerStateDesc &ssd)
if(static_cast< GFXGLDevice* >( GFX )->supportsAnisotropic() ) if(static_cast< GFXGLDevice* >( GFX )->supportsAnisotropic() )
glTexParameterf(mBinding, GL_TEXTURE_MAX_ANISOTROPY_EXT, ssd.maxAnisotropy); glTexParameterf(mBinding, GL_TEXTURE_MAX_ANISOTROPY_EXT, ssd.maxAnisotropy);
LinearColorF bc = LinearColorF(ssd.borderColor);
GLfloat color[4]={bc.red, bc.green, bc.blue, bc.alpha};
glTexParameterfv(mBinding, GL_TEXTURE_BORDER_COLOR, color);
mNeedInitSamplerState = false; mNeedInitSamplerState = false;
mSampler = ssd; mSampler = ssd;
} }