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

Workaround for Mupen64Plus issue with initialization

Browse Source
This commit is contained in:
Sergey Lipskiy 2015-02-11 15:32:59 +06:00
parent d95d04e91e
commit 17b2db7031
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FrameBuffer.cpp
View File

@ -496,7 +496,6 @@ void FrameBufferList::renderBuffer(u32 _address)
GLint srcCoord[4] = { 0, (GLint)(srcY0*srcScaleY), ogl.getWidth(), (GLint)(srcY1*srcScaleY) };
GLint dstCoord[4] = { hOffset, vOffset + (GLint)(dstY0*dstScaleY), hOffset + ogl.getWidth(), vOffset + (GLint)(dstY1*dstScaleY) };
assert(!isGLError());
GLenum filter = GL_LINEAR;
if (config.video.multisampling != 0) {
if (dstPartHeight > 0 ||
@ -508,7 +507,6 @@ void FrameBufferList::renderBuffer(u32 _address)
} else
filter = GL_NEAREST;
}
assert(!isGLError());
if (!ogl.isFullscreen())
vOffset += ogl.getHeightOffset();

2
Textures.cpp
View File

@ -704,7 +704,6 @@ bool TextureCache::_loadHiresBackground(CachedTexture *_pTexture)
if (!TFH.isInited())
return false;
isGLError(); // Workaround for Mupen64Plus;
u8 * addr = (u8*)(RDRAM + gSP.bgImage.address);
int tile_width = gSP.bgImage.width;
int tile_height = gSP.bgImage.height;
@ -818,7 +817,6 @@ bool TextureCache::_loadHiresTexture(u32 _tile, CachedTexture *_pTexture)
if (config.textureFilter.txHiresEnable == 0 || !TFH.isInited())
return false;
isGLError(); // Workaround for Mupen64Plus;
gDPLoadTileInfo & info = gDP.loadInfo[_pTexture->tMem];
int bpl;

4
VI.cpp
View File

@ -82,6 +82,10 @@ void VI_UpdateSize()
void VI_UpdateScreen()
{
static u32 uNumCurFrameIsShown = 0;
if (VI.lastOrigin == -1) // Workaround for Mupen64Plus issue with initialization
isGLError();
glFinish();
OGLVideo & ogl = video();