From e325902bac87273df43c05c0b0eaac1ef7b08c80 Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Wed, 19 Jul 2023 13:36:14 +0100 Subject: [PATCH 1/3] init commit --- Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp | 8 ++++---- Engine/source/gfx/gfxStateBlock.cpp | 1 + Engine/source/gfx/gfxStateBlock.h | 2 ++ Engine/source/gfx/gl/gfxGLEnumTranslate.cpp | 2 +- Engine/source/gfx/gl/gfxGLTextureObject.cpp | 1 + Engine/source/gfx/sim/gfxStateBlockData.cpp | 2 ++ 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp index 23844665b..f2197c929 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp +++ b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp @@ -186,10 +186,10 @@ GFXD3D11StateBlock::GFXD3D11StateBlock(const GFXStateBlockDesc& desc) else mSamplerDesc[i].Filter = comparison ? D3D11_FILTER_COMPARISON_ANISOTROPIC : D3D11_FILTER_ANISOTROPIC; - mSamplerDesc[i].BorderColor[0] = 1.0f; - mSamplerDesc[i].BorderColor[1] = 1.0f; - mSamplerDesc[i].BorderColor[2] = 1.0f; - mSamplerDesc[i].BorderColor[3] = 1.0f; + mSamplerDesc[i].BorderColor[0] = gfxSamplerState.borderColor.red; + mSamplerDesc[i].BorderColor[1] = gfxSamplerState.borderColor.green; + mSamplerDesc[i].BorderColor[2] = gfxSamplerState.borderColor.blue; + mSamplerDesc[i].BorderColor[3] = gfxSamplerState.borderColor.alpha; mSamplerDesc[i].ComparisonFunc = GFXD3D11CmpFunc[gfxSamplerState.samplerFunc]; hr = D3D11DEVICE->CreateSamplerState(&mSamplerDesc[i], &mSamplerStates[i]); diff --git a/Engine/source/gfx/gfxStateBlock.cpp b/Engine/source/gfx/gfxStateBlock.cpp index 61ff8958c..80d3289ee 100644 --- a/Engine/source/gfx/gfxStateBlock.cpp +++ b/Engine/source/gfx/gfxStateBlock.cpp @@ -278,6 +278,7 @@ GFXSamplerStateDesc::GFXSamplerStateDesc() samplerFunc = GFXCmpNever; maxAnisotropy = 1; mipLODBias = 0.0f; + borderColor = LinearColorF::WHITE; } GFXSamplerStateDesc GFXSamplerStateDesc::getWrapLinear() diff --git a/Engine/source/gfx/gfxStateBlock.h b/Engine/source/gfx/gfxStateBlock.h index f8f19f360..5cefd381a 100644 --- a/Engine/source/gfx/gfxStateBlock.h +++ b/Engine/source/gfx/gfxStateBlock.h @@ -49,6 +49,8 @@ struct GFXSamplerStateDesc GFXCmpFunc samplerFunc; + LinearColorF borderColor; + /// The maximum anisotropy used when one of the filter types /// is set to anisotropic. /// diff --git a/Engine/source/gfx/gl/gfxGLEnumTranslate.cpp b/Engine/source/gfx/gl/gfxGLEnumTranslate.cpp index 93c8ee57c..b5b56fc6f 100644 --- a/Engine/source/gfx/gl/gfxGLEnumTranslate.cpp +++ b/Engine/source/gfx/gl/gfxGLEnumTranslate.cpp @@ -93,7 +93,7 @@ void GFXGLEnumTranslate::init() GFXGLTextureAddress[GFXAddressWrap] = GL_REPEAT; GFXGLTextureAddress[GFXAddressMirror] = GL_REPEAT; GFXGLTextureAddress[GFXAddressClamp] = GL_CLAMP_TO_EDGE; - GFXGLTextureAddress[GFXAddressBorder] = GL_REPEAT; + GFXGLTextureAddress[GFXAddressBorder] = GL_CLAMP_TO_BORDER; GFXGLTextureAddress[GFXAddressMirrorOnce] = GL_REPEAT; // Stencil ops diff --git a/Engine/source/gfx/gl/gfxGLTextureObject.cpp b/Engine/source/gfx/gl/gfxGLTextureObject.cpp index 198292dbc..9d60401cc 100644 --- a/Engine/source/gfx/gl/gfxGLTextureObject.cpp +++ b/Engine/source/gfx/gl/gfxGLTextureObject.cpp @@ -220,6 +220,7 @@ void GFXGLTextureObject::initSamplerState(const GFXSamplerStateDesc &ssd) if(static_cast< GFXGLDevice* >( GFX )->supportsAnisotropic() ) glTexParameterf(mBinding, GL_TEXTURE_MAX_ANISOTROPY_EXT, ssd.maxAnisotropy); + glTexParameterfv(mBinding, GL_TEXTURE_BORDER_COLOR, ssd.borderColor); mNeedInitSamplerState = false; mSampler = ssd; } diff --git a/Engine/source/gfx/sim/gfxStateBlockData.cpp b/Engine/source/gfx/sim/gfxStateBlockData.cpp index 9b015559d..ffbd36f76 100644 --- a/Engine/source/gfx/sim/gfxStateBlockData.cpp +++ b/Engine/source/gfx/sim/gfxStateBlockData.cpp @@ -315,6 +315,8 @@ void GFXSamplerStateData::initPersistFields() endGroup( "Filter State" ); + addField("borderColor", TypeColorF, Offset(mState.borderColor, GFXSamplerStateData), ""); + addField("samplerFunc", TypeGFXCmpFunc, Offset(mState.samplerFunc, GFXSamplerStateData), "Compares sampled data against existing sampled data. The default is GFXCmpNever."); } From 63b2aba46771ceee484b4f27649dc167ce8c86a5 Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Wed, 19 Jul 2023 15:41:24 +0100 Subject: [PATCH 2/3] Apply suggestions from code review --- Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp | 9 +++++---- Engine/source/gfx/gfxStateBlock.cpp | 2 +- Engine/source/gfx/gfxStateBlock.h | 2 +- Engine/source/gfx/gl/gfxGLTextureObject.cpp | 4 +++- Engine/source/gfx/sim/gfxStateBlockData.cpp | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp index f2197c929..a7a3789b7 100644 --- a/Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp +++ b/Engine/source/gfx/D3D11/gfxD3D11StateBlock.cpp @@ -186,10 +186,11 @@ GFXD3D11StateBlock::GFXD3D11StateBlock(const GFXStateBlockDesc& desc) else mSamplerDesc[i].Filter = comparison ? D3D11_FILTER_COMPARISON_ANISOTROPIC : D3D11_FILTER_ANISOTROPIC; - mSamplerDesc[i].BorderColor[0] = gfxSamplerState.borderColor.red; - mSamplerDesc[i].BorderColor[1] = gfxSamplerState.borderColor.green; - mSamplerDesc[i].BorderColor[2] = gfxSamplerState.borderColor.blue; - mSamplerDesc[i].BorderColor[3] = gfxSamplerState.borderColor.alpha; + LinearColorF bc = LinearColorF(gfxSamplerState.borderColor); + mSamplerDesc[i].BorderColor[0] = bc.red; + mSamplerDesc[i].BorderColor[1] = bc.green; + mSamplerDesc[i].BorderColor[2] = bc.blue; + mSamplerDesc[i].BorderColor[3] = bc.alpha; mSamplerDesc[i].ComparisonFunc = GFXD3D11CmpFunc[gfxSamplerState.samplerFunc]; hr = D3D11DEVICE->CreateSamplerState(&mSamplerDesc[i], &mSamplerStates[i]); diff --git a/Engine/source/gfx/gfxStateBlock.cpp b/Engine/source/gfx/gfxStateBlock.cpp index 80d3289ee..66f19e54c 100644 --- a/Engine/source/gfx/gfxStateBlock.cpp +++ b/Engine/source/gfx/gfxStateBlock.cpp @@ -278,7 +278,7 @@ GFXSamplerStateDesc::GFXSamplerStateDesc() samplerFunc = GFXCmpNever; maxAnisotropy = 1; mipLODBias = 0.0f; - borderColor = LinearColorF::WHITE; + borderColor = ColorI::WHITE; } GFXSamplerStateDesc GFXSamplerStateDesc::getWrapLinear() diff --git a/Engine/source/gfx/gfxStateBlock.h b/Engine/source/gfx/gfxStateBlock.h index 5cefd381a..21ca5b4d5 100644 --- a/Engine/source/gfx/gfxStateBlock.h +++ b/Engine/source/gfx/gfxStateBlock.h @@ -49,7 +49,7 @@ struct GFXSamplerStateDesc GFXCmpFunc samplerFunc; - LinearColorF borderColor; + ColorI borderColor; /// The maximum anisotropy used when one of the filter types /// is set to anisotropic. diff --git a/Engine/source/gfx/gl/gfxGLTextureObject.cpp b/Engine/source/gfx/gl/gfxGLTextureObject.cpp index 9d60401cc..07f72802f 100644 --- a/Engine/source/gfx/gl/gfxGLTextureObject.cpp +++ b/Engine/source/gfx/gl/gfxGLTextureObject.cpp @@ -220,7 +220,9 @@ void GFXGLTextureObject::initSamplerState(const GFXSamplerStateDesc &ssd) if(static_cast< GFXGLDevice* >( GFX )->supportsAnisotropic() ) glTexParameterf(mBinding, GL_TEXTURE_MAX_ANISOTROPY_EXT, ssd.maxAnisotropy); - glTexParameterfv(mBinding, GL_TEXTURE_BORDER_COLOR, ssd.borderColor); + 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; } diff --git a/Engine/source/gfx/sim/gfxStateBlockData.cpp b/Engine/source/gfx/sim/gfxStateBlockData.cpp index ffbd36f76..853250221 100644 --- a/Engine/source/gfx/sim/gfxStateBlockData.cpp +++ b/Engine/source/gfx/sim/gfxStateBlockData.cpp @@ -315,7 +315,7 @@ void GFXSamplerStateData::initPersistFields() endGroup( "Filter State" ); - addField("borderColor", TypeColorF, Offset(mState.borderColor, GFXSamplerStateData), ""); + addField("borderColor", TypeColorI, Offset(mState.borderColor, GFXSamplerStateData), ""); addField("samplerFunc", TypeGFXCmpFunc, Offset(mState.samplerFunc, GFXSamplerStateData), "Compares sampled data against existing sampled data. The default is GFXCmpNever."); From e0119efbb5e00a97a93b27d5cf07ccbee3f0fb1d Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Wed, 19 Jul 2023 16:33:01 +0100 Subject: [PATCH 3/3] move border to gfxglstateblock --- Engine/source/gfx/gl/gfxGLStateBlock.cpp | 11 ++++++++++- Engine/source/gfx/gl/gfxGLTextureObject.cpp | 5 +---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Engine/source/gfx/gl/gfxGLStateBlock.cpp b/Engine/source/gfx/gl/gfxGLStateBlock.cpp index 12eab71b0..1d2968776 100644 --- a/Engine/source/gfx/gl/gfxGLStateBlock.cpp +++ b/Engine/source/gfx/gl/gfxGLStateBlock.cpp @@ -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 ); diff --git a/Engine/source/gfx/gl/gfxGLTextureObject.cpp b/Engine/source/gfx/gl/gfxGLTextureObject.cpp index 07f72802f..06ee43dc0 100644 --- a/Engine/source/gfx/gl/gfxGLTextureObject.cpp +++ b/Engine/source/gfx/gl/gfxGLTextureObject.cpp @@ -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; }