kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update mimir, WIP implementing Arena allocation
Some checks failed
CMake on multiple platforms / build (Release, cl, cl, windows-latest) (push) Has been cancelled
Details
CMake on multiple platforms / build (Release, clang, clang++, macos-latest) (push) Has been cancelled
Details
CMake on multiple platforms / build (Release, clang, clang++, ubuntu-latest) (push) Has been cancelled
Details
CMake on multiple platforms / build (Release, gcc, g++, ubuntu-latest) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Kearwood Gilbert
2026-08-15 02:12:28 -07:00
parent 736895fede
commit f98bb5d4e4
6 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hydra

Submodule hydra updated: 516e143901...7e38a43301

3
kraken/KRContext.h
View File

@@ -49,6 +49,7 @@
#include "KRDeviceManager.h" #include "KRDeviceManager.h"
#include "KRDevice.h" #include "KRDevice.h"
#include "KRSurface.h" #include "KRSurface.h"
#include "arena.h"
class KRAudioManager; class KRAudioManager;
class KRPresentationThread; class KRPresentationThread;
@@ -225,4 +226,6 @@ private:
unordered_map<KrSurfaceMapIndex, KrSurfaceHandle> m_surfaceHandleMap; unordered_map<KrSurfaceMapIndex, KrSurfaceHandle> m_surfaceHandleMap;
virtual bool getShaderValue(const KRCamera* camera, ShaderValue value, float* output) const; virtual bool getShaderValue(const KRCamera* camera, ShaderValue value, float* output) const;
mimir::Arena m_frameAllocators[KRENGINE_MAX_FRAMES_IN_FLIGHT];
}; };

2
kraken/KREngine-common.h
View File

@@ -32,7 +32,7 @@
#pragma once #pragma once
#define KRENGINE_MAX_GPU_COUNT 4 #define KRENGINE_MAX_GPU_COUNT 4
#define KRENGINE_MAX_FRAMES_IN_FLIGHT 2 #define KRENGINE_MAX_FRAMES_IN_FLIGHT 3
#define KRENGINE_DEBUG_GPU_LABELS 1 #define KRENGINE_DEBUG_GPU_LABELS 1
#define KRENGINE_DEBUG_GPU_LABEL_MAX_LEN 128 #define KRENGINE_DEBUG_GPU_LABEL_MAX_LEN 128

2
kraken/nodes/KRCamera.cpp
View File

@@ -486,7 +486,7 @@ void KRCamera::renderPost(RenderInfo& ri)
void KRCamera::renderDebug(RenderInfo& ri) void KRCamera::renderDebug(RenderInfo& ri)
{ {
settings.m_debug_text = std::format("Frame Number {}", getContext().getCurrentFrame()); // FNIDME!! KIPG!! HACK!! Debug text debugging... // settings.m_debug_text = std::format("Frame Number {}", getContext().getCurrentFrame()); // FINDME!! KIPG!! HACK!! Debug text debugging...
const char* szText = settings.m_debug_text.c_str(); const char* szText = settings.m_debug_text.c_str();
if (*szText == '\0') { if (*szText == '\0') {

4
kraken/resources/material/KRMaterial.h
View File

@@ -45,6 +45,8 @@
#include "nodes/KRBone.h" #include "nodes/KRBone.h"
#include "KRShaderReflection.h" #include "KRShaderReflection.h"
#include <limits>
enum class CullMode : __uint32_t; enum class CullMode : __uint32_t;
enum class ModelFormat : __uint8_t; enum class ModelFormat : __uint8_t;
enum class Topology : __uint8_t; enum class Topology : __uint8_t;
@@ -178,7 +180,7 @@ public:
TextureMap m_thicknessMap{ KRTexture::TEXTURE_USAGE_MATERIAL_THICKNESS }; TextureMap m_thicknessMap{ KRTexture::TEXTURE_USAGE_MATERIAL_THICKNESS };
float m_thicknessFactor{ 0.f }; float m_thicknessFactor{ 0.f };
float m_attenuationDistance{ std::numeric_limits<float>::max() }; float m_attenuationDistance{ std::numeric_limits<float>::max()};
hydra::Vector3 m_attenuationColor{ 1.f, 1.f, 1.f }; hydra::Vector3 m_attenuationColor{ 1.f, 1.f, 1.f };
TextureMap m_transmissionMap{ KRTexture::TEXTURE_USAGE_MATERIAL_TRANSMISSION }; TextureMap m_transmissionMap{ KRTexture::TEXTURE_USAGE_MATERIAL_TRANSMISSION };

2
mimir

Submodule mimir updated: da5f3ec981...7dd0eb961a