Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
865e606
Merge branch 'mesh_loaders' into new_debug_draw
keptsecret Jul 1, 2025
ca86128
latest example
keptsecret Jul 1, 2025
0ae3da2
merge master, fix conflicts
keptsecret Jul 2, 2025
cd2ef95
latest example
keptsecret Jul 4, 2025
fe55bd7
merge master
keptsecret Jul 4, 2025
98ccfb2
added debug draw aabb extension, moved from ex
keptsecret Jul 8, 2025
a755514
removed todos
keptsecret Jul 8, 2025
473592b
support hlsl AABBs, also OBBs with transform
keptsecret Jul 9, 2025
f68f9c5
merge master, fix conflicts
keptsecret Aug 18, 2025
daf34e0
minor syntax changes
keptsecret Aug 18, 2025
33692fd
use hlsl cpp compat matrices, aabb
keptsecret Aug 19, 2025
72e3569
change batch render to use indexed draw
keptsecret Aug 19, 2025
5285e78
simplified single AABB draw
keptsecret Aug 20, 2025
328aa34
change batch render to take span of InstanceData
keptsecret Aug 20, 2025
a14c9dc
latest example
keptsecret Aug 20, 2025
9a35c9f
removed vertex buffer, use const vertex array in shader instead
keptsecret Aug 20, 2025
c6bd10b
validate creation params, added draw modes at create time
keptsecret Aug 20, 2025
1cb4c14
merge master, fix conflicts
keptsecret Aug 21, 2025
31e93f0
merge master, fix conflicts
keptsecret Sep 8, 2025
e5ceb1b
enable debug draw by default
keptsecret Sep 8, 2025
fe0a438
merge master, fix conflicts
keptsecret Sep 16, 2025
bfa233f
fix embed builtin resource build
keptsecret Sep 16, 2025
3b67580
resolve https://github.com/Devsh-Graphics-Programming/Nabla/pull/900#…
AnastaZIuk Sep 16, 2025
aae42fa
merge master, fix conflicts
keptsecret Nov 27, 2025
0879ce7
fix + optimize aabb vertex calc, includes
keptsecret Nov 27, 2025
1f73ca9
changed debug_draw library target usage
keptsecret Nov 27, 2025
a40f540
some fixes to draw aabb
keptsecret Nov 27, 2025
f0f9957
removed commented out bit
keptsecret Nov 28, 2025
fdd675b
create pipelineLayout util can takes mode, also create layout if miss…
keptsecret Nov 28, 2025
37cc551
aabb local transform is 3x4, common draw param struct between single …
keptsecret Nov 28, 2025
ba2860f
write instances data directly to streaming buffer mem
keptsecret Nov 28, 2025
2678ffc
use single use cmdbuf to fill indices buffer
keptsecret Dec 1, 2025
bde9dfb
merge master
keptsecret Dec 17, 2025
5aee002
roll constructor params into own struct, fix assert in validation
keptsecret Dec 18, 2025
a1bd026
adds a check against double mounting same archive
keptsecret Dec 18, 2025
0c17074
Merge branch 'master' into new_debug_draw
keptsecret Dec 19, 2025
fcee6ed
return false if the streaming buffer is too small
keptsecret Dec 19, 2025
cdd362b
some fixes to using/filling streaming buffer
keptsecret Dec 22, 2025
82f6f59
Merge branch 'master' into new_debug_draw
keptsecret Dec 22, 2025
4ae7d89
combined draw aabb shaders into unified, added precompile shaders to …
keptsecret Dec 22, 2025
9513614
restore ifdef for mounting builtin resources, minor fixes to mounting
keptsecret Dec 23, 2025
ac51887
simplified usage of streaming buffer alignments, flush unused memory …
keptsecret Dec 23, 2025
5ebfc65
fix calculating remaining instances bytes
keptsecret Dec 23, 2025
38b305b
merge master, fix conflicts
keptsecret Dec 23, 2025
6f4ef5b
check whether spirv exists
keptsecret Dec 23, 2025
1e8171c
try to fit as much as possible even when fail to allocate, go down by…
keptsecret Dec 23, 2025
84a2e1e
Merge branch 'master' into new_debug_draw
keptsecret Dec 23, 2025
a70a863
update include paths for debug draw ext
AnastaZIuk Dec 23, 2025
1badc7a
fix mount logic for debug draw ext, perform tests on builtins on/off
AnastaZIuk Dec 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma shader_stage(fragment)

#include "common.hlsl"
#include "nbl/ext/DebugDraw/builtin/hlsl/common.hlsl"

using namespace nbl::ext::debug_draw;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "nbl/builtin/hlsl/math/linalg/fast_affine.hlsl"
#include "nbl/builtin/hlsl/glsl_compat/core.hlsl"
#include "nbl/builtin/hlsl/bda/__ptr.hlsl"
#include "common.hlsl"
#include "nbl/ext/DebugDraw/builtin/hlsl/common.hlsl"

using namespace nbl::hlsl;
using namespace nbl::ext::debug_draw;
Expand Down
2 changes: 1 addition & 1 deletion include/nbl/ext/DebugDraw/builtin/hlsl/single.vertex.hlsl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "nbl/builtin/hlsl/math/linalg/fast_affine.hlsl"
#include "nbl/builtin/hlsl/glsl_compat/core.hlsl"
#include "nbl/builtin/hlsl/bda/__ptr.hlsl"
#include "common.hlsl"
#include "nbl/ext/DebugDraw/builtin/hlsl/common.hlsl"

using namespace nbl::hlsl;
using namespace nbl::ext::debug_draw;
Expand Down
1 change: 1 addition & 0 deletions include/nbl/system/ISystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ class NBL_API2 ISystem : public core::IReferenceCounted
//
virtual inline bool isDirectory(const system::path& p) const
{
// TODO: fix bug, input "nbl/ext/DebugDraw/builtin/hlsl" -> returs true when no such dir present in mounted stuff due to how it uses parent paths in loop (goes up up till matches "nbl" builtin archive and thinks it resolved the requested dir)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AnastaZIuk open an issue about it

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AnastaZIuk do you think you could make a fix for this?

if (isPathReadOnly(p))
return p.extension()==""; // TODO: this is a temporary decision until we figure out how to check if a file is directory in android APK
else
Expand Down
2 changes: 1 addition & 1 deletion src/nbl/ext/DebugDraw/CDrawAABB.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ smart_refctd_ptr<IGPUGraphicsPipeline> DrawAABB::createPipeline(SCreationParamet
return params.utilities->getLogicalDevice()->compileShader({ shaderSrc.get() });
};

if (!system->isDirectory(path(NBL_ARCHIVE_ENTRY.data())))
if (!system->exists(path(NBL_ARCHIVE_ENTRY) / "common.hlsl", {}))
mount(smart_refctd_ptr<ILogger>(params.utilities->getLogger()), system.get(), NBL_ARCHIVE_ENTRY);

auto vertexShader = compileShader(vsPath, IShader::E_SHADER_STAGE::ESS_VERTEX);
Expand Down
4 changes: 2 additions & 2 deletions src/nbl/ext/DebugDraw/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ nbl_create_ext_library_project(
)

# this should be standard for all extensions
set(_ARCHIVE_ENTRY_KEY_ "DebugDraw/builtin/hlsl") # then each one has unique archive key
get_filename_component(_ARCHIVE_ABSOLUTE_ENTRY_PATH_ "${NBL_EXT_INTERNAL_INCLUDE_DIR}/nbl/ext" ABSOLUTE)
set(_ARCHIVE_ENTRY_KEY_ "nbl/ext/DebugDraw/builtin/hlsl") # then each one has unique archive key
get_filename_component(_ARCHIVE_ABSOLUTE_ENTRY_PATH_ "${NBL_EXT_INTERNAL_INCLUDE_DIR}" ABSOLUTE)
get_filename_component(_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR}/src" ABSOLUTE)
get_filename_component(_OUTPUT_DIRECTORY_HEADER_ "${CMAKE_CURRENT_BINARY_DIR}/include" ABSOLUTE)

Expand Down
Loading