Patedam/Juliet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

calloc to arena

Browse Source
This commit is contained in:
Patedam
2026-08-16 22:44:52 -04:00
parent 4d803fdf77
commit 678795b793
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Juliet/include/Graphics/DebugDisplay.h
+1 -1
View File
@@ -8,7 +8,7 @@
namespace Juliet namespace Juliet
{ {
extern JULIET_API void DebugDisplay_Initialize(GraphicsDevice* device); extern JULIET_API void DebugDisplay_Initialize(NonNullPtr<Arena> arena, GraphicsDevice* device);
extern JULIET_API void DebugDisplay_Shutdown(GraphicsDevice* device); extern JULIET_API void DebugDisplay_Shutdown(GraphicsDevice* device);
extern JULIET_API void DebugDisplay_DrawLine(const Vector3& start, const Vector3& end, const FColor& color, bool overlay); extern JULIET_API void DebugDisplay_DrawLine(const Vector3& start, const Vector3& end, const FColor& color, bool overlay);
extern JULIET_API void DebugDisplay_DrawSphere(const Vector3& center, float radius, const FColor& color, bool overlay); extern JULIET_API void DebugDisplay_DrawSphere(const Vector3& center, float radius, const FColor& color, bool overlay);
Juliet/src/Engine/Engine.cpp
+1 -2
View File
@@ -37,10 +37,9 @@ namespace Juliet
{ {
GraphicsDevice* device = EngineInstance.Application->GetGraphicsDevice(); GraphicsDevice* device = EngineInstance.Application->GetGraphicsDevice();
// DebugDisplay system
if (device) if (device)
{ {
DebugDisplay_Initialize(device); DebugDisplay_Initialize(EngineInstance.PlatformArena, device);
if (Window* window = EngineInstance.Application->GetPlatformWindow()) if (Window* window = EngineInstance.Application->GetPlatformWindow())
{ {
bool success = InitializeMeshRendererGraphics(device, window); bool success = InitializeMeshRendererGraphics(device, window);
Juliet/src/Graphics/D3D12/D3D12GraphicsDevice.cpp
+1 -1
View File
@@ -4618,7 +4618,7 @@ namespace Juliet
driver->Semantic = WrapString("TEXCOORD"); driver->Semantic = WrapString("TEXCOORD");
driver->FramesInFlight = 2; driver->FramesInFlight = 2;
auto device = static_cast<GraphicsDevice*>(Calloc(1, sizeof(GraphicsDevice))); GraphicsDevice* device = ArenaPushStruct<GraphicsDevice>(driverArena JULIET_DEBUG_PARAM("GraphicsDevice"));
if (!device) if (!device)
{ {
DestroyDriver_Internal(driver); DestroyDriver_Internal(driver);
Juliet/src/Graphics/DebugDisplayRenderer.cpp
+3 -5
View File
@@ -3,7 +3,6 @@
#include <Core/HAL/Filesystem/Filesystem.h> #include <Core/HAL/Filesystem/Filesystem.h>
#include <Core/Logging/LogManager.h> #include <Core/Logging/LogManager.h>
#include <Core/Logging/LogTypes.h> #include <Core/Logging/LogTypes.h>
#include <Core/Memory/Allocator.h>
#include <Core/Thread/ThreadContext.h> #include <Core/Thread/ThreadContext.h>
#include <Graphics/GraphicsPipeline.h> #include <Graphics/GraphicsPipeline.h>
#include <Graphics/PushConstants.h> #include <Graphics/PushConstants.h>
@@ -157,7 +156,7 @@ namespace Juliet
} }
} // namespace } // namespace
void DebugDisplay_Initialize(GraphicsDevice* device) void DebugDisplay_Initialize(NonNullPtr<Arena> arena, GraphicsDevice* device)
{ {
if (g_DebugState.Initialized) if (g_DebugState.Initialized)
{ {
@@ -167,7 +166,8 @@ namespace Juliet
g_DebugState.Device = device; g_DebugState.Device = device;
// Allocate single CPU vertex array (depth-tested in first half, overlay in second half) // Allocate single CPU vertex array (depth-tested in first half, overlay in second half)
g_DebugState.Vertices = static_cast<DebugVertex*>(Malloc(kMaxDebugVertices * sizeof(DebugVertex))); g_DebugState.Vertices =
ArenaPushArray<DebugVertex>(arena, kMaxDebugVertices JULIET_DEBUG_PARAM("Debug Display Renderer Vertices"));
g_DebugState.DepthTestedVertexCount = 0; g_DebugState.DepthTestedVertexCount = 0;
g_DebugState.OverlayVertexCount = 0; g_DebugState.OverlayVertexCount = 0;
@@ -212,8 +212,6 @@ namespace Juliet
DestroyGraphicsTransferBuffer(device, g_DebugState.TransferBuffer); DestroyGraphicsTransferBuffer(device, g_DebugState.TransferBuffer);
} }
SafeFree(g_DebugState.Vertices);
g_DebugState = {}; g_DebugState = {};
} }