dahjah/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2025-12-16 04:08:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

GS:OGL: Apply Nvidia bug workaround only on Nvidia
Some checks failed
🐧 Linux Builds / AppImage (push) Has been cancelled
Details
🐧 Linux Builds / Flatpak (push) Has been cancelled
Details
🍎 MacOS Builds / Defaults (push) Has been cancelled
Details
🖥️ Windows Builds / Lint VS Project Files (push) Has been cancelled
Details
🖥️ Windows Builds / CMake (push) Has been cancelled
Details
🖥️ Windows Builds / SSE4 (push) Has been cancelled
Details
🖥️ Windows Builds / AVX2 (push) Has been cancelled
Details
🏭 Update Controller Database / update-controller-db (push) Has been cancelled
Details

Browse Source 
It's making fbfetch users very unhappy with lots of unnecessary barriers.
This commit is contained in:
TellowKrinkle 2025-11-23 21:03:40 -06:00 committed by lightningterror
parent 0cbd884234
commit 3376001d45
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp
View File

@ -180,8 +180,7 @@ bool GSDeviceOGL::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
return false; return false;
} }
bool buggy_pbo; if (!CheckFeatures())
if (!CheckFeatures(buggy_pbo))
return false; return false;
// Store adapter name currently in use // Store adapter name currently in use
@ -529,7 +528,7 @@ bool GSDeviceOGL::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
// **************************************************************** // ****************************************************************
// Pbo Pool allocation // Pbo Pool allocation
// **************************************************************** // ****************************************************************
if (!buggy_pbo) if (!m_bugs.buggy_pbo)
{ {
m_texture_upload_buffer = GLStreamBuffer::Create(GL_PIXEL_UNPACK_BUFFER, TEXTURE_UPLOAD_BUFFER_SIZE); m_texture_upload_buffer = GLStreamBuffer::Create(GL_PIXEL_UNPACK_BUFFER, TEXTURE_UPLOAD_BUFFER_SIZE);
if (m_texture_upload_buffer) if (m_texture_upload_buffer)
@ -603,12 +602,14 @@ bool GSDeviceOGL::CreateTextureFX()
return true; return true;
} }
bool GSDeviceOGL::CheckFeatures(bool& buggy_pbo) bool GSDeviceOGL::CheckFeatures()
{ {
//bool vendor_id_amd = false; //bool vendor_id_amd = false;
//bool vendor_id_nvidia = false; //bool vendor_id_nvidia = false;
//bool vendor_id_intel = false; //bool vendor_id_intel = false;
memset(&m_bugs, 0, sizeof(m_bugs));
const char* vendor = (const char*)glGetString(GL_VENDOR); const char* vendor = (const char*)glGetString(GL_VENDOR);
if (std::strstr(vendor, "Advanced Micro Devices") || std::strstr(vendor, "ATI Technologies Inc.") || if (std::strstr(vendor, "Advanced Micro Devices") || std::strstr(vendor, "ATI Technologies Inc.") ||
std::strstr(vendor, "ATI")) std::strstr(vendor, "ATI"))
@ -620,6 +621,7 @@ bool GSDeviceOGL::CheckFeatures(bool& buggy_pbo)
{ {
Console.WriteLn(Color_StrongGreen, "GL: NVIDIA GPU detected."); Console.WriteLn(Color_StrongGreen, "GL: NVIDIA GPU detected.");
//vendor_id_nvidia = true; //vendor_id_nvidia = true;
m_bugs.broken_blend_coherency = true;
} }
else if (std::strstr(vendor, "Intel")) else if (std::strstr(vendor, "Intel"))
{ {
@ -700,8 +702,8 @@ bool GSDeviceOGL::CheckFeatures(bool& buggy_pbo)
// Don't use PBOs when we don't have ARB_buffer_storage, orphaning buffers probably ends up worse than just // Don't use PBOs when we don't have ARB_buffer_storage, orphaning buffers probably ends up worse than just
// using the normal texture update routines and letting the driver take care of it. // using the normal texture update routines and letting the driver take care of it.
buggy_pbo = !GLAD_GL_VERSION_4_4 && !GLAD_GL_ARB_buffer_storage && !GLAD_GL_EXT_buffer_storage; m_bugs.buggy_pbo = !GLAD_GL_VERSION_4_4 && !GLAD_GL_ARB_buffer_storage && !GLAD_GL_EXT_buffer_storage;
if (buggy_pbo) if (m_bugs.buggy_pbo)
Console.Warning("GL: Not using PBOs for texture uploads because buffer_storage is unavailable."); Console.Warning("GL: Not using PBOs for texture uploads because buffer_storage is unavailable.");
// Give the user the option to disable PBO usage for downloads. // Give the user the option to disable PBO usage for downloads.
@ -2565,10 +2567,19 @@ void GSDeviceOGL::RenderHW(GSHWDrawConfig& config)
SetupPipeline(psel); SetupPipeline(psel);
const bool check_barrier = !(config.require_one_barrier && !m_features.texture_barrier); bool rt_hazard_barrier = config.tex && (config.tex == config.ds || config.tex == config.rt);
// In Time Crisis:
// 1. Fullscreen sprite reads depth and writes alpha (rt_hazard_barrier true from config.ds == config.tex)
// 2. Fullscreen sprite writes gray, rta hw blend blends based on dst alpha.
// On Nvidia, 2 seems to not pick up the data written by 1 unless we add a second barrier.
// Pretty sure GL is supposed to guarantee that the blend unit is coherent with previous pixel write out, so calling this a bug.
if (m_bugs.broken_blend_coherency)
rt_hazard_barrier |= (psel.ps.IsFeedbackLoop() || psel.ps.blend_c == 1) && GLState::rt == config.rt;
if (config.require_one_barrier || !m_features.texture_barrier)
rt_hazard_barrier = false; // Already in place or not available
// Be careful of the rt already being bound and the blend using the RT without a barrier. // Be careful of the rt already being bound and the blend using the RT without a barrier.
if (check_barrier && ((config.tex && (config.tex == config.ds || config.tex == config.rt)) || ((psel.ps.IsFeedbackLoop() || psel.ps.blend_c == 1) && GLState::rt == config.rt))) if (rt_hazard_barrier)
{ {
// Ensure all depth writes are finished before sampling // Ensure all depth writes are finished before sampling
GL_INS("GL: Texture barrier to flush depth or rt before reading"); GL_INS("GL: Texture barrier to flush depth or rt before reading");

8
pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.h
View File

@ -141,6 +141,12 @@ private:
std::unique_ptr<GLContext> m_gl_context; std::unique_ptr<GLContext> m_gl_context;
struct
{
bool buggy_pbo : 1; ///< Avoid PBOs and just use glTextureSubImage2D with immediate data
bool broken_blend_coherency : 1; ///< Issue on Nvidia GPUs where some blend modes don't seem to be properly coherent, see comment in RenderHW
} m_bugs;
bool m_disable_download_pbo = false; bool m_disable_download_pbo = false;
GLuint m_fbo = 0; // frame buffer container GLuint m_fbo = 0; // frame buffer container
@ -231,7 +237,7 @@ private:
std::string m_shader_tfx_vgs; std::string m_shader_tfx_vgs;
std::string m_shader_tfx_fs; std::string m_shader_tfx_fs;
bool CheckFeatures(bool& buggy_pbo); bool CheckFeatures();
void SetSwapInterval(); void SetSwapInterval();
void DestroyResources(); void DestroyResources();