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

Fix noise-based effects on texrects in "texrect in native res" mode.

Browse Source 
Fixed GLideN64 3.0 Regression (Noise) #1740
This commit is contained in:
Sergey Lipskiy 2018-03-21 23:06:38 +07:00
parent 3289bd378b
commit cbbc83ac96
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp
View File

@ -402,6 +402,11 @@ public:
void update(bool _force) override
{
if (dwnd().getDrawer().isTexrectDrawerMode()) {
uScreenScale.set(1.0f, 1.0f, _force);
return;
}
FrameBuffer * pBuffer = frameBufferList().getCurrent();
if (pBuffer == nullptr)
uScreenScale.set(dwnd().getScaleX(), dwnd().getScaleY(), _force);

2
src/GraphicsDrawer.h
View File

@ -153,6 +153,8 @@ public:
void flush() { m_texrectDrawer.draw(); }
bool isTexrectDrawerMode() const { return !m_texrectDrawer.isEmpty(); }
private:
friend class DisplayWindow;
friend TexrectDrawer;

8
src/TexrectDrawer.cpp
View File

@ -146,6 +146,7 @@ void TexrectDrawer::add()
}
if (m_numRects == 0) {
m_numRects = 1;
m_pBuffer = frameBufferList().getCurrent();
m_otherMode = gDP.otherMode._u64;
m_mux = gDP.combine.mux;
@ -157,7 +158,9 @@ void TexrectDrawer::add()
m_lrx = m_max_lrx = pRect[3].x;
m_lry = m_max_lry = pRect[3].y;
CombinerInfo::get().update();
CombinerInfo & cmbInfo = CombinerInfo::get();
cmbInfo.update();
cmbInfo.updateParameters();
gfxContext.enableDepthWrite(false);
gfxContext.enable(enable::DEPTH_TEST, false);
gfxContext.enable(enable::BLEND, false);
@ -167,6 +170,8 @@ void TexrectDrawer::add()
gfxContext.setScissor((s32)gDP.scissor.ulx, (s32)gDP.scissor.uly, (s32)(gDP.scissor.lrx - gDP.scissor.ulx), (s32)(gDP.scissor.lry - gDP.scissor.uly));
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, m_FBO);
} else {
++m_numRects;
}
if (bDownUp) {
@ -187,7 +192,6 @@ void TexrectDrawer::add()
coords.x = pRect[3].x;
coords.y = pRect[3].y;
m_vecRectCoords.push_back(coords);
++m_numRects;
Context::DrawRectParameters rectParams;
rectParams.mode = drawmode::TRIANGLE_STRIP;