From 767e374dced69b45db0afb30ca2ccf0bbbeef672 Mon Sep 17 00:00:00 2001 From: jfons Date: Thu, 20 May 2021 12:49:33 +0200 Subject: Upgrade Embree to the latest official release. Since Embree v3.13.0 supports AARCH64, switch back to the official repo instead of using Embree-aarch64. `thirdparty/embree/patches/godot-changes.patch` should now contain an accurate diff of the changes done to the library. --- .../embree-aarch64/kernels/geometry/instance.h | 78 ---------------------- 1 file changed, 78 deletions(-) delete mode 100644 thirdparty/embree-aarch64/kernels/geometry/instance.h (limited to 'thirdparty/embree-aarch64/kernels/geometry/instance.h') diff --git a/thirdparty/embree-aarch64/kernels/geometry/instance.h b/thirdparty/embree-aarch64/kernels/geometry/instance.h deleted file mode 100644 index 66893d581f..0000000000 --- a/thirdparty/embree-aarch64/kernels/geometry/instance.h +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright 2009-2020 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 - -#pragma once - -#include "primitive.h" -#include "../common/scene_instance.h" - -namespace embree -{ - struct InstancePrimitive - { - struct Type : public PrimitiveType - { - const char* name() const; - size_t sizeActive(const char* This) const; - size_t sizeTotal(const char* This) const; - size_t getBytes(const char* This) const; - }; - static Type type; - - public: - - /* primitive supports multiple time segments */ - static const bool singleTimeSegment = false; - - /* Returns maximum number of stored primitives */ - static __forceinline size_t max_size() { return 1; } - - /* Returns required number of primitive blocks for N primitives */ - static __forceinline size_t blocks(size_t N) { return N; } - - public: - - InstancePrimitive (const Instance* instance, unsigned int instID) - : instance(instance) - , instID_(instID) - {} - - __forceinline void fill(const PrimRef* prims, size_t& i, size_t end, Scene* scene) - { - assert(end-i == 1); - const PrimRef& prim = prims[i]; i++; - const unsigned int geomID = prim.geomID(); - const Instance* instance = scene->get(geomID); - new (this) InstancePrimitive(instance, geomID); - } - - __forceinline LBBox3fa fillMB(const PrimRef* prims, size_t& i, size_t end, Scene* scene, size_t itime) - { - assert(end-i == 1); - const PrimRef& prim = prims[i]; i++; - const unsigned int geomID = prim.geomID(); - const Instance* instance = scene->get(geomID); - new (this) InstancePrimitive(instance,geomID); - return instance->linearBounds(0,itime); - } - - __forceinline LBBox3fa fillMB(const PrimRefMB* prims, size_t& i, size_t end, Scene* scene, const BBox1f time_range) - { - assert(end-i == 1); - const PrimRefMB& prim = prims[i]; i++; - const unsigned int geomID = prim.geomID(); - const Instance* instance = scene->get(geomID); - new (this) InstancePrimitive(instance,geomID); - return instance->linearBounds(0,time_range); - } - - /* Updates the primitive */ - __forceinline BBox3fa update(Instance* instance) { - return instance->bounds(0); - } - - public: - const Instance* instance; - const unsigned int instID_ = std::numeric_limits::max (); - }; -} -- cgit v1.2.3