Skip to content

Commit 685470a

Browse files
committed
Revert visual fixups shaders offset
1 parent 21b22d1 commit 685470a

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramBuilder.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ class VertexShaderTexturedTriangle : public ShaderPart
260260
" \n"
261261
"uniform int uTexturePersp; \n";
262262

263-
if (!LegacySm64ToolsHacks) {
263+
if (0) { // LegacySm64ToolsHacks
264264
m_part += "uniform lowp int uTextureFilterMode; \n";
265265
}
266266

@@ -287,7 +287,7 @@ class VertexShaderTexturedTriangle : public ShaderPart
287287
" vec2 texCoordOut = texCoord*uCacheShiftScale[idx]; \n"
288288
" texCoordOut -= uTexOffset[idx]; \n";
289289

290-
m_part += (LegacySm64ToolsHacks) ?
290+
m_part += (1) ? // LegacySm64ToolsHacks
291291
" return (uCacheOffset[idx] + texCoordOut)* uCacheScale[idx];\n"
292292
:
293293
" texCoordOut += uCacheOffset[idx]; \n"

src/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace glsl {
2020
bool _saveCombinerKeys(const graphics::Combiners & _combiners) const;
2121
bool _loadFromCombinerKeys(graphics::Combiners & _combiners);
2222

23-
const u32 m_formatVersion = 0x28U;
23+
const u32 m_formatVersion = 0x29U;
2424
const u32 m_keysFormatVersion = 0x04;
2525
const opengl::GLInfo & m_glinfo;
2626
opengl::CachedUseProgram * m_useProgram;

src/Textures.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,7 @@ void TextureCache::_updateBackground()
15071507
pCurrent->shiftScaleS = 1.0f;
15081508
pCurrent->shiftScaleT = 1.0f;
15091509

1510-
if (LegacySm64ToolsHacks) {
1510+
if (1) { // LegacySm64ToolsHacks
15111511
pCurrent->offsetS = 0.5f;
15121512
pCurrent->offsetT = 0.5f;
15131513
}
@@ -1667,7 +1667,7 @@ void TextureCache::update(u32 _t)
16671667
pCurrent->scaleS = 1.0f / (f32)(pCurrent->realWidth);
16681668
pCurrent->scaleT = 1.0f / (f32)(pCurrent->realHeight);
16691669

1670-
if (LegacySm64ToolsHacks) {
1670+
if (1) { // LegacySm64ToolsHacks
16711671
pCurrent->offsetS = 0.5f;
16721672
pCurrent->offsetT = 0.5f;
16731673
}

src/windows/ZilmarAPIImpl_windows.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void PluginAPI::GetDllInfo(PLUGIN_INFO * PluginInfo)
2828
{
2929
PluginInfo->Version = 0x103;
3030
PluginInfo->Type = PLUGIN_TYPE_GFX;
31-
sprintf(PluginInfo->Name, "ANGLE %s v4.3.24", pluginName);
31+
sprintf(PluginInfo->Name, "ANGLE %s v4.3.26", pluginName);
3232
PluginInfo->NormalMemory = FALSE;
3333
PluginInfo->MemoryBswaped = TRUE;
3434
}

0 commit comments

Comments
 (0)