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

Use correct screen scale when native resolution used.

Browse Source
This commit is contained in:
Sergey Lipskiy 2016-03-17 16:05:26 +06:00
parent f6be5fd39f
commit 16f5bfa423
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/GLES2/GLSLCombiner_gles2.cpp
View File

@ -408,7 +408,10 @@ void ShaderCombiner::updateDitherMode(bool _bForce)
const int nDither = (gDP.otherMode.cycleType < G_CYC_COPY) && (gDP.otherMode.alphaCompare == G_AC_DITHER) ? 1 : 0;
if ((m_nInputs & (1 << NOISE)) + nDither != 0) {
m_uniforms.uScreenScale.set(video().getScaleX(), video().getScaleY(), _bForce);
if (config.frameBufferEmulation.nativeResFactor == 0)
m_uniforms.uScreenScale.set(video().getScaleX(), video().getScaleY(), _bForce);
else
m_uniforms.uScreenScale.set(float(config.frameBufferEmulation.nativeResFactor), float(config.frameBufferEmulation.nativeResFactor), _bForce);
noiseTex.update();
}
}

5
src/OGL3X/GLSLCombiner_ogl3x.cpp
View File

@ -664,7 +664,10 @@ void ShaderCombiner::updateDitherMode(bool _bForce)
const int nDither = (gDP.otherMode.cycleType < G_CYC_COPY) && (gDP.otherMode.colorDither == G_CD_NOISE || gDP.otherMode.alphaDither == G_AD_NOISE || gDP.otherMode.alphaCompare == G_AC_DITHER) ? 1 : 0;
if ((m_nInputs & (1 << NOISE)) + nDither != 0) {
m_uniforms.uScreenScale.set(video().getScaleX(), video().getScaleY(), _bForce);
if (config.frameBufferEmulation.nativeResFactor == 0)
m_uniforms.uScreenScale.set(video().getScaleX(), video().getScaleY(), _bForce);
else
m_uniforms.uScreenScale.set(float(config.frameBufferEmulation.nativeResFactor), float(config.frameBufferEmulation.nativeResFactor), _bForce);
noiseTex.update();
}
}

5
src/OpenGL.cpp
View File

@ -846,7 +846,10 @@ void OGLRender::drawLine(int _v0, int _v1, float _width)
unsigned short elem[2];
elem[0] = _v0;
elem[1] = _v1;
glLineWidth(_width * video().getScaleX());
if (config.frameBufferEmulation.nativeResFactor == 0)
glLineWidth(_width * video().getScaleX());
else
glLineWidth(_width * config.frameBufferEmulation.nativeResFactor);
glDrawElements(GL_LINES, 2, GL_UNSIGNED_SHORT, elem);
}