remove generic.txd

.github/workflows/reLCS_msvc_amd64.yml

@@ -6,13 +6,9 @@ on:
   release:
     types: published
 env:
-  GLEW_VER: "2.1.0"
   GLFW_VER: "3.3.2"
-  GLEW_BASE: "glew-2.1.0"
   GLFW_BASE: "glfw-3.3.2.bin.WIN64"
-  GLEW_FILE: "glew-2.1.0-win32.zip"
   GLFW_FILE: "glfw-3.3.2.bin.WIN64.zip"
-  GLEW_URL: "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0-win32.zip"
   GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN64.zip"
 jobs:
   build:
@@ -27,11 +23,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'true'
-    - if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
-      name: Download glew
-      uses: carlosperate/download-file-action@v1.0.3
-      with:
-        file-url: ${{env.GLEW_URL}}
     - if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
       name: Download glfw
       uses: carlosperate/download-file-action@v1.0.3
@@ -40,11 +31,10 @@ jobs:
     - if: ${{ matrix.platform }} == "win-amd64-librw_gl3_glfw-mss"
       name: Unpack archives
       run: |
-          7z x ${{env.GLEW_FILE}}
           7z x ${{env.GLFW_FILE}}
     - name: Configure build
       run: |
-        ./premake5 vs2019 --with-librw --glewdir=${{env.GLEW_BASE}} --glfwdir64=${{env.GLFW_BASE}}
+        ./premake5 vs2019 --with-librw --glfwdir64=${{env.GLFW_BASE}}
     - name: Build
       run: |
         msbuild -m build/reLCS.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}

.github/workflows/reLCS_msvc_x86.yml

@@ -6,13 +6,9 @@ on:
   release:
     types: published
 env:
-  GLEW_VER: "2.1.0"
   GLFW_VER: "3.3.2"
-  GLEW_BASE: "glew-2.1.0"
   GLFW_BASE: "glfw-3.3.2.bin.WIN32"
-  GLEW_FILE: "glew-2.1.0-win32.zip"
   GLFW_FILE: "glfw-3.3.2.bin.WIN32.zip"
-  GLEW_URL: "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0-win32.zip"
   GLFW_URL: "https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.bin.WIN32.zip"
 jobs:
   build:
@@ -27,11 +23,6 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'true'
-    - if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
-      name: Download glew
-      uses: carlosperate/download-file-action@v1.0.3
-      with:
-        file-url: ${{env.GLEW_URL}}
     - if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
       name: Download glfw
       uses: carlosperate/download-file-action@v1.0.3
@@ -40,11 +31,10 @@ jobs:
     - if: ${{ matrix.platform }} == "win-x86-librw_gl3_glfw-mss"
       name: Unpack archives
       run: |
-          7z x ${{env.GLEW_FILE}}
           7z x ${{env.GLFW_FILE}}
     - name: Configure build
       run: |
-        ./premake5 vs2019 --with-librw --glewdir=${{env.GLEW_BASE}} --glfwdir32=${{env.GLFW_BASE}}
+        ./premake5 vs2019 --with-librw --glfwdir32=${{env.GLFW_BASE}}
     - name: Build
       run: |
         msbuild -m build/reLCS.sln /property:Configuration=${{matrix.buildtype}} /property:Platform=${{matrix.platform}}

premake5.lua

@@ -1,10 +1,3 @@
-newoption {
-	trigger     = "glewdir",
-	value       = "PATH",
-	description = "Directory of GLEW",
-	default     = "vendor/glew-2.1.0"
-}
-
 newoption {
 	trigger     = "glfwdir64",
 	value       = "PATH",
@@ -165,7 +158,6 @@ workspace "reLCS"
 		
 	filter "platforms:*librw_gl3_glfw*"
 		defines { "RW_GL3" }
-		includedirs { path.join(_OPTIONS["glewdir"], "include") }
 		if(not _OPTIONS["with-librw"]) then
 			libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
 		end
@@ -176,9 +168,6 @@ workspace "reLCS"
 	filter "platforms:*amd64-librw_gl3_glfw*"
 		includedirs { path.join(_OPTIONS["glfwdir64"], "include") }
 
-	filter "platforms:win*librw_gl3_glfw*"
-		defines { "GLEW_STATIC" }
-
 	filter  {}
 		
     function setpaths (gamepath, exepath)
@@ -202,7 +191,8 @@ project "librw"
 	targetname "rw"
 	targetdir(path.join(Librw, "lib/%{cfg.platform}/%{cfg.buildcfg}"))
 	files { path.join(Librw, "src/*.*") }
-	files { path.join(Librw, "src/*/*.*") }
+	files { path.join(Librw, "src/*/*.*") }
+	files { path.join(Librw, "src/gl/*/*.*") }
 	
 	filter { "platforms:*x86*" }
 		architecture "x86"
@@ -406,25 +396,23 @@ project "reLCS"
 		libdirs { "sdk/dx8sdk/lib" }
 		
 	filter "platforms:win-x86*gl3_glfw*"
-		libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") }
 		libdirs { path.join(_OPTIONS["glfwdir32"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
-		links { "opengl32", "glew32s", "glfw3" }
+		links { "opengl32", "glfw3" }
 		
 	filter "platforms:win-amd64*gl3_glfw*"
-		libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/x64") }
 		libdirs { path.join(_OPTIONS["glfwdir64"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
-		links { "opengl32", "glew32s", "glfw3" }
+		links { "opengl32", "glfw3" }
 
 	filter "platforms:linux*gl3_glfw*"
-		links { "GL", "GLEW", "glfw" }
+		links { "GL", "glfw" }
 		
 	filter "platforms:bsd*gl3_glfw*"
-		links { "GL", "GLEW", "glfw", "sysinfo" }
+		links { "GL", "glfw", "sysinfo" }
 		includedirs { "/usr/local/include" }
 		libdirs { "/usr/local/lib" }
 
 	filter "platforms:macosx*gl3_glfw*"
-		links { "GLEW", "glfw" }
+		links { "glfw" }
 		linkoptions { "-framework OpenGL" }
 		includedirs { "/opt/local/include" }
 		includedirs { "/usr/local/include" }

src/audio/MusicManager.cpp

@@ -1265,7 +1265,11 @@ cMusicManager::DisplayRadioStationName()
 
 		if (vehicle)
 		{
-			int8 track;
+#if defined RADIO_SCROLL_TO_PREV_STATION || defined FIX_BUGS // Because m_nFrontendTrack can have NO_TRACK
+			int track;
+#else
+			uint8 track;
+#endif
 			gStreamedSound = vehicle->m_nRadioStation;
 			if (gStreamedSound >= STREAMED_SOUND_CITY_AMBIENT && gStreamedSound <= STREAMED_SOUND_AMBSIL_AMBIENT)
 				gStreamedSound = RADIO_OFF;
@@ -1282,11 +1286,7 @@ cMusicManager::DisplayRadioStationName()
 					gNumRetunePresses++;
 			}
 			else
-#ifdef FIX_BUGS
-				track = GetCarTuning(); // gStreamedSound or veh->m_nRadioStation would also work, but these don't cover police/taxi radios
-#else
 				track = m_nFrontendTrack;
-#endif
 
 			wchar* string = nil;
 			switch (track) {

src/audio/oal/stream.cpp

@@ -464,7 +464,7 @@ public:
 #endif
 
 #ifdef AUDIO_OAL_USE_MPG123
-// fuzzy seek eliminates stutter when playing ADF but spams errors a lot (nothing breaks though)
+// fuzzy seek eliminates stutter when playing ADF but spams errors a lot (and breaks radio sometimes)
 //#define MP3_USE_FUZZY_SEEK
 
 class CMP3File : public IDecoder
@@ -492,6 +492,8 @@ public:
 		{
 #ifdef MP3_USE_FUZZY_SEEK
 			mpg123_param(m_pMH, MPG123_FLAGS, MPG123_FUZZY | MPG123_SEEKBUFFER | MPG123_GAPLESS | MPG123_QUIET, 0.0);
+#else
+			mpg123_param(m_pMH, MPG123_FLAGS, MPG123_SEEKBUFFER | MPG123_GAPLESS, 0.0);
 #endif
 			long rate = 0;
 			int channels = 0;
@@ -602,6 +604,8 @@ public:
 		{
 #ifdef MP3_USE_FUZZY_SEEK
 			mpg123_param(m_pMH, MPG123_FLAGS, MPG123_FUZZY | MPG123_SEEKBUFFER | MPG123_GAPLESS | MPG123_QUIET, 0.0);
+#else
+			mpg123_param(m_pMH, MPG123_FLAGS, MPG123_SEEKBUFFER | MPG123_GAPLESS, 0.0);
 #endif
 			long rate = 0;
 			int channels = 0;

src/core/Frontend.cpp

@@ -1881,8 +1881,13 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8
 		}
 
 		// Print bindings, including seperator (-) between them
+
 		CFont::SetScale(MENU_X(0.25f), MENU_Y(LISTITEM_Y_SCALE));
+#ifdef FIX_BUGS
+		for (; contSetOrder < MAX_SETORDERS && controllerAction >= 0; contSetOrder++) {
+#else
 		for (; contSetOrder < MAX_SETORDERS && controllerAction != -1; contSetOrder++) {
+#endif
 			wchar *settingText = ControlsManager.GetControllerSettingTextWithOrderNumber((e_ControllerAction)controllerAction, (eContSetOrder)contSetOrder);
 			if (settingText) {
 				++bindingsForThisOpt;
@@ -5503,6 +5508,9 @@ CMenuManager::SwitchMenuOnAndOff()
 				}
 				Initialise();
 				LoadAllTextures();
+#ifdef FIX_BUGS
+				CPad::StopPadsShaking();
+#endif
 			} else {
 #ifdef EXTENDED_COLOURFILTER
 				// we always expect CPostFX to be open

src/extras/custompipes_gl.cpp

@@ -111,13 +111,7 @@ leedsVehicleRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 	setWorldMatrix(atomic->getFrame()->getLTM());
 	lightingCB(atomic);
 
-#ifdef RW_GL_USE_VAOS
-	glBindVertexArray(header->vao);
-#else
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, header->ibo);
-	glBindBuffer(GL_ARRAY_BUFFER, header->vbo);
-	setAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	setupVertexInput(header);
 
 	InstanceData *inst = header->inst;
 	rw::int32 n = header->numMeshes;
@@ -167,9 +161,7 @@ leedsVehicleRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 
 	SetRenderState(SRCBLEND, BLENDSRCALPHA);
 
-#ifndef RW_GL_USE_VAOS
-	disableAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	teardownVertexInput(header);
 }
 
 void
@@ -200,13 +192,7 @@ leedsVehicleRenderCB_mobile(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *hea
 	setWorldMatrix(atomic->getFrame()->getLTM());
 	lightingCB(atomic);
 
-#ifdef RW_GL_USE_VAOS
-	glBindVertexArray(header->vao);
-#else
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, header->ibo);
-	glBindBuffer(GL_ARRAY_BUFFER, header->vbo);
-	setAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	setupVertexInput(header);
 
 	InstanceData *inst = header->inst;
 	rw::int32 n = header->numMeshes;
@@ -251,9 +237,7 @@ leedsVehicleRenderCB_mobile(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *hea
 
 	setTexture(1, nil);
 
-#ifndef RW_GL_USE_VAOS
-	disableAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	teardownVertexInput(header);
 }
 
 static void
@@ -310,13 +294,7 @@ vehicleRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 	setWorldMatrix(atomic->getFrame()->getLTM());
 	lightingCB(atomic);
 
-#ifdef RW_GL_USE_VAOS
-	glBindVertexArray(header->vao);
-#else
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, header->ibo);
-	glBindBuffer(GL_ARRAY_BUFFER, header->vbo);
-	setAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	setupVertexInput(header);
 
 	InstanceData *inst = header->inst;
 	rw::int32 n = header->numMeshes;
@@ -357,9 +335,7 @@ vehicleRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 
 	SetRenderState(SRCBLEND, BLENDSRCALPHA);
 
-#ifndef RW_GL_USE_VAOS
-	disableAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	teardownVertexInput(header);
 }
 
 void
@@ -455,13 +431,7 @@ worldRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 
 	setWorldMatrix(atomic->getFrame()->getLTM());
 
-#ifdef RW_GL_USE_VAOS
-	glBindVertexArray(header->vao);
-#else
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, header->ibo);
-	glBindBuffer(GL_ARRAY_BUFFER, header->vbo);
-	setAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	setupVertexInput(header);
 
 	InstanceData *inst = header->inst;
 	rw::int32 n = header->numMeshes;
@@ -494,9 +464,7 @@ worldRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 		drawInst(header, inst);
 		inst++;
 	}
-#ifndef RW_GL_USE_VAOS
-	disableAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	teardownVertexInput(header);
 }
 
 void
@@ -564,13 +532,7 @@ glossRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 
 	Material *m;
 
-#ifdef RW_GL_USE_VAOS
-	glBindVertexArray(header->vao);
-#else
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, header->ibo);
-	glBindBuffer(GL_ARRAY_BUFFER, header->vbo);
-	setAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	setupVertexInput(header);
 
 	InstanceData *inst = header->inst;
 	rw::int32 n = header->numMeshes;
@@ -608,9 +570,7 @@ glossRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 	SetRenderState(SRCBLEND, BLENDSRCALPHA);
 	SetRenderState(DESTBLEND, BLENDINVSRCALPHA);
 
-#ifndef RW_GL_USE_VAOS
-	disableAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	teardownVertexInput(header);
 }
 
 void
@@ -693,13 +653,7 @@ rimSkinRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 	setWorldMatrix(atomic->getFrame()->getLTM());
 	lightingCB(atomic);
 
-#ifdef RW_GL_USE_VAOS
-	glBindVertexArray(header->vao);
-#else
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, header->ibo);
-	glBindBuffer(GL_ARRAY_BUFFER, header->vbo);
-	setAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	setupVertexInput(header);
 
 	InstanceData *inst = header->inst;
 	rw::int32 n = header->numMeshes;
@@ -722,9 +676,7 @@ rimSkinRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 		drawInst(header, inst);
 		inst++;
 	}
-#ifndef RW_GL_USE_VAOS
-	disableAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	teardownVertexInput(header);
 }
 
 static void
@@ -743,13 +695,7 @@ rimRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 	setWorldMatrix(atomic->getFrame()->getLTM());
 	lightingCB(atomic);
 
-#ifdef RW_GL_USE_VAOS
-	glBindVertexArray(header->vao);
-#else
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, header->ibo);
-	glBindBuffer(GL_ARRAY_BUFFER, header->vbo);
-	setAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	setupVertexInput(header);
 
 	InstanceData *inst = header->inst;
 	rw::int32 n = header->numMeshes;
@@ -770,9 +716,7 @@ rimRenderCB(rw::Atomic *atomic, rw::gl3::InstanceDataHeader *header)
 		drawInst(header, inst);
 		inst++;
 	}
-#ifndef RW_GL_USE_VAOS
-	disableAttribPointers(header->attribDesc, header->numAttribs);
-#endif
+	teardownVertexInput(header);
 }
 
 void
@@ -938,13 +882,7 @@ AtomicFirstPass(RpAtomic *atomic, int pass)
 			else
 				CustomPipes::leedsWorldShader->use();
 			setWorldMatrix(&building->matrix);
-#ifdef RW_GL_USE_VAOS
-			glBindVertexArray(building->instHeader->vao);
-#else
-			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, building->instHeader->ibo);
-			glBindBuffer(GL_ARRAY_BUFFER, building->instHeader->vbo);
-			setAttribPointers(building->instHeader->attribDesc, building->instHeader->numAttribs);
-#endif
+			setupVertexInput(building->instHeader);
 
 			CustomPipes::uploadWorldLights();
 
@@ -965,9 +903,7 @@ AtomicFirstPass(RpAtomic *atomic, int pass)
 
 		drawInst(building->instHeader, inst);
 	}
-#ifndef RW_GL_USE_VAOS
-	disableAttribPointers(building->instHeader->attribDesc, building->instHeader->numAttribs);
-#endif
+	teardownVertexInput(building->instHeader);
 	if(defer)
 		numBlendInsts[pass]++;
 }
@@ -1010,13 +946,7 @@ RenderBlendPass(int pass)
 	for(i = 0; i < numBlendInsts[pass]; i++){
 		BuildingInst *building = &blendInsts[pass][i];
 
-#ifdef RW_GL_USE_VAOS
-		glBindVertexArray(building->instHeader->vao);
-#else
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, building->instHeader->ibo);
-		glBindBuffer(GL_ARRAY_BUFFER, building->instHeader->vbo);
-		setAttribPointers(building->instHeader->attribDesc, building->instHeader->numAttribs);
-#endif
+		setupVertexInput(building->instHeader);
 		setWorldMatrix(&building->matrix);
 
 		InstanceData *inst = building->instHeader->inst;
@@ -1041,9 +971,7 @@ RenderBlendPass(int pass)
 
 			drawInst(building->instHeader, inst);
 		}
-#ifndef RW_GL_USE_VAOS
-		disableAttribPointers(building->instHeader->attribDesc, building->instHeader->numAttribs);
-#endif
+		teardownVertexInput(building->instHeader);
 	}
 }
 }

vendor/librw

@@ -1 +1 @@
-Subproject commit 41ae7b9b61c6736b34269df0f0350d1b5bcff4df
+Subproject commit 576d211cbd76bfef43f33f2f837c0f392dbe86fe