mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu-mainline.git
				synced 2025-03-21 01:53:15 +00:00 
			
		
		
		
	rasterizer_opengl: Remove OpenGL core profile
This commit is contained in:
		
							parent
							
								
									e3608578e4
								
							
						
					
					
						commit
						7259f7a733
					
				@ -90,7 +90,6 @@ void LogSettings() {
 | 
			
		||||
    LogSetting("Renderer_UseResolutionFactor", Settings::values.resolution_factor);
 | 
			
		||||
    LogSetting("Renderer_UseFrameLimit", Settings::values.use_frame_limit);
 | 
			
		||||
    LogSetting("Renderer_FrameLimit", Settings::values.frame_limit);
 | 
			
		||||
    LogSetting("Renderer_UseCompatibilityProfile", Settings::values.use_compatibility_profile);
 | 
			
		||||
    LogSetting("Renderer_UseDiskShaderCache", Settings::values.use_disk_shader_cache);
 | 
			
		||||
    LogSetting("Renderer_UseAccurateGpuEmulation", Settings::values.use_accurate_gpu_emulation);
 | 
			
		||||
    LogSetting("Renderer_UseAsynchronousGpuEmulation",
 | 
			
		||||
 | 
			
		||||
@ -390,7 +390,6 @@ struct Values {
 | 
			
		||||
    float resolution_factor;
 | 
			
		||||
    bool use_frame_limit;
 | 
			
		||||
    u16 frame_limit;
 | 
			
		||||
    bool use_compatibility_profile;
 | 
			
		||||
    bool use_disk_shader_cache;
 | 
			
		||||
    bool use_accurate_gpu_emulation;
 | 
			
		||||
    bool use_asynchronous_gpu_emulation;
 | 
			
		||||
 | 
			
		||||
@ -379,12 +379,8 @@ void GRenderWindow::InitRenderTarget() {
 | 
			
		||||
    // WA_DontShowOnScreen, WA_DeleteOnClose
 | 
			
		||||
    QSurfaceFormat fmt;
 | 
			
		||||
    fmt.setVersion(4, 3);
 | 
			
		||||
    if (Settings::values.use_compatibility_profile) {
 | 
			
		||||
        fmt.setProfile(QSurfaceFormat::CompatibilityProfile);
 | 
			
		||||
        fmt.setOption(QSurfaceFormat::FormatOption::DeprecatedFunctions);
 | 
			
		||||
    } else {
 | 
			
		||||
        fmt.setProfile(QSurfaceFormat::CoreProfile);
 | 
			
		||||
    }
 | 
			
		||||
    fmt.setProfile(QSurfaceFormat::CompatibilityProfile);
 | 
			
		||||
    fmt.setOption(QSurfaceFormat::FormatOption::DeprecatedFunctions);
 | 
			
		||||
    // TODO: expose a setting for buffer value (ie default/single/double/triple)
 | 
			
		||||
    fmt.setSwapBehavior(QSurfaceFormat::DefaultSwapBehavior);
 | 
			
		||||
    shared_context = std::make_unique<QOpenGLContext>();
 | 
			
		||||
 | 
			
		||||
@ -531,8 +531,6 @@ void Config::ReadRendererValues() {
 | 
			
		||||
    Settings::values.use_frame_limit =
 | 
			
		||||
        ReadSetting(QStringLiteral("use_frame_limit"), true).toBool();
 | 
			
		||||
    Settings::values.frame_limit = ReadSetting(QStringLiteral("frame_limit"), 100).toInt();
 | 
			
		||||
    Settings::values.use_compatibility_profile =
 | 
			
		||||
        ReadSetting(QStringLiteral("use_compatibility_profile"), true).toBool();
 | 
			
		||||
    Settings::values.use_disk_shader_cache =
 | 
			
		||||
        ReadSetting(QStringLiteral("use_disk_shader_cache"), true).toBool();
 | 
			
		||||
    Settings::values.use_accurate_gpu_emulation =
 | 
			
		||||
@ -912,8 +910,6 @@ void Config::SaveRendererValues() {
 | 
			
		||||
                 static_cast<double>(Settings::values.resolution_factor), 1.0);
 | 
			
		||||
    WriteSetting(QStringLiteral("use_frame_limit"), Settings::values.use_frame_limit, true);
 | 
			
		||||
    WriteSetting(QStringLiteral("frame_limit"), Settings::values.frame_limit, 100);
 | 
			
		||||
    WriteSetting(QStringLiteral("use_compatibility_profile"),
 | 
			
		||||
                 Settings::values.use_compatibility_profile, true);
 | 
			
		||||
    WriteSetting(QStringLiteral("use_disk_shader_cache"), Settings::values.use_disk_shader_cache,
 | 
			
		||||
                 true);
 | 
			
		||||
    WriteSetting(QStringLiteral("use_accurate_gpu_emulation"),
 | 
			
		||||
 | 
			
		||||
@ -75,8 +75,6 @@ void ConfigureGraphics::setConfiguration() {
 | 
			
		||||
        static_cast<int>(FromResolutionFactor(Settings::values.resolution_factor)));
 | 
			
		||||
    ui->toggle_frame_limit->setChecked(Settings::values.use_frame_limit);
 | 
			
		||||
    ui->frame_limit->setValue(Settings::values.frame_limit);
 | 
			
		||||
    ui->use_compatibility_profile->setEnabled(runtime_lock);
 | 
			
		||||
    ui->use_compatibility_profile->setChecked(Settings::values.use_compatibility_profile);
 | 
			
		||||
    ui->use_disk_shader_cache->setEnabled(runtime_lock);
 | 
			
		||||
    ui->use_disk_shader_cache->setChecked(Settings::values.use_disk_shader_cache);
 | 
			
		||||
    ui->use_accurate_gpu_emulation->setChecked(Settings::values.use_accurate_gpu_emulation);
 | 
			
		||||
@ -93,7 +91,6 @@ void ConfigureGraphics::applyConfiguration() {
 | 
			
		||||
        ToResolutionFactor(static_cast<Resolution>(ui->resolution_factor_combobox->currentIndex()));
 | 
			
		||||
    Settings::values.use_frame_limit = ui->toggle_frame_limit->isChecked();
 | 
			
		||||
    Settings::values.frame_limit = ui->frame_limit->value();
 | 
			
		||||
    Settings::values.use_compatibility_profile = ui->use_compatibility_profile->isChecked();
 | 
			
		||||
    Settings::values.use_disk_shader_cache = ui->use_disk_shader_cache->isChecked();
 | 
			
		||||
    Settings::values.use_accurate_gpu_emulation = ui->use_accurate_gpu_emulation->isChecked();
 | 
			
		||||
    Settings::values.use_asynchronous_gpu_emulation =
 | 
			
		||||
 | 
			
		||||
@ -49,13 +49,6 @@
 | 
			
		||||
          </item>
 | 
			
		||||
         </layout>
 | 
			
		||||
        </item>
 | 
			
		||||
        <item>
 | 
			
		||||
         <widget class="QCheckBox" name="use_compatibility_profile">
 | 
			
		||||
          <property name="text">
 | 
			
		||||
           <string>Use OpenGL compatibility profile</string>
 | 
			
		||||
          </property>
 | 
			
		||||
         </widget>
 | 
			
		||||
        </item>
 | 
			
		||||
        <item>
 | 
			
		||||
         <widget class="QCheckBox" name="use_disk_shader_cache">
 | 
			
		||||
          <property name="text">
 | 
			
		||||
 | 
			
		||||
@ -349,8 +349,6 @@ void Config::ReadValues() {
 | 
			
		||||
    Settings::values.use_frame_limit = sdl2_config->GetBoolean("Renderer", "use_frame_limit", true);
 | 
			
		||||
    Settings::values.frame_limit =
 | 
			
		||||
        static_cast<u16>(sdl2_config->GetInteger("Renderer", "frame_limit", 100));
 | 
			
		||||
    Settings::values.use_compatibility_profile =
 | 
			
		||||
        sdl2_config->GetBoolean("Renderer", "use_compatibility_profile", true);
 | 
			
		||||
    Settings::values.use_disk_shader_cache =
 | 
			
		||||
        sdl2_config->GetBoolean("Renderer", "use_disk_shader_cache", false);
 | 
			
		||||
    Settings::values.use_accurate_gpu_emulation =
 | 
			
		||||
 | 
			
		||||
@ -74,13 +74,9 @@ bool EmuWindow_SDL2_GL::SupportsRequiredGLExtensions() {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(bool fullscreen) : EmuWindow_SDL2(fullscreen) {
 | 
			
		||||
    const SDL_GLprofile profile = Settings::values.use_compatibility_profile
 | 
			
		||||
                                      ? SDL_GL_CONTEXT_PROFILE_COMPATIBILITY
 | 
			
		||||
                                      : SDL_GL_CONTEXT_PROFILE_CORE;
 | 
			
		||||
 | 
			
		||||
    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4);
 | 
			
		||||
    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
 | 
			
		||||
    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profile);
 | 
			
		||||
    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_RED_SIZE, 8);
 | 
			
		||||
    SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user