From baa6d4e1c21583a7e5c8d4c3aec6653adf2c3fac Mon Sep 17 00:00:00 2001
From: Shinovon <arman200711@gmail.com>
Date: Fri, 8 May 2026 06:09:41 +0500
Subject: [PATCH] something

---
 src/core/timebars.cpp            |  3 ---
 vendor/librw/src/gl/gl3immed.cpp | 32 --------------------------------
 vendor/librw/src/rwbase.h        |  6 ++----
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/src/core/timebars.cpp b/src/core/timebars.cpp
index c0621f8..8f01fe0 100644
--- a/src/core/timebars.cpp
+++ b/src/core/timebars.cpp
@@ -84,9 +84,6 @@ void tbEndTimer(Const char* name)
 	}
 	assert(n != 1500);
 	TimerBar.Timers[n].endTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();
-	if (strcmp(name, "EndOfFrame")) {
-		endOfFrameTime = TimerBar.Timers[n].endTime - TimerBar.Timers[n].startTime;
-	}
 }
 
 float Diag_GetFPS()
diff --git a/vendor/librw/src/gl/gl3immed.cpp b/vendor/librw/src/gl/gl3immed.cpp
index a4b7474..1619f23 100644
--- a/vendor/librw/src/gl/gl3immed.cpp
+++ b/vendor/librw/src/gl/gl3immed.cpp
@@ -113,18 +113,10 @@ im2DRenderPrimitive(PrimitiveType primType, void *vertices, int32 numVertices)
 	glVertexAttribPointer(ATTRIB_POS, 4, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + 0);
 	
 	glEnableVertexAttribArray(ATTRIB_COLOR);
-	#ifdef __SYMBIAN32__
 	glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im2DVertex), (uint8*)vertices + OFFSET_OF(Im2DVertex, r));
-	#else
-	glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im2DVertex), (uint8*)vertices + offsetof(Im2DVertex, r));
-	#endif
 	
 	glEnableVertexAttribArray(ATTRIB_TEXCOORDS0);
-	#ifdef __SYMBIAN32__
 	glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + OFFSET_OF(Im2DVertex, u));
-	#else
-	glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + offsetof(Im2DVertex, u));
-	#endif
 	
 	glDrawArrays(primTypeMap[primType], 0, numVertices);
 	
@@ -154,18 +146,10 @@ im2DRenderIndexedPrimitive(PrimitiveType primType,
 	glVertexAttribPointer(ATTRIB_POS, 4, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + 0);
 	
 	glEnableVertexAttribArray(ATTRIB_COLOR);
-	#ifdef __SYMBIAN32__
 	glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im2DVertex), (uint8*)vertices + OFFSET_OF(Im2DVertex, r));
-	#else
-	glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im2DVertex), (uint8*)vertices + offsetof(Im2DVertex, r));
-	#endif
 	
 	glEnableVertexAttribArray(ATTRIB_TEXCOORDS0);
-	#ifdef __SYMBIAN32__
 	glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + OFFSET_OF(Im2DVertex, u));
-	#else
-	glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im2DVertex), (uint8*)vertices + offsetof(Im2DVertex, u));
-	#endif
 
 	glDrawElements(primTypeMap[primType], numIndices, GL_UNSIGNED_SHORT, indices);
 
@@ -232,18 +216,10 @@ im3DRenderPrimitive(PrimitiveType primType)
 	glVertexAttribPointer(ATTRIB_POS, 3, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + 0);
 	
 	glEnableVertexAttribArray(ATTRIB_COLOR);
-	#ifdef __SYMBIAN32__
 	glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + OFFSET_OF(Im3DVertex, r));
-	#else
-	glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + offsetof(Im3DVertex, r));
-	#endif
 	
 	glEnableVertexAttribArray(ATTRIB_TEXCOORDS0);
-	#ifdef __SYMBIAN32__
 	glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + OFFSET_OF(Im3DVertex, u));
-	#else
-	glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + offsetof(Im3DVertex, u));
-	#endif
 
 	glDrawArrays(primTypeMap[primType], 0, num3DVertices);
 
@@ -264,18 +240,10 @@ im3DRenderIndexedPrimitive(PrimitiveType primType, void *indices, int32 numIndic
 	glVertexAttribPointer(ATTRIB_POS, 3, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + 0);
 	
 	glEnableVertexAttribArray(ATTRIB_COLOR);
-	#ifdef __SYMBIAN32__
 	glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + OFFSET_OF(Im3DVertex, r));
-	#else
-	glVertexAttribPointer(ATTRIB_COLOR, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + offsetof(Im3DVertex, r));
-	#endif
 	
 	glEnableVertexAttribArray(ATTRIB_TEXCOORDS0);
-	#ifdef __SYMBIAN32__
 	glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + OFFSET_OF(Im3DVertex, u));
-	#else
-	glVertexAttribPointer(ATTRIB_TEXCOORDS0, 2, GL_FLOAT, GL_FALSE, sizeof(Im3DVertex), (uint8*)currentIm3dVertices + offsetof(Im3DVertex, u));
-	#endif
 
 	glDrawElements(primTypeMap[primType], numIndices, GL_UNSIGNED_SHORT, indices);
 
diff --git a/vendor/librw/src/rwbase.h b/vendor/librw/src/rwbase.h
index 87a6f33..9a8f660 100644
--- a/vendor/librw/src/rwbase.h
+++ b/vendor/librw/src/rwbase.h
@@ -11,14 +11,12 @@
 #ifdef __SYMBIAN32__
 #undef stderr
 #define stderr stdout
+#endif
 
 #ifdef OFFSET_OF
 #undef OFFSET_OF
 #endif
-
-#define OFFSET_OF(type, member) \
-    ((size_t)((char*)&(((type*)0)->member) - (char*)0))
-#endif
+#define OFFSET_OF(type, member) ((size_t)&(((type*)0)->member))
 
 // TODO: clean up the opengl defines
 //       and figure out what we even want here...