ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS/OpenGL: Remove disable_hw_gl_draw option 

I'm not sure what the point of it ever was..
This commit is contained in:
Connor McLaughlin 2022-11-22 23:37:43 +10:00 committed by refractionpcsx2
parent a2a635a141
commit b30e93389c
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/GS/GS.cpp
View File

@ -1430,7 +1430,6 @@ void GSApp::Init()
m_default_configuration["CaptureWidth"] = "640"; m_default_configuration["CaptureWidth"] = "640";
m_default_configuration["crc_hack_level"] = std::to_string(static_cast<s8>(CRCHackLevel::Automatic)); m_default_configuration["crc_hack_level"] = std::to_string(static_cast<s8>(CRCHackLevel::Automatic));
m_default_configuration["CrcHacksExclusions"] = ""; m_default_configuration["CrcHacksExclusions"] = "";
m_default_configuration["disable_hw_gl_draw"] = "0";
m_default_configuration["disable_shader_cache"] = "0"; m_default_configuration["disable_shader_cache"] = "0";
m_default_configuration["DisableDualSourceBlend"] = "0"; m_default_configuration["DisableDualSourceBlend"] = "0";
m_default_configuration["DisableFramebufferFetch"] = "0"; m_default_configuration["DisableFramebufferFetch"] = "0";

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

@ -57,8 +57,6 @@ GSDeviceOGL::GSDeviceOGL()
#ifdef ENABLE_OGL_DEBUG #ifdef ENABLE_OGL_DEBUG
m_debug_gl_file = fopen("GS_opengl_debug.txt", "w"); m_debug_gl_file = fopen("GS_opengl_debug.txt", "w");
#endif #endif
m_disable_hw_gl_draw = theApp.GetConfigB("disable_hw_gl_draw");
} }
GSDeviceOGL::~GSDeviceOGL() GSDeviceOGL::~GSDeviceOGL()
@ -723,25 +721,19 @@ void GSDeviceOGL::DrawPrimitive()
void GSDeviceOGL::DrawIndexedPrimitive() void GSDeviceOGL::DrawIndexedPrimitive()
{ {
if (!m_disable_hw_gl_draw)
{
g_perfmon.Put(GSPerfMon::DrawCalls, 1); g_perfmon.Put(GSPerfMon::DrawCalls, 1);
glDrawElementsBaseVertex(m_draw_topology, static_cast<u32>(m_index.count), GL_UNSIGNED_INT, glDrawElementsBaseVertex(m_draw_topology, static_cast<u32>(m_index.count), GL_UNSIGNED_INT,
reinterpret_cast<void*>(static_cast<u32>(m_index.start) * sizeof(u32)), static_cast<GLint>(m_vertex.start)); reinterpret_cast<void*>(static_cast<u32>(m_index.start) * sizeof(u32)), static_cast<GLint>(m_vertex.start));
}
} }
void GSDeviceOGL::DrawIndexedPrimitive(int offset, int count) void GSDeviceOGL::DrawIndexedPrimitive(int offset, int count)
{ {
//ASSERT(offset + count <= (int)m_index.count); //ASSERT(offset + count <= (int)m_index.count);
if (!m_disable_hw_gl_draw)
{
g_perfmon.Put(GSPerfMon::DrawCalls, 1); g_perfmon.Put(GSPerfMon::DrawCalls, 1);
glDrawElementsBaseVertex(m_draw_topology, count, GL_UNSIGNED_INT, glDrawElementsBaseVertex(m_draw_topology, count, GL_UNSIGNED_INT,
reinterpret_cast<void*>((static_cast<u32>(m_index.start) + static_cast<u32>(offset)) * sizeof(u32)), reinterpret_cast<void*>((static_cast<u32>(m_index.start) + static_cast<u32>(offset)) * sizeof(u32)),
static_cast<GLint>(m_vertex.start)); static_cast<GLint>(m_vertex.start));
}
} }
void GSDeviceOGL::ClearRenderTarget(GSTexture* t, const GSVector4& c) void GSDeviceOGL::ClearRenderTarget(GSTexture* t, const GSVector4& c)

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

@ -213,8 +213,6 @@ public:
private: private:
static FILE* m_debug_gl_file; static FILE* m_debug_gl_file;
bool m_disable_hw_gl_draw;
// Place holder for the GLSL shader code (to avoid useless reload) // Place holder for the GLSL shader code (to avoid useless reload)
std::string m_shader_common_header; std::string m_shader_common_header;
std::string m_shader_tfx_vgs; std::string m_shader_tfx_vgs;