diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-07-25 19:41:55 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-07-26 18:28:48 +0300 |
commit | cc7d5e1fe68470198fd6234f0518a9be8514656e (patch) | |
tree | 535ea1e800d4ee337d231ae3d400930d094c270f | |
parent | c276ef61d4ac52d40bbfc3fc82b84ed31fced49e (diff) |
GPU: Move gpu_platform.c to C++
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/gpu/GPU_platform.h | 3 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_platform.cc (renamed from source/blender/gpu/intern/gpu_platform.c) | 0 |
3 files changed, 4 insertions, 1 deletions
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 index 5cabde61bc3..5cabde61bc3 100644 --- a/source/blender/gpu/intern/gpu_platform.c +++ b/source/blender/gpu/intern/gpu_platform.cc |