0002-godot-config.patch 3.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102
  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. #if !defined(EMBREE_SYCL_SUPPORT)
  8. -#cmakedefine EMBREE_SYCL_SUPPORT
  9. +// #cmakedefine EMBREE_SYCL_SUPPORT
  10. #endif
  11. #define RTC_VERSION_MAJOR 4
  12. @@ -13,28 +13,28 @@
  13. #define RTC_VERSION 40400
  14. #define RTC_VERSION_STRING "4.4.0"
  15. -#define RTC_MAX_INSTANCE_LEVEL_COUNT @EMBREE_MAX_INSTANCE_LEVEL_COUNT@
  16. +#define RTC_MAX_INSTANCE_LEVEL_COUNT 1
  17. -#cmakedefine EMBREE_GEOMETRY_INSTANCE_ARRAY
  18. +// #cmakedefine EMBREE_GEOMETRY_INSTANCE_ARRAY
  19. #if defined(EMBREE_GEOMETRY_INSTANCE_ARRAY)
  20. #define RTC_GEOMETRY_INSTANCE_ARRAY
  21. #endif
  22. -#cmakedefine01 EMBREE_SYCL_GEOMETRY_CALLBACK
  23. +// #cmakedefine01 EMBREE_SYCL_GEOMETRY_CALLBACK
  24. -#cmakedefine01 EMBREE_MIN_WIDTH
  25. +#define EMBREE_MIN_WIDTH 0
  26. #define RTC_MIN_WIDTH EMBREE_MIN_WIDTH
  27. #if !defined(EMBREE_STATIC_LIB)
  28. -#cmakedefine EMBREE_STATIC_LIB
  29. +#define EMBREE_STATIC_LIB
  30. #endif
  31. -#cmakedefine EMBREE_API_NAMESPACE
  32. +// #cmakedefine EMBREE_API_NAMESPACE
  33. #if defined(EMBREE_API_NAMESPACE)
  34. -# define RTC_NAMESPACE @EMBREE_API_NAMESPACE@
  35. -# define RTC_NAMESPACE_BEGIN namespace @EMBREE_API_NAMESPACE@ {
  36. +# define RTC_NAMESPACE
  37. +# define RTC_NAMESPACE_BEGIN namespace {
  38. # define RTC_NAMESPACE_END }
  39. -# define RTC_NAMESPACE_USE using namespace @EMBREE_API_NAMESPACE@;
  40. +# define RTC_NAMESPACE_USE using namespace;
  41. # define RTC_API_EXTERN_C
  42. # define RTC_API_EXTERN_CPP
  43. # undef EMBREE_API_NAMESPACE
  44. diff --git a/thirdparty/embree/kernels/config.h b/thirdparty/embree/kernels/config.h
  45. index 1669c4af72..5979b543c9 100644
  46. --- a/thirdparty/embree/kernels/config.h
  47. +++ b/thirdparty/embree/kernels/config.h
  48. @@ -3,27 +3,27 @@
  49. #include "../include/embree4/rtcore_config.h"
  50. -#cmakedefine EMBREE_RAY_MASK
  51. -#cmakedefine EMBREE_STAT_COUNTERS
  52. -#cmakedefine EMBREE_BACKFACE_CULLING
  53. -#cmakedefine EMBREE_BACKFACE_CULLING_CURVES
  54. -#cmakedefine EMBREE_BACKFACE_CULLING_SPHERES
  55. -#cmakedefine EMBREE_FILTER_FUNCTION
  56. -#cmakedefine EMBREE_IGNORE_INVALID_RAYS
  57. -#cmakedefine EMBREE_GEOMETRY_TRIANGLE
  58. -#cmakedefine EMBREE_GEOMETRY_QUAD
  59. -#cmakedefine EMBREE_GEOMETRY_CURVE
  60. -#cmakedefine EMBREE_GEOMETRY_SUBDIVISION
  61. -#cmakedefine EMBREE_GEOMETRY_USER
  62. -#cmakedefine EMBREE_GEOMETRY_INSTANCE
  63. +// #cmakedefine EMBREE_RAY_MASK
  64. +// #cmakedefine EMBREE_STAT_COUNTERS
  65. +// #cmakedefine EMBREE_BACKFACE_CULLING
  66. +// #cmakedefine EMBREE_BACKFACE_CULLING_CURVES
  67. +// #cmakedefine EMBREE_BACKFACE_CULLING_SPHERES
  68. +#define EMBREE_FILTER_FUNCTION
  69. +// #cmakedefine EMBREE_IGNORE_INVALID_RAYS
  70. +#define EMBREE_GEOMETRY_TRIANGLE
  71. +// #cmakedefine EMBREE_GEOMETRY_QUAD
  72. +// #cmakedefine EMBREE_GEOMETRY_CURVE
  73. +// #cmakedefine EMBREE_GEOMETRY_SUBDIVISION
  74. +// #cmakedefine EMBREE_GEOMETRY_USER
  75. +// #cmakedefine EMBREE_GEOMETRY_INSTANCE
  76. // EMBREE_GEOMETRY_INSTANCE_ARRAY is defined in rtcore_config.h
  77. -#cmakedefine EMBREE_GEOMETRY_GRID
  78. -#cmakedefine EMBREE_GEOMETRY_POINT
  79. -#cmakedefine EMBREE_RAY_PACKETS
  80. -#cmakedefine EMBREE_COMPACT_POLYS
  81. +// #cmakedefine EMBREE_GEOMETRY_GRID
  82. +// #cmakedefine EMBREE_GEOMETRY_POINT
  83. +#define EMBREE_RAY_PACKETS
  84. +// #cmakedefine EMBREE_COMPACT_POLYS
  85. -#define EMBREE_CURVE_SELF_INTERSECTION_AVOIDANCE_FACTOR @EMBREE_CURVE_SELF_INTERSECTION_AVOIDANCE_FACTOR@
  86. -#cmakedefine EMBREE_DISC_POINT_SELF_INTERSECTION_AVOIDANCE
  87. +#define EMBREE_CURVE_SELF_INTERSECTION_AVOIDANCE_FACTOR 2.0
  88. +#define EMBREE_DISC_POINT_SELF_INTERSECTION_AVOIDANCE
  89. #if defined(EMBREE_GEOMETRY_TRIANGLE)
  90. #define IF_ENABLED_TRIS(x) x