Merge pull request flyinghead#273 from flyinghead/master

[pull] gdxsv-master from flyinghead:master
vkedwardli · Jan 9, 2025 · 535d2b1 · 535d2b1
2 parents 9f36a84 + 3114344
commit 535d2b1
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 18 deletions.
diff --git a/core/cfg/option.cpp b/core/cfg/option.cpp
@@ -197,19 +197,19 @@ std::array<Option<MapleDeviceType>, 4> MapleMainDevices {
 	Option<MapleDeviceType>("device3", MDT_None, "input"),
 	Option<MapleDeviceType>("device4", MDT_None, "input"),
 };
-std::array<std::array<Option<MapleDeviceType>, 2>, 4> MapleExpansionDevices {
-	Option<MapleDeviceType>("device1.1", MDT_SegaVMU, "input"),
-	Option<MapleDeviceType>("device1.2", MDT_SegaVMU, "input"),
+std::array<std::array<Option<MapleDeviceType>, 2>, 4> MapleExpansionDevices {{
+	{{Option<MapleDeviceType>("device1.1", MDT_SegaVMU, "input"),
+	Option<MapleDeviceType>("device1.2", MDT_SegaVMU, "input")}},
 
-	Option<MapleDeviceType>("device2.1", MDT_None, "input"),
-	Option<MapleDeviceType>("device2.2", MDT_None, "input"),
+	{{Option<MapleDeviceType>("device2.1", MDT_None, "input"),
+	Option<MapleDeviceType>("device2.2", MDT_None, "input")}},
 
-	Option<MapleDeviceType>("device3.1", MDT_None, "input"),
-	Option<MapleDeviceType>("device3.2", MDT_None, "input"),
+	{{Option<MapleDeviceType>("device3.1", MDT_None, "input"),
+	Option<MapleDeviceType>("device3.2", MDT_None, "input")}},
 
-	Option<MapleDeviceType>("device4.1", MDT_None, "input"),
-	Option<MapleDeviceType>("device4.2", MDT_None, "input"),
-};
+	{{Option<MapleDeviceType>("device4.1", MDT_None, "input"),
+	Option<MapleDeviceType>("device4.2", MDT_None, "input")}},
+}};
 Option<bool> PerGameVmu("PerGameVmu", false, "config");
 #ifdef _WIN32
 Option<bool, false> UseRawInput("RawInput", false, "input");

diff --git a/core/hw/arm7/arm7.cpp b/core/hw/arm7/arm7.cpp
@@ -368,7 +368,14 @@ void DYNACALL interpret(u32 opcode)
 	u32 clockTicks = 0;
 
 #define NO_OPCODE_READ
+#ifndef _MSC_VER
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
 #include "arm-new.h"
+#ifndef _MSC_VER
+#pragma GCC diagnostic pop
+#endif
 #undef NO_OPCODE_READ
 
 	reg[CYCL_CNT].I -= clockTicks;

diff --git a/core/hw/modem/modem.cpp b/core/hw/modem/modem.cpp
@@ -276,7 +276,7 @@ static int modem_sched_func(int tag, int cycles, int jitter, void *arg)
 			if (!mem_dumped)
 			{
 				mem_dumped = true;
-				for (int i = 0 ; i < sizeof(modem_regs); i++)
+				for (size_t i = 0 ; i < sizeof(modem_regs); i++)
 					LOG("modem_regs %02x == %02x", i, modem_regs.ptr[i]);
 			}
 #endif

diff --git a/core/rend/dx11/dx11context.cpp b/core/rend/dx11/dx11context.cpp
@@ -352,7 +352,7 @@ void DX11Context::handleDeviceLost()
 	}
 	else
 	{
-		Renderer* rend_norend();
+		Renderer* rend_norend(void);
 		renderer = rend_norend();
 		renderer->Init();
 	}

diff --git a/core/rend/dx9/d3d_overlay.cpp b/core/rend/dx9/d3d_overlay.cpp
@@ -25,10 +25,10 @@ void D3DOverlay::drawQuad(const RECT& rect, D3DCOLOR color)
 {
 	device->SetTextureStageState(0, D3DTSS_CONSTANT, color);
 	Vertex quad[] {
-		{ (float)(rect.left),  (float)(rect.top),    0.5f, 0.f, 0.f },
-		{ (float)(rect.left),  (float)(rect.bottom), 0.5f, 0.f, 1.f },
-		{ (float)(rect.right), (float)(rect.top),    0.5f, 1.f, 0.f },
-		{ (float)(rect.right), (float)(rect.bottom), 0.5f, 1.f, 1.f }
+		{ {(float)(rect.left),  (float)(rect.top),    0.5f}, {0.f, 0.f} },
+		{ {(float)(rect.left),  (float)(rect.bottom), 0.5f}, {0.f, 1.f} },
+		{ {(float)(rect.right), (float)(rect.top),    0.5f}, {1.f, 0.f} },
+		{ {(float)(rect.right), (float)(rect.bottom), 0.5f}, {1.f, 1.f} }
 	};
 	device->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, quad, sizeof(Vertex));
 }

diff --git a/core/rend/gles/gldraw.cpp b/core/rend/gles/gldraw.cpp
@@ -644,9 +644,9 @@ void DrawStrips()
 
 void OpenGLRenderer::RenderFramebuffer(const FramebufferInfo& info)
 {
-	initVideoRoutingFrameBuffer();
 	glReadFramebuffer(info);
 	saveCurrentFramebuffer();
+	initVideoRoutingFrameBuffer();
 	getVideoShift(gl.ofbo.shiftX, gl.ofbo.shiftY);
 #ifdef LIBRETRO
 	glBindFramebuffer(GL_FRAMEBUFFER, postProcessor.getFramebuffer(gl.dcfb.width, gl.dcfb.height));

diff --git a/core/rend/vulkan/drawer.cpp b/core/rend/vulkan/drawer.cpp
@@ -80,7 +80,7 @@ void BaseDrawer::SetBaseScissor(const vk::Extent2D& viewport)
 	}
 	else
 	{
-		baseScissor = { 0, 0, (u32)viewport.width, (u32)viewport.height };
+		baseScissor = vk::Rect2D{ {0, 0}, {(u32)viewport.width, (u32)viewport.height} };
 	}
 }
 

diff --git a/core/rend/vulkan/vmallocator.h b/core/rend/vulkan/vmallocator.h
@@ -21,7 +21,14 @@
 #pragma once
 #include <cinttypes>
 #include "vulkan.h"
+#ifndef _MSC_VER
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
 #include "vk_mem_alloc.h"
+#ifndef _MSC_VER
+#pragma GCC diagnostic pop
+#endif
 
 #if !defined(PRIu64) && defined(_WIN32)
 #define PRIu64 "I64u"

diff --git a/core/windows/winmain.cpp b/core/windows/winmain.cpp
@@ -541,8 +541,17 @@ void os_SetThreadName(const char *name)
 }
 
 #ifdef VIDEO_ROUTING
+#ifndef _MSC_VER
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
 #include "SpoutSender.h"
 #include "SpoutDX.h"
+#ifndef _MSC_VER
+#pragma GCC diagnostic pop
+#endif
 
 static SpoutSender* spoutSender;
 static spoutDX* spoutDXSender;
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,7 @@ void BaseDrawer::SetBaseScissor(const vk::Extent2D& viewport) @@
     	}
     	else
     	{
-    		baseScissor = { 0, 0, (u32)viewport.width, (u32)viewport.height };
+    		baseScissor = vk::Rect2D{ {0, 0}, {(u32)viewport.width, (u32)viewport.height} };
     	}
     }
@@ Expand Down @@