TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,16 @@ GFXGLStateBlock::GFXGLStateBlock(const GFXStateBlockDesc& desc) :
glSamplerParameteri(id, GL_TEXTURE_WRAP_S, GFXGLTextureAddress[ssd.addressModeU]);
glSamplerParameteri(id, GL_TEXTURE_WRAP_T, GFXGLTextureAddress[ssd.addressModeV]);
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
const bool comparison = ssd.samplerFunc != GFXCmpNever;
glSamplerParameteri(id, GL_TEXTURE_COMPARE_MODE, comparison ? GL_COMPARE_R_TO_TEXTURE_ARB : GL_NONE );

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

@ -219,10 +219,7 @@ void GFXGLTextureObject::initSamplerState(const GFXSamplerStateDesc &ssd)
glTexParameteri(mBinding, GL_TEXTURE_WRAP_R, GFXGLTextureAddress[ssd.addressModeW]);
if(static_cast< GFXGLDevice* >( GFX )->supportsAnisotropic() )
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;
mSampler = ssd;
}