ogles 2 driver: Delete some dead code

grepping for IRR_COMPILE_GLES2_COMMON gives no other results COGLESCoreExtensionHandler is only used through COpenGL3ExtensionHandler
grorp · Nov 7, 2024 · b32425a · b32425a
1 parent db5d42a
commit b32425a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 108 deletions.
diff --git a/irr/src/COGLESCoreExtensionHandler.h b/irr/src/COGLESCoreExtensionHandler.h
@@ -56,7 +56,7 @@ class COGLESCoreExtensionHandler
 	};
 
 	COGLESCoreExtensionHandler() :
-			Version(0), MaxAnisotropy(1), MaxIndices(0xffff),
+			MaxAnisotropy(1), MaxIndices(0xffff),
 			MaxTextureSize(1), MaxTextureLODBias(0.f), StencilBuffer(false)
 	{
 		for (u32 i = 0; i < IRR_OGLES_Feature_Count; ++i)
@@ -81,11 +81,6 @@ class COGLESCoreExtensionHandler
 			os::Printer::log(getFeatureString(i), FeatureAvailable[i] ? " true" : " false");
 	}
 
-	bool queryGLESFeature(EOGLESFeatures feature) const
-	{
-		return FeatureAvailable[feature];
-	}
-
 protected:
 	const char *getFeatureString(size_t index) const
 	{
@@ -123,57 +118,8 @@ class COGLESCoreExtensionHandler
 		return OGLESFeatureStrings[index];
 	}
 
-	void getGLVersion()
-	{
-		Version = 0;
-		s32 multiplier = 100;
-
-		core::stringc version(glGetString(GL_VERSION));
-
-		for (u32 i = 0; i < version.size(); ++i) {
-			if (version[i] >= '0' && version[i] <= '9') {
-				if (multiplier > 1) {
-					Version += static_cast<u16>(core::floor32(atof(&(version[i]))) * multiplier);
-					multiplier /= 10;
-				} else {
-					break;
-				}
-			}
-		}
-	}
-
-	void getGLExtensions()
-	{
-		core::stringc extensions = glGetString(GL_EXTENSIONS);
-		os::Printer::log(extensions.c_str());
-
-		const u32 size = extensions.size() + 1;
-		c8 *str = new c8[size];
-		strncpy(str, extensions.c_str(), extensions.size());
-		str[extensions.size()] = ' ';
-		c8 *p = str;
-
-		for (u32 i = 0; i < size; ++i) {
-			if (str[i] == ' ') {
-				str[i] = 0;
-				if (*p)
-					for (size_t j = 0; j < IRR_OGLES_Feature_Count; ++j) {
-						if (!strcmp(getFeatureString(j), p)) {
-							FeatureAvailable[j] = true;
-							break;
-						}
-					}
-
-				p = p + strlen(p) + 1;
-			}
-		}
-
-		delete[] str;
-	}
-
 	COpenGLCoreFeature Feature;
 
-	u16 Version;
 	u8 MaxAnisotropy;
 	u32 MaxIndices;
 	u32 MaxTextureSize;

diff --git a/irr/src/COpenGLCoreTexture.h b/irr/src/COpenGLCoreTexture.h
@@ -296,59 +296,6 @@ class COpenGLCoreTexture : public ITexture
 
 					delete[] tmpBuffer;
 				}
-#elif defined(IRR_COMPILE_GLES2_COMMON)
-				COpenGLCoreTexture *tmpTexture = new COpenGLCoreTexture("OGL_CORE_LOCK_TEXTURE", Size, ETT_2D, ColorFormat, Driver);
-
-				GLuint tmpFBO = 0;
-				Driver->irrGlGenFramebuffers(1, &tmpFBO);
-
-				GLint prevViewportX = 0;
-				GLint prevViewportY = 0;
-				GLsizei prevViewportWidth = 0;
-				GLsizei prevViewportHeight = 0;
-				Driver->getCacheHandler()->getViewport(prevViewportX, prevViewportY, prevViewportWidth, prevViewportHeight);
-				Driver->getCacheHandler()->setViewport(0, 0, Size.Width, Size.Height);
-
-				GLuint prevFBO = 0;
-				Driver->getCacheHandler()->getFBO(prevFBO);
-				Driver->getCacheHandler()->setFBO(tmpFBO);
-
-				Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tmpTexture->getOpenGLTextureName(), 0);
-
-				GL.Clear(GL_COLOR_BUFFER_BIT);
-
-				Driver->draw2DImage(this, layer, true);
-
-				IImage *tmpImage = Driver->createImage(ECF_A8R8G8B8, Size);
-				GL.ReadPixels(0, 0, Size.Width, Size.Height, GL_RGBA, GL_UNSIGNED_BYTE, tmpImage->getData());
-
-				Driver->getCacheHandler()->setFBO(prevFBO);
-				Driver->getCacheHandler()->setViewport(prevViewportX, prevViewportY, prevViewportWidth, prevViewportHeight);
-
-				Driver->irrGlDeleteFramebuffers(1, &tmpFBO);
-				delete tmpTexture;
-
-				void *src = tmpImage->getData();
-				void *dest = LockImage->getData();
-
-				switch (ColorFormat) {
-				case ECF_A1R5G5B5:
-					CColorConverter::convert_A8R8G8B8toA1B5G5R5(src, tmpImage->getDimension().getArea(), dest);
-					break;
-				case ECF_R5G6B5:
-					CColorConverter::convert_A8R8G8B8toR5G6B5(src, tmpImage->getDimension().getArea(), dest);
-					break;
-				case ECF_R8G8B8:
-					CColorConverter::convert_A8R8G8B8toB8G8R8(src, tmpImage->getDimension().getArea(), dest);
-					break;
-				case ECF_A8R8G8B8:
-					CColorConverter::convert_A8R8G8B8toA8B8G8R8(src, tmpImage->getDimension().getArea(), dest);
-					break;
-				default:
-					passed = false;
-					break;
-				}
-				tmpImage->drop();
 #endif
 
 				if (!passed) {