Commit: c5e71cebaa9b32ce78b9c14f38e93cb0d304b347 Author: Sergey Sharybin Date: Fri Dec 2 16:47:14 2022 +0100 Branches: master https://developer.blender.org/rBc5e71cebaa9b32ce78b9c14f38e93cb0d304b347
Cycles: Remove OpenGL header It is not really used from any of the sources, including the standalone app. Since we are moving to a more backend-independent drawing it makes sense to remove header which was specific to how Blender integrates Cycles into viewport. There is probably some cleanup in CMake files is possible, but there is some inter-dependency with USD. Differential Revision: https://developer.blender.org/D16681 =================================================================== M intern/cycles/blender/display_driver.cpp M intern/cycles/blender/python.cpp M intern/cycles/blender/sync.cpp M intern/cycles/util/CMakeLists.txt D intern/cycles/util/opengl.h =================================================================== diff --git a/intern/cycles/blender/display_driver.cpp b/intern/cycles/blender/display_driver.cpp index f07d8b41838..7149592ad83 100644 --- a/intern/cycles/blender/display_driver.cpp +++ b/intern/cycles/blender/display_driver.cpp @@ -6,7 +6,6 @@ #include "device/device.h" #include "util/log.h" #include "util/math.h" -#include "util/opengl.h" #include "GPU_context.h" #include "GPU_immediate.h" diff --git a/intern/cycles/blender/python.cpp b/intern/cycles/blender/python.cpp index d27bd26f3dc..cfc7a78143c 100644 --- a/intern/cycles/blender/python.cpp +++ b/intern/cycles/blender/python.cpp @@ -18,7 +18,6 @@ #include "util/guiding.h" #include "util/log.h" #include "util/md5.h" -#include "util/opengl.h" #include "util/openimagedenoise.h" #include "util/path.h" #include "util/string.h" diff --git a/intern/cycles/blender/sync.cpp b/intern/cycles/blender/sync.cpp index 5251f0fee9c..d3598fd19b9 100644 --- a/intern/cycles/blender/sync.cpp +++ b/intern/cycles/blender/sync.cpp @@ -26,7 +26,6 @@ #include "util/foreach.h" #include "util/hash.h" #include "util/log.h" -#include "util/opengl.h" #include "util/openimagedenoise.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index 7f8f4a5ce76..ea5a5de654d 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -74,7 +74,6 @@ set(SRC_HEADERS md5.h murmurhash.h openimagedenoise.h - opengl.h openvdb.h optimization.h param.h diff --git a/intern/cycles/util/opengl.h b/intern/cycles/util/opengl.h deleted file mode 100644 index fefee4ec022..00000000000 --- a/intern/cycles/util/opengl.h +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 - * Copyright 2011-2022 Blender Foundation */ - -#ifndef __UTIL_OPENGL_H__ -#define __UTIL_OPENGL_H__ - -/* OpenGL header includes, used everywhere we use OpenGL, to deal with - * platform differences in one central place. */ - -#include <epoxy/gl.h> - -#endif /* __UTIL_OPENGL_H__ */ _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
