mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-30 15:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to initialize the display with GPU acceleration and then without it

Browse Source
This commit is contained in:
David Capello 2015-10-06 17:04:03 -03:00
parent f98c4df79a
commit 165c7ccca4
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/app/modules/gui.cpp
View File

@ -100,15 +100,16 @@ static int get_screen_scale()
return scale; return scale;
} }
// Initializes GUI. static bool create_main_display(bool gpuAccel,
int init_module_gui() bool& maximized,
std::string& lastError)
{ {
std::string lastError = "Unknown error";
int w, h; int w, h;
bool maximized;
int scale = get_screen_scale(); int scale = get_screen_scale();
load_gui_config(w, h, maximized); load_gui_config(w, h, maximized);
she::instance()->setGpuAcceleration(gpuAccel);
try { try {
if (w > 0 && h > 0) if (w > 0 && h > 0)
main_display = she::instance()->createDisplay(w, h, scale); main_display = she::instance()->createDisplay(w, h, scale);
@ -135,8 +136,32 @@ int init_module_gui()
} }
} }
return (main_display != nullptr);
}
// Initializes GUI.
int init_module_gui()
{
bool maximized = false;
std::string lastError = "Unknown error";
bool gpuAccel = Preferences::instance().general.gpuAcceleration();
if (!create_main_display(gpuAccel, maximized, lastError)) {
// If we've created the display with hardware acceleration,
// now we try to do it without hardware acceleration.
if (gpuAccel &&
(int(she::instance()->capabilities()) &
int(she::Capabilities::GpuAccelerationSwitch)) == int(she::Capabilities::GpuAccelerationSwitch)) {
if (create_main_display(false, maximized, lastError)) {
// Disable hardware acceleration
Preferences::instance().general.gpuAcceleration(false);
}
}
}
if (!main_display) { if (!main_display) {
she::error_message(("Unable to create a user-interface display.\nDetails: "+lastError+"\n").c_str()); she::error_message(
("Unable to create a user-interface display.\nDetails: "+lastError+"\n").c_str());
return -1; return -1;
} }