MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Fix initialization of multisample textures.

Browse Source
This commit is contained in:
Sergey Lipskiy 2017-02-12 16:05:02 +07:00
parent 97acd7d071
commit b9453474b6
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/DepthBuffer.cpp
View File

@ -165,10 +165,10 @@ void DepthBuffer::_initDepthBufferTexture(FrameBuffer * _pBuffer, CachedTexture
gfxContext.init2DTexture(params); gfxContext.init2DTexture(params);
} }
_pTexture->frameBufferTexture = _multisample ? CachedTexture::fbMultiSample : CachedTexture::fbOneSample; _pTexture->frameBufferTexture = _multisample ? CachedTexture::fbMultiSample : CachedTexture::fbOneSample;
{ if (!_multisample) {
Context::TexParameters params; Context::TexParameters params;
params.handle = _pTexture->name; params.handle = _pTexture->name;
params.target = _multisample ? textureTarget::TEXTURE_2D_MULTISAMPLE : textureTarget::TEXTURE_2D; params.target = textureTarget::TEXTURE_2D;
params.textureUnitIndex = textureIndices::Tex[0]; params.textureUnitIndex = textureIndices::Tex[0];
params.minFilter = textureParameters::FILTER_NEAREST; params.minFilter = textureParameters::FILTER_NEAREST;
params.magFilter = textureParameters::FILTER_NEAREST; params.magFilter = textureParameters::FILTER_NEAREST;

4
src/FrameBuffer.cpp
View File

@ -106,10 +106,10 @@ void FrameBuffer::_setAndAttachTexture(ObjectHandle _fbo, CachedTexture *_pTextu
} }
gfxContext.init2DTexture(params); gfxContext.init2DTexture(params);
} }
{ if (!_multisampling) {
Context::TexParameters params; Context::TexParameters params;
params.handle = _pTexture->name; params.handle = _pTexture->name;
params.target = _multisampling ? textureTarget::TEXTURE_2D_MULTISAMPLE : textureTarget::TEXTURE_2D; params.target = textureTarget::TEXTURE_2D;
params.textureUnitIndex = textureIndices::Tex[_t]; params.textureUnitIndex = textureIndices::Tex[_t];
params.minFilter = textureParameters::FILTER_NEAREST; params.minFilter = textureParameters::FILTER_NEAREST;
params.magFilter = textureParameters::FILTER_NEAREST; params.magFilter = textureParameters::FILTER_NEAREST;

2
src/Textures.cpp
View File

@ -1497,8 +1497,6 @@ void TextureCache::activateMSDummy(u32 _t)
params.handle = m_pMSDummy->name; params.handle = m_pMSDummy->name;
params.target = textureTarget::TEXTURE_2D_MULTISAMPLE; params.target = textureTarget::TEXTURE_2D_MULTISAMPLE;
params.textureUnitIndex = textureIndices::MSTex[_t]; params.textureUnitIndex = textureIndices::MSTex[_t];
params.minFilter = textureParameters::FILTER_NEAREST;
params.magFilter = textureParameters::FILTER_NEAREST;
gfxContext.setTextureParameters(params); gfxContext.setTextureParameters(params);
} }