From af4ab6f1ac7b724c1095ed156d292d6dcad1455d Mon Sep 17 00:00:00 2001
From: Shinovon <arman200711@gmail.com>
Date: Fri, 1 May 2026 18:13:39 +0500
Subject: [PATCH] Fixes

---
 vendor/librw/src/gles1/gl1device.cpp |  1 -
 vendor/librw/src/gles1/gl1raster.cpp | 51 +---------------------------
 vendor/librw/src/rwbase.h            |  9 ++---
 3 files changed, 3 insertions(+), 58 deletions(-)

diff --git a/vendor/librw/src/gles1/gl1device.cpp b/vendor/librw/src/gles1/gl1device.cpp
index 9874805..ffb6f8a 100644
--- a/vendor/librw/src/gles1/gl1device.cpp
+++ b/vendor/librw/src/gles1/gl1device.cpp
@@ -1494,7 +1494,6 @@ Device renderdevice = {
 #include "rwgles1.h"
 namespace rw {
 namespace gles1 { 
-Gl1Caps gles1Caps;
 bool32 needToReadBackTextures;
 }
 }
diff --git a/vendor/librw/src/gles1/gl1raster.cpp b/vendor/librw/src/gles1/gl1raster.cpp
index 77c44a8..9d59424 100644
--- a/vendor/librw/src/gles1/gl1raster.cpp
+++ b/vendor/librw/src/gles1/gl1raster.cpp
@@ -263,45 +263,8 @@ rasterCreateZbuffer(Raster *raster)
 	raster->originalHeight = raster->height;
 	raster->stride = 0;
 	raster->pixels = nil;
-
-//	if(gl1Caps.gles){
-//		// have to use RBO on GLES!!
-//		glGenRenderbuffers(1, &natras->texid);
-//		glBindRenderbuffer(GL_RENDERBUFFER, natras->texid);
-//#ifdef __SYMBIAN32__
-//		glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, raster->width, raster->height);
-//#else
-//		glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, raster->width, raster->height);
-//#endif
-//#ifndef __SYMBIAN32__
-//	}else{
-//		// TODO: set/check width, height, depth, format?
-//		natras->internalFormat = GL_DEPTH_STENCIL;
-//		natras->format = GL_DEPTH_STENCIL;
-//		natras->type = GL_UNSIGNED_INT_24_8;
-//
-//		natras->autogenMipmap = 0;
-//
-//		glGenTextures(1, &natras->texid);
-//		uint32 prev = bindTexture(natras->texid);
-//		glTexImage2D(GL_TEXTURE_2D, 0, natras->internalFormat,
-//			     raster->width, raster->height,
-//			     0, natras->format, natras->type, nil);
-//		natras->filterMode = 0;
-//		natras->addressU = 0;
-//		natras->addressV = 0;
-//		natras->maxAnisotropy = 1;
-//
-//		bindTexture(prev);
-//#endif
-//	}
-//	natras->fbo = 0;
-//	natras->fboMate = nil;
-
 	return raster;
 }
-
-
 #endif
 
 /*
@@ -383,7 +346,7 @@ uint8*
 rasterLock(Raster *raster, int32 level, int32 lockMode)
 {
 #ifdef RW_GLES1
-	Gl1Raster *natras GETGL1RASTEREXT(raster);
+	Gl1Raster *natras = GETGL1RASTEREXT(raster);
 	uint8 *px;
 	uint32 allocSz;
 	int i;
@@ -904,18 +867,6 @@ writeNativeTexture(Texture *tex, Stream *stream)
 	if(natras->isCompressed){
 		flags |= 2;
 		switch(natras->internalFormat){
-#ifdef RW_OPENGL
-		case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-		case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
-			compression = 1;
-			break;
-		case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
-			compression = 3;
-			break;
-		case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-			compression = 5;
-			break;
-#endif
 		default:
 			assert(0 && "unknown compression");
 		}
diff --git a/vendor/librw/src/rwbase.h b/vendor/librw/src/rwbase.h
index 3862b99..422de74 100644
--- a/vendor/librw/src/rwbase.h
+++ b/vendor/librw/src/rwbase.h
@@ -118,13 +118,8 @@ struct LLLink
 };
 
 
-#ifdef S60V5
-	#define LLLinkGetData(linkvar,type,entry) \
-		((type*)((char*)(linkvar) - (size_t)&(((type*)0)->entry)))
-#else
-	#define LLLinkGetData(linkvar,type,entry) \
-    ((type*)(((rw::uint8*)(linkvar))-offsetof(type,entry)))
-#endif
+#define LLLinkGetData(linkvar,type,entry) \
+    ((type*)(((rw::uint8*)(linkvar))-OFFSET_OF(type,entry)))
 
 // Have to be careful since the link might be deleted.
 #define FORLIST(_link, _list) \