Merge pull request #442 from rextimmy/gfx_cleanup

Removed old fixed function code from GFX.
This commit is contained in:
Brian Roberts 2021-01-05 03:00:04 -06:00 committed by GitHub
commit 4de1449c4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 99 additions and 1692 deletions

View file

@ -960,7 +960,6 @@ bool VolumetricFog::setupRenderer()
descD.samplers[0].magFilter = GFXTextureFilterLinear;
descD.samplers[0].minFilter = GFXTextureFilterLinear;
descD.samplers[0].mipFilter = GFXTextureFilterLinear;
descD.samplers[0].textureColorOp = GFXTOPDisable;
// DepthBuffer sampler
descD.samplers[1].addressModeU = GFXAddressClamp;
@ -969,7 +968,6 @@ bool VolumetricFog::setupRenderer()
descD.samplers[1].magFilter = GFXTextureFilterLinear;
descD.samplers[1].minFilter = GFXTextureFilterLinear;
descD.samplers[1].mipFilter = GFXTextureFilterLinear;
descD.samplers[1].textureColorOp = GFXTOPModulate;
// FrontBuffer sampler
descD.samplers[2].addressModeU = GFXAddressClamp;
@ -978,7 +976,6 @@ bool VolumetricFog::setupRenderer()
descD.samplers[2].magFilter = GFXTextureFilterLinear;
descD.samplers[2].minFilter = GFXTextureFilterLinear;
descD.samplers[2].mipFilter = GFXTextureFilterLinear;
descD.samplers[2].textureColorOp = GFXTOPModulate;
// animated density modifier map sampler
descD.samplers[3].addressModeU = GFXAddressWrap;
@ -987,7 +984,6 @@ bool VolumetricFog::setupRenderer()
descD.samplers[3].magFilter = GFXTextureFilterLinear;
descD.samplers[3].minFilter = GFXTextureFilterLinear;
descD.samplers[3].mipFilter = GFXTextureFilterLinear;
descD.samplers[3].textureColorOp = GFXTOPModulate;
dMemcpy(&descF, &descD, sizeof(GFXStateBlockDesc));
descF.setCullMode(GFXCullCCW);

View file

@ -150,7 +150,6 @@ bool BasicClouds::onAdd()
desc.samplers[0].magFilter = GFXTextureFilterLinear;
desc.samplers[0].minFilter = GFXTextureFilterLinear;
desc.samplers[0].mipFilter = GFXTextureFilterLinear;
desc.samplers[0].textureColorOp = GFXTOPModulate;
mStateblock = GFX->createStateBlock( desc );
}

View file

@ -170,7 +170,6 @@ bool CloudLayer::onAdd()
desc.samplers[0].magFilter = GFXTextureFilterLinear;
desc.samplers[0].minFilter = GFXTextureFilterLinear;
desc.samplers[0].mipFilter = GFXTextureFilterLinear;
desc.samplers[0].textureColorOp = GFXTOPModulate;
mStateblock = GFX->createStateBlock( desc );
}

View file

@ -2254,7 +2254,7 @@ void River::_makeHighLODBuffers()
}
}
if ( numVerts > MAX_DYNAMIC_VERTS || numTriangles * 3 > MAX_DYNAMIC_INDICES )
if ( numVerts > GFX_MAX_DYNAMIC_VERTS || numTriangles * 3 > GFX_MAX_DYNAMIC_INDICES )
{
mVB_high = NULL;
mPB_high = NULL;