[Bf-blender-cvs] [aa1ae1d3c8e] master: Fix overlapping GPU device bitmasks

Brecht Van Lommel noreply at git.blender.org
Mon Apr 4 16:47:30 CEST 2022


Commit: aa1ae1d3c8ef26538b568ab36f9e705242f1204c
Author: Brecht Van Lommel
Date:   Mon Apr 4 16:33:33 2022 +0200
Branches: master
https://developer.blender.org/rBaa1ae1d3c8ef26538b568ab36f9e705242f1204c

Fix overlapping GPU device bitmasks

This did not end up affecting actual behavior, but it is wrong.
Found by Ethan Hall.

Ref D14525

===================================================================

M	source/blender/gpu/GPU_platform.h

===================================================================

diff --git a/source/blender/gpu/GPU_platform.h b/source/blender/gpu/GPU_platform.h
index d999216c7ff..b63fe4c0580 100644
--- a/source/blender/gpu/GPU_platform.h
+++ b/source/blender/gpu/GPU_platform.h
@@ -25,9 +25,9 @@ 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_APPLE = (1 << 4),
+  GPU_DEVICE_SOFTWARE = (1 << 5),
+  GPU_DEVICE_UNKNOWN = (1 << 6),
   GPU_DEVICE_ANY = (0xff),
 } eGPUDeviceType;



More information about the Bf-blender-cvs mailing list