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 <brecht@blender.org>2021-02-02 01:33:20 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-02-02 14:08:23 +0300
commit62419975b78b3d65634ba17b5dccc93491e8ce6d (patch)
tree98c13b5896b293c9dc78dc97bbbad55d869d7337 /source/blender/gpu
parentd19aaad0bce1b7b9924dfe437603867ecdfc4d39 (diff)
macOS: fix warning about unkown GPU with Apple M1 chip
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/GPU_platform.h1
-rw-r--r--source/blender/gpu/opengl/gl_backend.cc5
2 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/gpu/GPU_platform.h b/source/blender/gpu/GPU_platform.h
index bb7e1d58041..c457b829bf7 100644
--- a/source/blender/gpu/GPU_platform.h
+++ b/source/blender/gpu/GPU_platform.h
@@ -34,6 +34,7 @@ typedef enum eGPUDeviceType {
GPU_DEVICE_ATI = (1 << 1),
GPU_DEVICE_INTEL = (1 << 2),
GPU_DEVICE_INTEL_UHD = (1 << 3),
+ GPU_DEVICE_APPLE = (1 << 3),
GPU_DEVICE_SOFTWARE = (1 << 4),
GPU_DEVICE_UNKNOWN = (1 << 5),
GPU_DEVICE_ANY = (0xff),
diff --git a/source/blender/gpu/opengl/gl_backend.cc b/source/blender/gpu/opengl/gl_backend.cc
index c49158176c6..573ae654af4 100644
--- a/source/blender/gpu/opengl/gl_backend.cc
+++ b/source/blender/gpu/opengl/gl_backend.cc
@@ -96,6 +96,11 @@ void GLBackend::platform_init()
GPG.device = GPU_DEVICE_SOFTWARE;
GPG.driver = GPU_DRIVER_SOFTWARE;
}
+ else if (strstr(vendor, "Apple")) {
+ /* Apple Silicon. */
+ GPG.device = GPU_DEVICE_APPLE;
+ GPG.driver = GPU_DRIVER_OFFICIAL;
+ }
else if (strstr(renderer, "Apple Software Renderer")) {
GPG.device = GPU_DEVICE_SOFTWARE;
GPG.driver = GPU_DRIVER_SOFTWARE;