mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 14:43:23 +02:00
renderer_opengl: Update OpenGL backend version requirement to 4.6
This commit is contained in:
parent
230e71b255
commit
6e5cc977ad
@ -506,7 +506,7 @@ bool RendererOpenGL::Init() {
|
|||||||
|
|
||||||
AddTelemetryFields();
|
AddTelemetryFields();
|
||||||
|
|
||||||
if (!GLAD_GL_VERSION_4_3) {
|
if (!GLAD_GL_VERSION_4_6) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ public:
|
|||||||
/// Create the original context that should be shared from
|
/// Create the original context that should be shared from
|
||||||
explicit OpenGLSharedContext(QSurface* surface) : surface(surface) {
|
explicit OpenGLSharedContext(QSurface* surface) : surface(surface) {
|
||||||
QSurfaceFormat format;
|
QSurfaceFormat format;
|
||||||
format.setVersion(4, 3);
|
format.setVersion(4, 6);
|
||||||
format.setProfile(QSurfaceFormat::CompatibilityProfile);
|
format.setProfile(QSurfaceFormat::CompatibilityProfile);
|
||||||
format.setOption(QSurfaceFormat::FormatOption::DeprecatedFunctions);
|
format.setOption(QSurfaceFormat::FormatOption::DeprecatedFunctions);
|
||||||
if (Settings::values.renderer_debug) {
|
if (Settings::values.renderer_debug) {
|
||||||
@ -651,10 +651,10 @@ bool GRenderWindow::LoadOpenGL() {
|
|||||||
const QString renderer =
|
const QString renderer =
|
||||||
QString::fromUtf8(reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
|
QString::fromUtf8(reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
|
||||||
|
|
||||||
if (!GLAD_GL_VERSION_4_3) {
|
if (!GLAD_GL_VERSION_4_6) {
|
||||||
LOG_ERROR(Frontend, "GPU does not support OpenGL 4.3: {}", renderer.toStdString());
|
LOG_ERROR(Frontend, "GPU does not support OpenGL 4.6: {}", renderer.toStdString());
|
||||||
QMessageBox::warning(this, tr("Error while initializing OpenGL 4.3!"),
|
QMessageBox::warning(this, tr("Error while initializing OpenGL 4.6!"),
|
||||||
tr("Your GPU may not support OpenGL 4.3, or you do not have the "
|
tr("Your GPU may not support OpenGL 4.6, or you do not have the "
|
||||||
"latest graphics driver.<br><br>GL Renderer:<br>%1")
|
"latest graphics driver.<br><br>GL Renderer:<br>%1")
|
||||||
.arg(renderer));
|
.arg(renderer));
|
||||||
return false;
|
return false;
|
||||||
@ -677,26 +677,13 @@ bool GRenderWindow::LoadOpenGL() {
|
|||||||
QStringList GRenderWindow::GetUnsupportedGLExtensions() const {
|
QStringList GRenderWindow::GetUnsupportedGLExtensions() const {
|
||||||
QStringList unsupported_ext;
|
QStringList unsupported_ext;
|
||||||
|
|
||||||
if (!GLAD_GL_ARB_buffer_storage)
|
|
||||||
unsupported_ext.append(QStringLiteral("ARB_buffer_storage"));
|
|
||||||
if (!GLAD_GL_ARB_direct_state_access)
|
|
||||||
unsupported_ext.append(QStringLiteral("ARB_direct_state_access"));
|
|
||||||
if (!GLAD_GL_ARB_vertex_type_10f_11f_11f_rev)
|
|
||||||
unsupported_ext.append(QStringLiteral("ARB_vertex_type_10f_11f_11f_rev"));
|
|
||||||
if (!GLAD_GL_ARB_texture_mirror_clamp_to_edge)
|
|
||||||
unsupported_ext.append(QStringLiteral("ARB_texture_mirror_clamp_to_edge"));
|
|
||||||
if (!GLAD_GL_ARB_multi_bind)
|
|
||||||
unsupported_ext.append(QStringLiteral("ARB_multi_bind"));
|
|
||||||
if (!GLAD_GL_ARB_clip_control)
|
|
||||||
unsupported_ext.append(QStringLiteral("ARB_clip_control"));
|
|
||||||
|
|
||||||
// Extensions required to support some texture formats.
|
// Extensions required to support some texture formats.
|
||||||
if (!GLAD_GL_EXT_texture_compression_s3tc)
|
if (!GLAD_GL_EXT_texture_compression_s3tc) {
|
||||||
unsupported_ext.append(QStringLiteral("EXT_texture_compression_s3tc"));
|
unsupported_ext.append(QStringLiteral("EXT_texture_compression_s3tc"));
|
||||||
if (!GLAD_GL_ARB_texture_compression_rgtc)
|
}
|
||||||
|
if (!GLAD_GL_ARB_texture_compression_rgtc) {
|
||||||
unsupported_ext.append(QStringLiteral("ARB_texture_compression_rgtc"));
|
unsupported_ext.append(QStringLiteral("ARB_texture_compression_rgtc"));
|
||||||
if (!GLAD_GL_ARB_depth_buffer_float)
|
}
|
||||||
unsupported_ext.append(QStringLiteral("ARB_depth_buffer_float"));
|
|
||||||
|
|
||||||
if (!unsupported_ext.empty()) {
|
if (!unsupported_ext.empty()) {
|
||||||
LOG_ERROR(Frontend, "GPU does not support all required extensions: {}",
|
LOG_ERROR(Frontend, "GPU does not support all required extensions: {}",
|
||||||
|
@ -59,29 +59,17 @@ private:
|
|||||||
bool EmuWindow_SDL2_GL::SupportsRequiredGLExtensions() {
|
bool EmuWindow_SDL2_GL::SupportsRequiredGLExtensions() {
|
||||||
std::vector<std::string_view> unsupported_ext;
|
std::vector<std::string_view> unsupported_ext;
|
||||||
|
|
||||||
if (!GLAD_GL_ARB_buffer_storage)
|
|
||||||
unsupported_ext.push_back("ARB_buffer_storage");
|
|
||||||
if (!GLAD_GL_ARB_direct_state_access)
|
|
||||||
unsupported_ext.push_back("ARB_direct_state_access");
|
|
||||||
if (!GLAD_GL_ARB_vertex_type_10f_11f_11f_rev)
|
|
||||||
unsupported_ext.push_back("ARB_vertex_type_10f_11f_11f_rev");
|
|
||||||
if (!GLAD_GL_ARB_texture_mirror_clamp_to_edge)
|
|
||||||
unsupported_ext.push_back("ARB_texture_mirror_clamp_to_edge");
|
|
||||||
if (!GLAD_GL_ARB_multi_bind)
|
|
||||||
unsupported_ext.push_back("ARB_multi_bind");
|
|
||||||
if (!GLAD_GL_ARB_clip_control)
|
|
||||||
unsupported_ext.push_back("ARB_clip_control");
|
|
||||||
|
|
||||||
// Extensions required to support some texture formats.
|
// Extensions required to support some texture formats.
|
||||||
if (!GLAD_GL_EXT_texture_compression_s3tc)
|
if (!GLAD_GL_EXT_texture_compression_s3tc) {
|
||||||
unsupported_ext.push_back("EXT_texture_compression_s3tc");
|
unsupported_ext.push_back("EXT_texture_compression_s3tc");
|
||||||
if (!GLAD_GL_ARB_texture_compression_rgtc)
|
}
|
||||||
|
if (!GLAD_GL_ARB_texture_compression_rgtc) {
|
||||||
unsupported_ext.push_back("ARB_texture_compression_rgtc");
|
unsupported_ext.push_back("ARB_texture_compression_rgtc");
|
||||||
if (!GLAD_GL_ARB_depth_buffer_float)
|
}
|
||||||
unsupported_ext.push_back("ARB_depth_buffer_float");
|
|
||||||
|
|
||||||
for (const auto& extension : unsupported_ext)
|
for (const auto& extension : unsupported_ext) {
|
||||||
LOG_CRITICAL(Frontend, "Unsupported GL extension: {}", extension);
|
LOG_CRITICAL(Frontend, "Unsupported GL extension: {}", extension);
|
||||||
|
}
|
||||||
|
|
||||||
return unsupported_ext.empty();
|
return unsupported_ext.empty();
|
||||||
}
|
}
|
||||||
@ -89,7 +77,7 @@ bool EmuWindow_SDL2_GL::SupportsRequiredGLExtensions() {
|
|||||||
EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsystem, bool fullscreen)
|
EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsystem, bool fullscreen)
|
||||||
: EmuWindow_SDL2{input_subsystem} {
|
: EmuWindow_SDL2{input_subsystem} {
|
||||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4);
|
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4);
|
||||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
|
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 6);
|
||||||
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
|
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
|
||||||
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
|
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
|
||||||
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
|
SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
|
||||||
|
Loading…
Reference in New Issue
Block a user