From 0f94ac9189e6e55602e8d81e07276ec69272109d Mon Sep 17 00:00:00 2001
From: Herman Semenov <GermanAizek@yandex.ru>
Date: Tue, 2 Apr 2024 14:25:26 +0300
Subject: [PATCH] Cleanup excess redefines and maybe fixed result in HLE
 sceIo::sceIoGetDevType()

---
 Common/GPU/Shader.cpp | 1 -
 Core/HLE/sceIo.cpp    | 3 ++-
 GPU/GLES/GPU_GLES.cpp | 1 -
 UI/SavedataScreen.cpp | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Common/GPU/Shader.cpp b/Common/GPU/Shader.cpp
index 147db1a1c0..1310c96118 100644
--- a/Common/GPU/Shader.cpp
+++ b/Common/GPU/Shader.cpp
@@ -68,7 +68,6 @@ void ShaderLanguageDesc::Init(ShaderLanguage lang) {
 		gles = true;
 		forceMatrix4x4 = true;
 		glslES30 = true;
-		texelFetch = "texelFetch";
 		break;
 	case GLSL_VULKAN:
 		fragColor0 = "fragColor0";
diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp
index ef2ba44cbf..bfd1da46f2 100644
--- a/Core/HLE/sceIo.cpp
+++ b/Core/HLE/sceIo.cpp
@@ -1325,7 +1325,8 @@ static u32 sceIoGetDevType(int id) {
 		WARN_LOG(SCEIO, "sceIoGetDevType(%d - %s)", id, f->fullpath.c_str());
 		if (f->isTTY)
 			result = (u32)PSPDevType::FILE;
-		result = (u32)pspFileSystem.DevType(f->handle) & (u32)PSPDevType::EMU_MASK;
+		else
+			result = (u32)pspFileSystem.DevType(f->handle) & (u32)PSPDevType::EMU_MASK;
 	} else {
 		ERROR_LOG(SCEIO, "sceIoGetDevType: unknown id %d", id);
 		result = SCE_KERNEL_ERROR_BADF;
diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp
index eed544a18d..510cd58e91 100644
--- a/GPU/GLES/GPU_GLES.cpp
+++ b/GPU/GLES/GPU_GLES.cpp
@@ -58,7 +58,6 @@ GPU_GLES::GPU_GLES(GraphicsContext *gfxCtx, Draw::DrawContext *draw)
 	textureCache_ = textureCacheGL_;
 	drawEngineCommon_ = &drawEngine_;
 	shaderManager_ = shaderManagerGL_;
-	drawEngineCommon_ = &drawEngine_;
 
 	drawEngine_.SetShaderManager(shaderManagerGL_);
 	drawEngine_.SetTextureCache(textureCacheGL_);
diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp
index 6350d3aead..2eed2c9039 100644
--- a/UI/SavedataScreen.cpp
+++ b/UI/SavedataScreen.cpp
@@ -338,7 +338,6 @@ void SavedataButton::Draw(UIContext &dc) {
 	}
 
 	int txOffset = down_ ? 4 : 0;
-	txOffset = 0;
 
 	Bounds overlayBounds = bounds_;