From cc7d5e1fe68470198fd6234f0518a9be8514656e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Sat, 25 Jul 2020 18:41:55 +0200 Subject: [PATCH] GPU: Move gpu_platform.c to C++ --- source/blender/gpu/CMakeLists.txt | 2 +- source/blender/gpu/GPU_platform.h | 3 +++ source/blender/gpu/intern/{gpu_platform.c => gpu_platform.cc} | 0 3 files changed, 4 insertions(+), 1 deletion(-) rename source/blender/gpu/intern/{gpu_platform.c => gpu_platform.cc} (100%) diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index dce49392e02..3c7ff51ea24 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -70,7 +70,7 @@ set(SRC intern/gpu_material_library.c intern/gpu_matrix.c intern/gpu_node_graph.c - intern/gpu_platform.c + intern/gpu_platform.cc intern/gpu_primitive.c intern/gpu_select.c intern/gpu_select_pick.c diff --git a/source/blender/gpu/GPU_platform.h b/source/blender/gpu/GPU_platform.h index f199a748cb5..d9b9ee2a308 100644 --- a/source/blender/gpu/GPU_platform.h +++ b/source/blender/gpu/GPU_platform.h @@ -25,6 +25,7 @@ #define __GPU_PLATFORM_H__ #include "BLI_sys_types.h" +#include "BLI_utildefines.h" #ifdef __cplusplus extern "C" { @@ -43,6 +44,8 @@ typedef enum eGPUDeviceType { GPU_DEVICE_ANY = (0xff), } eGPUDeviceType; +ENUM_OPERATORS(eGPUDeviceType) + typedef enum eGPUOSType { GPU_OS_WIN = (1 << 8), GPU_OS_MAC = (1 << 9), diff --git a/source/blender/gpu/intern/gpu_platform.c b/source/blender/gpu/intern/gpu_platform.cc similarity index 100% rename from source/blender/gpu/intern/gpu_platform.c rename to source/blender/gpu/intern/gpu_platform.cc