Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
godotengine
GitHub Repository: godotengine/godot
 Path: blob/master/thirdparty/embree/patches/0002-godot-config.patch
9902 views
1
diff --git a/thirdparty/embree/include/embree4/rtcore_config.h b/thirdparty/embree/include/embree4/rtcore_config.h

2
index eba966989e..91cf129dc6 100644

3
--- a/thirdparty/embree/include/embree4/rtcore_config.h

4
+++ b/thirdparty/embree/include/embree4/rtcore_config.h

5
@@ -4,7 +4,7 @@

6
 #pragma once

7
 

8
 #if !defined(EMBREE_SYCL_SUPPORT)

9
-#cmakedefine EMBREE_SYCL_SUPPORT

10
+// #cmakedefine EMBREE_SYCL_SUPPORT

11
 #endif

12
 

13
 #define RTC_VERSION_MAJOR 4

14
@@ -13,28 +13,28 @@

15
 #define RTC_VERSION 40400

16
 #define RTC_VERSION_STRING "4.4.0"

17
 

18
-#define RTC_MAX_INSTANCE_LEVEL_COUNT @EMBREE_MAX_INSTANCE_LEVEL_COUNT@

19
+#define RTC_MAX_INSTANCE_LEVEL_COUNT 1

20
 

21
-#cmakedefine EMBREE_GEOMETRY_INSTANCE_ARRAY

22
+// #cmakedefine EMBREE_GEOMETRY_INSTANCE_ARRAY

23
 #if defined(EMBREE_GEOMETRY_INSTANCE_ARRAY)

24
   #define RTC_GEOMETRY_INSTANCE_ARRAY

25
 #endif

26
 

27
-#cmakedefine01 EMBREE_SYCL_GEOMETRY_CALLBACK

28
+// #cmakedefine01 EMBREE_SYCL_GEOMETRY_CALLBACK

29
 

30
-#cmakedefine01 EMBREE_MIN_WIDTH

31
+#define EMBREE_MIN_WIDTH 0

32
 #define RTC_MIN_WIDTH EMBREE_MIN_WIDTH

33
 

34
 #if !defined(EMBREE_STATIC_LIB)

35
-#cmakedefine EMBREE_STATIC_LIB

36
+#define EMBREE_STATIC_LIB

37
 #endif

38
-#cmakedefine EMBREE_API_NAMESPACE

39
+// #cmakedefine EMBREE_API_NAMESPACE

40
 

41
 #if defined(EMBREE_API_NAMESPACE)

42
-#  define RTC_NAMESPACE @EMBREE_API_NAMESPACE@

43
-#  define RTC_NAMESPACE_BEGIN namespace @EMBREE_API_NAMESPACE@ {

44
+#  define RTC_NAMESPACE

45
+#  define RTC_NAMESPACE_BEGIN namespace {

46
 #  define RTC_NAMESPACE_END }

47
-#  define RTC_NAMESPACE_USE using namespace @EMBREE_API_NAMESPACE@;

48
+#  define RTC_NAMESPACE_USE using namespace;

49
 #  define RTC_API_EXTERN_C

50
 #  define RTC_API_EXTERN_CPP

51
 #  undef EMBREE_API_NAMESPACE

52
diff --git a/thirdparty/embree/kernels/config.h b/thirdparty/embree/kernels/config.h

53
index 1669c4af72..5979b543c9 100644

54
--- a/thirdparty/embree/kernels/config.h

55
+++ b/thirdparty/embree/kernels/config.h

56
@@ -3,27 +3,27 @@

57
 

58
 #include "../include/embree4/rtcore_config.h"

59
 

60
-#cmakedefine EMBREE_RAY_MASK

61
-#cmakedefine EMBREE_STAT_COUNTERS

62
-#cmakedefine EMBREE_BACKFACE_CULLING

63
-#cmakedefine EMBREE_BACKFACE_CULLING_CURVES

64
-#cmakedefine EMBREE_BACKFACE_CULLING_SPHERES

65
-#cmakedefine EMBREE_FILTER_FUNCTION

66
-#cmakedefine EMBREE_IGNORE_INVALID_RAYS

67
-#cmakedefine EMBREE_GEOMETRY_TRIANGLE

68
-#cmakedefine EMBREE_GEOMETRY_QUAD

69
-#cmakedefine EMBREE_GEOMETRY_CURVE

70
-#cmakedefine EMBREE_GEOMETRY_SUBDIVISION

71
-#cmakedefine EMBREE_GEOMETRY_USER

72
-#cmakedefine EMBREE_GEOMETRY_INSTANCE

73
+// #cmakedefine EMBREE_RAY_MASK

74
+// #cmakedefine EMBREE_STAT_COUNTERS

75
+// #cmakedefine EMBREE_BACKFACE_CULLING

76
+// #cmakedefine EMBREE_BACKFACE_CULLING_CURVES

77
+// #cmakedefine EMBREE_BACKFACE_CULLING_SPHERES

78
+#define EMBREE_FILTER_FUNCTION

79
+// #cmakedefine EMBREE_IGNORE_INVALID_RAYS

80
+#define EMBREE_GEOMETRY_TRIANGLE

81
+// #cmakedefine EMBREE_GEOMETRY_QUAD

82
+// #cmakedefine EMBREE_GEOMETRY_CURVE

83
+// #cmakedefine EMBREE_GEOMETRY_SUBDIVISION

84
+// #cmakedefine EMBREE_GEOMETRY_USER

85
+// #cmakedefine EMBREE_GEOMETRY_INSTANCE

86
 // EMBREE_GEOMETRY_INSTANCE_ARRAY is defined in rtcore_config.h

87
-#cmakedefine EMBREE_GEOMETRY_GRID

88
-#cmakedefine EMBREE_GEOMETRY_POINT

89
-#cmakedefine EMBREE_RAY_PACKETS

90
-#cmakedefine EMBREE_COMPACT_POLYS

91
+// #cmakedefine EMBREE_GEOMETRY_GRID

92
+// #cmakedefine EMBREE_GEOMETRY_POINT

93
+#define EMBREE_RAY_PACKETS

94
+// #cmakedefine EMBREE_COMPACT_POLYS

95
 

96
-#define EMBREE_CURVE_SELF_INTERSECTION_AVOIDANCE_FACTOR @EMBREE_CURVE_SELF_INTERSECTION_AVOIDANCE_FACTOR@

97
-#cmakedefine EMBREE_DISC_POINT_SELF_INTERSECTION_AVOIDANCE

98
+#define EMBREE_CURVE_SELF_INTERSECTION_AVOIDANCE_FACTOR 2.0

99
+#define EMBREE_DISC_POINT_SELF_INTERSECTION_AVOIDANCE

100
 

101
 #if defined(EMBREE_GEOMETRY_TRIANGLE)

102
   #define IF_ENABLED_TRIS(x) x

103


104