diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-06-04 16:14:52 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-06-04 16:15:00 +0300 |
| commit | 1dc31f5b982559bbe875d469950ee7404e9a4a3c (patch) | |
| tree | fd54a382ee9de611d2e6f74500a907df46aa1b7f | |
| parent | e47e60a9b9692ed0e0fc0397e2841f9d547847c4 (diff) | |
GPU: Fix missing case of new radeon on xorg.
This was causing issue with shader compilation.
| -rw-r--r-- | source/blender/gpu/intern/gpu_extensions.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c index 73e86c1b391..226711e230f 100644 --- a/source/blender/gpu/intern/gpu_extensions.c +++ b/source/blender/gpu/intern/gpu_extensions.c @@ -174,7 +174,7 @@ void gpu_extensions_init(void) const char *renderer = (const char *)glGetString(GL_RENDERER); const char *version = (const char *)glGetString(GL_VERSION); - if (strstr(vendor, "ATI")) { + if (strstr(vendor, "ATI") || strstr(vendor, "AMD")) { GG.device = GPU_DEVICE_ATI; GG.driver = GPU_DRIVER_OFFICIAL; } @@ -191,6 +191,7 @@ void gpu_extensions_init(void) GG.driver = GPU_DRIVER_OFFICIAL; } else if ((strstr(renderer, "Mesa DRI R")) || + (strstr(renderer, "Radeon") && strstr(vendor, "X.Org")) || (strstr(renderer, "Gallium ") && strstr(renderer, " on ATI ")) || (strstr(renderer, "Gallium ") && strstr(renderer, " on AMD "))) { @@ -214,6 +215,7 @@ void gpu_extensions_init(void) GG.driver = GPU_DRIVER_SOFTWARE; } else { + printf("Warning: Could not find a matching GPU name. Things may not behave as expected.\n"); GG.device = GPU_DEVICE_ANY; GG.driver = GPU_DRIVER_ANY; } |