Differential D14525 Diff 50021 source/blender/gpu/GPU_platform.h

Changeset View

Standalone View

source/blender/gpu/GPU_platform.h

	Show All 19 Lines
	} eGPUBackendType;			} eGPUBackendType;

	/* GPU Types */			/* GPU Types */
	typedef enum eGPUDeviceType {			typedef enum eGPUDeviceType {
	GPU_DEVICE_NVIDIA = (1 << 0),			GPU_DEVICE_NVIDIA = (1 << 0),
	GPU_DEVICE_ATI = (1 << 1),			GPU_DEVICE_ATI = (1 << 1),
	GPU_DEVICE_INTEL = (1 << 2),			GPU_DEVICE_INTEL = (1 << 2),
	GPU_DEVICE_INTEL_UHD = (1 << 3),			GPU_DEVICE_INTEL_UHD = (1 << 3),
	GPU_DEVICE_APPLE = (1 << 3),			GPU_DEVICE_APPLE = (1 << 3),
				deadpinUnsubmitted Done Inline Actions Oof... is there a separate patch for this duplicate value?? Seems wrong / would at least deserve a comment if nothing else. deadpin: Oof... is there a separate patch for this duplicate value?? Seems wrong / would at least…
				Ethan1080AuthorUnsubmitted Done Inline Actions Would have to ask @Brecht Van Lommel (brecht). The change was made to prevent a warning message for unknown GPU: rB62419975b78b Maybe it is just a temporary fix until the Metal work is further along. It could use a comment though. Ethan1080: Would have to ask @brecht. The change was made to prevent a warning message for unknown GPU…
				brechtUnsubmitted Done Inline Actions Thanks, I committed a fix for that in rBaa1ae1d3c8ef: Fix overlapping GPU device bitmasks. brecht: Thanks, I committed a fix for that in {rBaa1ae1d}.
	GPU_DEVICE_SOFTWARE = (1 << 4),			GPU_DEVICE_SOFTWARE = (1 << 4),
	GPU_DEVICE_UNKNOWN = (1 << 5),			GPU_DEVICE_UNKNOWN = (1 << 5),
	GPU_DEVICE_ANY = (0xff),			GPU_DEVICE_ANY = (0xff),
	} eGPUDeviceType;			} eGPUDeviceType;

	ENUM_OPERATORS(eGPUDeviceType, GPU_DEVICE_ANY)			ENUM_OPERATORS(eGPUDeviceType, 1 << 7)
				deadpinUnsubmitted Done Inline Actions This 7 probably depends on the answer to the above. deadpin: This 7 probably depends on the answer to the above.
				Ethan1080AuthorUnsubmitted Done Inline Actions I set the value to `(1 << 7)` is to ensure that `GPU_DEVICE_ANY` (AKA `0xff`) is fully included in the bitmask. Since there is no (1 << 6) or (1 << 7), I think 7 is independent of the answer to the above comment. Ethan1080: I set the value to `(1 << 7)` is to ensure that `GPU_DEVICE_ANY` (AKA `0xff`) is fully included…

	typedef enum eGPUOSType {			typedef enum eGPUOSType {
	GPU_OS_WIN = (1 << 8),			GPU_OS_WIN = (1 << 8),
	GPU_OS_MAC = (1 << 9),			GPU_OS_MAC = (1 << 9),
	GPU_OS_UNIX = (1 << 10),			GPU_OS_UNIX = (1 << 10),
	GPU_OS_ANY = (0xff00),			GPU_OS_ANY = (0xff00),
	} eGPUOSType;			} eGPUOSType;

	Show All 36 Lines