mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-04 10:03:36 +00:00
Fixed Combiner_UpdateCombineFBInfo() call.
This commit is contained in:
parent
c95bb33216
commit
898a189f89
|
@ -119,13 +119,14 @@ void Combiner_UpdateCombineColors()
|
||||||
|
|
||||||
void Combiner_UpdateCombineFBInfo()
|
void Combiner_UpdateCombineFBInfo()
|
||||||
{
|
{
|
||||||
combiner.current->compiled->UpdateFBInfo();
|
combiner.current->compiled->UpdateFBInfo(true);
|
||||||
|
gDP.changed &= ~CHANGED_FB_TEXTURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Combiner_UpdateCombineDepthInfo()
|
void Combiner_UpdateCombineDepthInfo()
|
||||||
{
|
{
|
||||||
if (combiner.current != NULL)
|
if (combiner.current != NULL)
|
||||||
combiner.current->compiled->UpdateDepthInfo();
|
combiner.current->compiled->UpdateDepthInfo(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Combiner_UpdateAlphaTestInfo()
|
void Combiner_UpdateAlphaTestInfo()
|
||||||
|
|
|
@ -574,6 +574,7 @@ void FrameBuffer_ActivateBufferTexture( s16 t, FrameBuffer *buffer )
|
||||||
|
|
||||||
// FrameBuffer_RenderBuffer(buffer->startAddress);
|
// FrameBuffer_RenderBuffer(buffer->startAddress);
|
||||||
TextureCache_ActivateTexture( t, buffer->texture );
|
TextureCache_ActivateTexture( t, buffer->texture );
|
||||||
|
gDP.changed |= CHANGED_FB_TEXTURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void FrameBuffer_ActivateBufferTextureBG( s16 t, FrameBuffer *buffer )
|
void FrameBuffer_ActivateBufferTextureBG( s16 t, FrameBuffer *buffer )
|
||||||
|
@ -589,6 +590,7 @@ void FrameBuffer_ActivateBufferTextureBG( s16 t, FrameBuffer *buffer )
|
||||||
|
|
||||||
// FrameBuffer_RenderBuffer(buffer->startAddress);
|
// FrameBuffer_RenderBuffer(buffer->startAddress);
|
||||||
TextureCache_ActivateTexture( t, buffer->texture );
|
TextureCache_ActivateTexture( t, buffer->texture );
|
||||||
|
gDP.changed |= CHANGED_FB_TEXTURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef GLES2
|
#ifndef GLES2
|
||||||
|
|
|
@ -777,6 +777,12 @@ void OGL_UpdateStates()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (gDP.changed & CHANGED_FB_TEXTURE)
|
||||||
|
Combiner_UpdateCombineFBInfo();
|
||||||
|
|
||||||
|
if ((gDP.changed & CHANGED_RENDERMODE) || (gSP.geometryMode & G_ZBUFFER))
|
||||||
|
Combiner_UpdateCombineDepthInfo();
|
||||||
|
|
||||||
if ((gDP.changed & CHANGED_RENDERMODE) || (gDP.changed & CHANGED_CYCLETYPE))
|
if ((gDP.changed & CHANGED_RENDERMODE) || (gDP.changed & CHANGED_CYCLETYPE))
|
||||||
{
|
{
|
||||||
#define OLD_BLENDMODE
|
#define OLD_BLENDMODE
|
||||||
|
|
1
gDP.h
1
gDP.h
|
@ -12,6 +12,7 @@
|
||||||
#define CHANGED_COMBINE 0x040
|
#define CHANGED_COMBINE 0x040
|
||||||
#define CHANGED_ALPHACOMPARE 0x080
|
#define CHANGED_ALPHACOMPARE 0x080
|
||||||
#define CHANGED_FOGCOLOR 0x100
|
#define CHANGED_FOGCOLOR 0x100
|
||||||
|
#define CHANGED_FB_TEXTURE 0x200
|
||||||
|
|
||||||
#define TEXTUREMODE_NORMAL 0
|
#define TEXTUREMODE_NORMAL 0
|
||||||
#define TEXTUREMODE_TEXRECT 1
|
#define TEXTUREMODE_TEXRECT 1
|
||||||
|
|
Loading…
Reference in New Issue
Block a user