benkyd/inferno-hart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch machin

Browse Source
This commit is contained in:
Ben Kyd
2023-03-01 00:51:02 +00:00
parent 83280e1046
commit 08a08fa574
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hart/inferno-hart-cpu/src/kdtree.hpp
View File

@@ -163,6 +163,7 @@ class KDTree {
std::cout << "Ray does not intersect node" << std::endl;
}
std::cout << std::endl;
exit(0);
}
glm::vec3 getVertexBounds(uint32_t index) const {

9
hart/inferno-hart-cpu/src/main.cpp
View File

@@ -20,6 +20,7 @@ public:
HARTCPU()
{
mMasterWorker = std::thread(&HARTCPU::intersectMasterWorker, this);
mLogModule = yolo::registerModule("hartcpu", "\u001b[35;1m");
}
~HARTCPU()
@@ -38,7 +39,7 @@ public:
mState = EModuleState::Build;
mVert = (float*)vert; mNorm = (float*)norm; mVc = vc; mIndices = (uint32_t*)indices; mIc = ic;
yolo::info("[hartcpu] Recieved {} verticies ({}) and {} indicies ({})", vc / 3, vert, ic / 3, indices);
yolo::info(mLogModule, "Recieved {} verticies ({}) and {} indicies ({})", vc / 3, vert, ic / 3, indices);
std::vector<uint32_t> indicesToProcess(ic / 3);
for (uint32_t i = 0; i < ic / 3; ++i)
@@ -48,7 +49,7 @@ public:
mKdTree = new KDTree(mVert, mIndices, indicesToProcess, 0, indicesToProcess.size() - 1, 10);
mKdTree->printTree(mKdTree->getRoot(), 1);
yolo::info("[hartcpu] Accelerator ready..");
yolo::info(mLogModule, "Accelerator ready..");
mState = EModuleState::Idle;
}
@@ -62,7 +63,7 @@ public:
mState = EModuleState::Trace;
_mSignalCv.notify_all();
yolo::info("[hartcpu] Signal master to start");
yolo::info(mLogModule, "Signal master to start");
{
std::unique_lock<std::mutex> doneLock(_mDoneMut);
@@ -166,6 +167,8 @@ private:
int mVc;
uint32_t* mIndices;
int mIc;
uint8_t mLogModule;
};
HART_INTERFACE void* _GET()

7
libhart/inferno_hart.hpp
View File

@@ -34,6 +34,10 @@
* Once empty the module will switch to the Ready state again, so Inferno *
* can get the next frame ready and repeat. *
* *
* *
* The module render system is an alternative system along with the HARTModule *
*
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*/
@@ -76,7 +80,6 @@ HART_INTERFACE typedef void* (*HART_CREDIT_F)(void);
typedef void (*HART_HIT_CALLBACK)(void* context, HitInfo* hit);
// FOR NOW: Rays and tri's are owned by Inferno, _NOT_ HART
class HARTModule
{
public:
@@ -93,7 +96,6 @@ public:
std::lock_guard<std::mutex> lock(_mData);
for (const auto& e: queue)
mToTrace.push(e);
yolo::info("[hartmodule] New trace queue: {}", mToTrace.size());
}
inline void pushtoQueue(Ray* ray)
@@ -104,7 +106,6 @@ public:
inline void passContext(void* context, HART_HIT_CALLBACK callback)
{
yolo::debug("[hartmodule] Recieved context");
std::lock_guard<std::mutex> lock(_mData);
mCtx = context;
Hit = callback;