From 4f5c90b690f275130d56c4ac9af44ddd2944414b Mon Sep 17 00:00:00 2001 From: fallenoak Date: Sun, 16 Nov 2025 21:35:34 -0600 Subject: [PATCH] chore(gx): rename CGxFormat::sampleCount to CGxFormat::multisampleCount --- src/gx/CGxFormat.hpp | 2 +- src/gx/d3d/CGxDeviceD3d.cpp | 4 ++-- src/gx/gll/CGxDeviceGLL.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gx/CGxFormat.hpp b/src/gx/CGxFormat.hpp index d9c184a..9c8c6cf 100644 --- a/src/gx/CGxFormat.hpp +++ b/src/gx/CGxFormat.hpp @@ -29,7 +29,7 @@ class CGxFormat { int32_t maximize; Format depthFormat; C2iVector size; - uint32_t sampleCount; + uint32_t multisampleCount; Format colorFormat; uint32_t refreshRate; uint32_t vsync; diff --git a/src/gx/d3d/CGxDeviceD3d.cpp b/src/gx/d3d/CGxDeviceD3d.cpp index 58b103e..015f12a 100644 --- a/src/gx/d3d/CGxDeviceD3d.cpp +++ b/src/gx/d3d/CGxDeviceD3d.cpp @@ -1376,10 +1376,10 @@ void CGxDeviceD3d::ISetPresentParms(D3DPRESENT_PARAMETERS& d3dpp, const CGxForma break; } - if (format.sampleCount <= 1) { + if (format.multisampleCount <= 1) { d3dpp.Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; } else { - d3dpp.MultiSampleType = static_cast(format.sampleCount); + d3dpp.MultiSampleType = static_cast(format.multisampleCount); // TODO MultiSampleQuality } diff --git a/src/gx/gll/CGxDeviceGLL.cpp b/src/gx/gll/CGxDeviceGLL.cpp index 9a822cf..a3bd569 100644 --- a/src/gx/gll/CGxDeviceGLL.cpp +++ b/src/gx/gll/CGxDeviceGLL.cpp @@ -313,7 +313,7 @@ int32_t CGxDeviceGLL::DeviceSetFormat(const CGxFormat& format) { format.refreshRate, v7, format.window ^ 1, - format.sampleCount + format.multisampleCount ); OsInputPostEvent(OS_INPUT_SIZE, v15.right - v15.left, v15.bottom - v15.top, 0, 0);