Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-10-09 14:36:56 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-10-09 14:41:26 +0300
commitcf682b9dab36c4b96084c6f7b5e4ebc1f33ca28e (patch)
tree623402d486f638d4157742903899d80945117f1b /source/blender
parent26b1216629c8a7f6201333514b8fdbf43e10b385 (diff)
GPU: show more descriptive labels on unsupported GPU dialog
Thanks to Ray Molenkamp for the help with the Windows implementation. Fixes T70521 Differential Revision: https://developer.blender.org/D6023
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/windowmanager/intern/wm_platform_support.c23
-rw-r--r--source/blender/windowmanager/intern/wm_window.c4
-rw-r--r--source/blender/windowmanager/intern/wm_window_private.h2
3 files changed, 18 insertions, 11 deletions
diff --git a/source/blender/windowmanager/intern/wm_platform_support.c b/source/blender/windowmanager/intern/wm_platform_support.c
index 9ed6f9f4299..5153fc33d49 100644
--- a/source/blender/windowmanager/intern/wm_platform_support.c
+++ b/source/blender/windowmanager/intern/wm_platform_support.c
@@ -152,10 +152,11 @@ bool WM_platform_support_perform_checks()
/* TODO: Extra space is needed for the split function in GHOST_SystemX11. We should change
* the behavior in GHOST_SystemX11. */
STR_CONCAT(message, slen, "\n \n");
- STR_CONCAT(message,
- slen,
- CTX_IFACE_(BLT_I18NCONTEXT_ID_WINDOWMANAGER,
- "Press help to see if the support can be improved."));
+ STR_CONCAT(
+ message,
+ slen,
+ CTX_IFACE_(BLT_I18NCONTEXT_ID_WINDOWMANAGER,
+ "Newer graphics drivers may be available to improve Blender support."));
STR_CONCAT(message, slen, "\n \n");
STR_CONCAT(message, slen, CTX_IFACE_(BLT_I18NCONTEXT_ID_WINDOWMANAGER, "Graphics card:\n"));
STR_CONCAT(message, slen, GPU_platform_gpu_name());
@@ -176,10 +177,11 @@ bool WM_platform_support_perform_checks()
"Your graphics card or driver is not supported."));
STR_CONCAT(message, slen, "\n \n");
- STR_CONCAT(message,
- slen,
- CTX_IFACE_(BLT_I18NCONTEXT_ID_WINDOWMANAGER,
- "Press help to see if the support can be improved."));
+ STR_CONCAT(
+ message,
+ slen,
+ CTX_IFACE_(BLT_I18NCONTEXT_ID_WINDOWMANAGER,
+ "Newer graphics drivers may be available to improve Blender support."));
STR_CONCAT(message, slen, "\n \n");
STR_CONCAT(message, slen, CTX_IFACE_(BLT_I18NCONTEXT_ID_WINDOWMANAGER, "Graphics card:\n"));
@@ -209,8 +211,9 @@ bool WM_platform_support_perform_checks()
result = true;
}
else if (show_message) {
- WM_ghost_show_message_box(title, message, link, dialog_options);
+ WM_ghost_show_message_box(
+ title, message, "Find Latest Drivers", "Continue Anyway", link, dialog_options);
}
return result;
-} \ No newline at end of file
+}
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index ac10f9489a2..fa2320585d7 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -2435,10 +2435,12 @@ void WM_opengl_context_release(void *context)
void WM_ghost_show_message_box(const char *title,
const char *message,
+ const char *help_label,
+ const char *continue_label,
const char *link,
GHOST_DialogOptions dialog_options)
{
BLI_assert(g_system);
- GHOST_ShowMessageBox(g_system, title, message, link, dialog_options);
+ GHOST_ShowMessageBox(g_system, title, message, help_label, continue_label, link, dialog_options);
}
/** \} */
diff --git a/source/blender/windowmanager/intern/wm_window_private.h b/source/blender/windowmanager/intern/wm_window_private.h
index 189b77721cf..115539861d7 100644
--- a/source/blender/windowmanager/intern/wm_window_private.h
+++ b/source/blender/windowmanager/intern/wm_window_private.h
@@ -34,6 +34,8 @@
* In all other cases this message box should not be used. */
void WM_ghost_show_message_box(const char *title,
const char *message,
+ const char *help_label,
+ const char *continue_label,
const char *link,
GHOST_DialogOptions dialog_options);