PCSX2/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-10-12 02:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

GS/GL: Rename active state attachments.

Browse Source 
Matches the other renderers naming.
rt->current_rt
ds_as_rt ->current_ds_as_rt
ds->current_ds
This commit is contained in:
lightningterror
2026-10-11 02:36:08 +02:00
parent 6bdd913a67
commit c53b0c9c92
3 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcsx2/GS/Renderers/OpenGL/GLState.cpp
+7 -7
View File
@@ -34,9 +34,9 @@ namespace GLState
GLuint ps_ss;
GSTextureOGL* rt = nullptr;
GSTextureOGL* ds_as_rt = nullptr;
GSTextureOGL* ds = nullptr;
GSTextureOGL* current_rt = nullptr;
GSTextureOGL* current_ds_as_rt = nullptr;
GSTextureOGL* current_ds = nullptr;
bool rt_written;
bool ds_as_rt_written;
@@ -48,7 +48,7 @@ namespace GLState
u32 UpdateDrawBuffers()
{
draw_buffers = ds_as_rt ? 2 : 1;
draw_buffers = current_ds_as_rt ? 2 : 1;
return draw_buffers;
}
@@ -78,9 +78,9 @@ namespace GLState
ps_ss = 0;
rt = nullptr;
ds_as_rt = nullptr;
ds = nullptr;
current_rt = nullptr;
current_ds_as_rt = nullptr;
current_ds = nullptr;
rt_written = false;
ds_as_rt_written = false;
pcsx2/GS/Renderers/OpenGL/GLState.h
+3 -3
View File
@@ -38,9 +38,9 @@ namespace GLState
extern GLuint ps_ss; // sampler
extern GSTextureOGL* rt; // render target
extern GSTextureOGL* ds_as_rt; // Depth-Stencil as color
extern GSTextureOGL* ds; // Depth-Stencil
extern GSTextureOGL* current_rt; // render target
extern GSTextureOGL* current_ds_as_rt; // Depth-Stencil as color
extern GSTextureOGL* current_ds; // Depth-Stencil
extern u32 draw_buffers; // Number of color attachments to framebuffer.
pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp
+22 -22
View File
@@ -1548,13 +1548,13 @@ void GSDeviceOGL::CommitClear(GSTexture* t, bool use_write_fbo)
OMSetFBO(m_fbo);
if (T->IsDepthStencil())
{
if (GLState::rt && GLState::rt->GetSize() != T->GetSize())
if (GLState::current_rt && GLState::current_rt->GetSize() != T->GetSize())
OMAttachRt(nullptr);
OMAttachDs(T);
}
else
{
if (GLState::ds && GLState::ds->GetSize() != T->GetSize())
if (GLState::current_ds && GLState::current_ds->GetSize() != T->GetSize())
OMAttachDs(nullptr);
OMAttachRt(T);
}
@@ -2803,30 +2803,30 @@ void GSDeviceOGL::RenderBlankFrame()
void GSDeviceOGL::OMAttachRt(GSTexture* rt)
{
if (GLState::rt == rt)
if (GLState::current_rt == rt)
return;
GLState::rt = static_cast<GSTextureOGL*>(rt);
GLState::current_rt = static_cast<GSTextureOGL*>(rt);
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
rt ? static_cast<GSTextureOGL*>(rt)->GetID() : 0, 0);
}
void GSDeviceOGL::OMAttachDsAsRt(GSTexture* ds_as_rt)
{
if (GLState::ds_as_rt == ds_as_rt)
if (GLState::current_ds_as_rt == ds_as_rt)
return;
GLState::ds_as_rt = static_cast<GSTextureOGL*>(ds_as_rt);
GLState::current_ds_as_rt = static_cast<GSTextureOGL*>(ds_as_rt);
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT1, GL_TEXTURE_2D,
ds_as_rt ? static_cast<GSTextureOGL*>(ds_as_rt)->GetID() : 0, 0);
}
void GSDeviceOGL::OMAttachDs(GSTexture* ds)
{
if (GLState::ds == ds)
if (GLState::current_ds == ds)
return;
GLState::ds = static_cast<GSTextureOGL*>(ds);
GLState::current_ds = static_cast<GSTextureOGL*>(ds);
const GLenum target = m_features.framebuffer_fetch ? GL_DEPTH_ATTACHMENT : GL_DEPTH_STENCIL_ATTACHMENT;
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, target, GL_TEXTURE_2D, ds ? static_cast<GSTextureOGL*>(ds)->GetID() : 0, 0);
@@ -2859,15 +2859,15 @@ void GSDeviceOGL::OMSetColorMaskState(OMColorMaskSelector sel)
void GSDeviceOGL::OMUnbindTexture(GSTextureOGL* tex)
{
if (GLState::rt != tex && GLState::ds_as_rt != tex && GLState::ds != tex)
if (GLState::current_rt != tex && GLState::current_ds_as_rt != tex && GLState::current_ds != tex)
return;
OMSetFBO(m_fbo);
if (GLState::rt == tex)
if (GLState::current_rt == tex)
OMAttachRt();
if (GLState::ds_as_rt == tex)
if (GLState::current_ds_as_rt == tex)
OMAttachDsAsRt();
if (GLState::ds == tex)
if (GLState::current_ds == tex)
OMAttachDs();
}
@@ -2917,9 +2917,9 @@ void GSDeviceOGL::OMSetBlendState(bool enable, GLenum src_factor, GLenum dst_fac
void GSDeviceOGL::OMSetRenderTargets(GSTexture* rt, GSTexture* ds_as_rt, GSTexture* ds, const GSVector4i* scissor)
{
const bool rt_changed = (rt != GLState::rt);
const bool ds_as_rt_changed = (ds_as_rt != GLState::ds_as_rt);
const bool ds_changed = (ds != GLState::ds);
const bool rt_changed = (rt != GLState::current_rt);
const bool ds_as_rt_changed = (ds_as_rt != GLState::current_ds_as_rt);
const bool ds_changed = (ds != GLState::current_ds);
const u32 draw_buffers = GLState::draw_buffers;
g_perfmon.Put(GSPerfMon::RenderPasses, static_cast<double>(rt_changed || ds_as_rt_changed || ds_changed));
@@ -3198,7 +3198,7 @@ void GSDeviceOGL::RenderHW(GSHWDrawConfig& config)
// Pretty sure GL is supposed to guarantee that the blend unit is coherent with previous pixel write out, so calling this a bug.
bool broken_blend_coherency_barrier = false;
if (m_bugs.broken_blend_coherency)
broken_blend_coherency_barrier = (config.IsFeedbackLoopRT(psel.ps) || psel.ps.blend_c == 1) && GLState::rt == config.rt;
broken_blend_coherency_barrier = (config.IsFeedbackLoopRT(psel.ps) || psel.ps.blend_c == 1) && GLState::current_rt == config.rt;
if (config.require_one_barrier || !m_features.texture_barrier)
{
broken_blend_coherency_barrier = false;
@@ -3273,15 +3273,15 @@ void GSDeviceOGL::RenderHW(GSHWDrawConfig& config)
// Avoid changing framebuffer just to switch from rt+depth to rt and vice versa.
bool fb_optimization_needs_barrier = false;
if (!(draw_rt || draw_ds_as_rt) && draw_ds && config.tex != GLState::rt && GLState::rt && GLState::rt->GetSize() == draw_ds->GetSize())
if (!(draw_rt || draw_ds_as_rt) && draw_ds && GLState::current_rt && config.tex != GLState::current_rt && GLState::current_rt->GetSize() == draw_ds->GetSize())
{
draw_rt = GLState::rt;
fb_optimization_needs_barrier = !GLState::rt_written && GLState::ds == draw_ds;
draw_rt = GLState::current_rt;
fb_optimization_needs_barrier = !GLState::rt_written && GLState::current_ds == draw_ds;
}
else if (!(draw_ds || draw_ds_as_rt) && draw_rt && config.tex != GLState::ds && GLState::ds && GLState::ds->GetSize() == draw_rt->GetSize())
else if (!(draw_ds || draw_ds_as_rt) && draw_rt && GLState::current_ds && config.tex != GLState::current_ds && GLState::current_ds->GetSize() == draw_rt->GetSize())
{
draw_ds = GLState::ds;
fb_optimization_needs_barrier = !GLState::ds_written && GLState::rt == draw_rt;
draw_ds = GLState::current_ds;
fb_optimization_needs_barrier = !GLState::ds_written && GLState::current_rt == draw_rt;
}
// Be careful of the rt already being bound and the blend using the RT without a barrier.