Skip to content

Precompile Fri Ext #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnastaZIuk wants to merge 6 commits into
base: new_pt
Choose a base branch
from
Open

Precompile Fri Ext #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c2ef646
precompile fri ext
AnastaZIuk Jan 27, 2026
acb025f
Merge branch 'new_pt' of github.com:Devsh-Graphics-Programming/Nabla-…
AnastaZIuk Jan 27, 2026
5a6727d
those 2 `-I` actually not needed
AnastaZIuk Jan 27, 2026
fd49d0a
cleanup
AnastaZIuk Jan 29, 2026
f9e3554
update examples using fri ext
AnastaZIuk Jan 29, 2026
cf8231a
Merge branch 'new_pt' of github.com:Devsh-Graphics-Programming/Nabla-…
AnastaZIuk Jan 29, 2026
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
1 change: 1 addition & 0 deletions 24_ColorSpaceTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ if(NOT RES)
endif()

nbl_create_executable_project("" "" "" "" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")
target_link_libraries(${EXECUTABLE_NAME} PRIVATE Nabla::ext::FullScreenTriangle)

if(NBL_EMBED_BUILTIN_RESOURCES)
set(_BR_TARGET_ ${EXECUTABLE_NAME}_builtinResourceData)
Expand Down
1 change: 1 addition & 0 deletions 30_ComputeShaderPathTracer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ if(NBL_BUILD_IMGUI)
list(APPEND NBL_LIBRARIES
imtestengine
"${NBL_EXT_IMGUI_UI_LIB}"
Nabla::ext::FullScreenTriangle
)

nbl_create_executable_project("" "" "${NBL_INCLUDE_SERACH_DIRECTORIES}" "${NBL_LIBRARIES}" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")
Expand Down
17 changes: 6 additions & 11 deletions 40_PathTracer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
include(common RESULT_VARIABLE RES)
if(NOT RES)
message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
endif()

include(common)

set(NBL_INCLUDE_SERACH_DIRECTORIES
"${NBL_EXT_MITSUBA_LOADER_INCLUDE_DIRS}"
"${CMAKE_CURRENT_SOURCE_DIR}/include"
"${CMAKE_CURRENT_SOURCE_DIR}/src"
)
list(APPEND NBL_LIBRARIES
set(NBL_LIBRARIES
"${NBL_EXT_MITSUBA_LOADER_LIB}"
Nabla::ext::FullScreenTriangle
imguizmo
"${NBL_EXT_IMGUI_UI_LIB}"
)
list(APPEND NBL_EXAMPLE_SOURCES
set(NBL_EXAMPLE_SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/src/io/CSceneLoader.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/renderer/CSession.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/renderer/CScene.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/renderer/CRenderer.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/renderer/resolve/CBasicRWMCResolver.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/renderer/present/CWindowPresenter.cpp"
)
nbl_create_executable_project("${NBL_EXAMPLE_SOURCES}" "${}" "${NBL_INCLUDE_SERACH_DIRECTORIES}" "${NBL_LIBRARIES}" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")
nbl_create_executable_project("${NBL_EXAMPLE_SOURCES}" "" "${NBL_INCLUDE_SERACH_DIRECTORIES}" "${NBL_LIBRARIES}")

set(OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/auto-gen")

Expand Down Expand Up @@ -50,9 +47,7 @@ set(JSON [=[
string(CONFIGURE "${JSON}" JSON)

set(COMPILE_OPTIONS
-I "${CMAKE_CURRENT_SOURCE_DIR}"
# -I "${CMAKE_CURRENT_SOURCE_DIR}/../include" # TODO: Arek for some reason, the `-I` are relative to each `.hlsl` file getting compiled, and not this CMAke file
-I "D:\\work\\Nabla-master\\examples_tests\\40_PathTracer\\include"
-I "${CMAKE_CURRENT_SOURCE_DIR}/include"
-T lib_${SM}
)

Expand Down
16 changes: 7 additions & 9 deletions 40_PathTracer/src/renderer/present/CWindowPresenter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,6 @@ bool CWindowPresenter::init_impl(CRenderer* renderer)

//
auto* const assMan = IPresenter::getCreationParams().assMan.get();
ext::FullScreenTriangle::ProtoPipeline fsTriProtoPPln(assMan,device,logger.get().get());
if (!fsTriProtoPPln)
{
logger.log("`CWindowPresenter::create` failed to create Full Screen Triangle protopipeline or load its vertex shader!",ILogger::ELL_ERROR);
return false;
}

// present pipeline layout
smart_refctd_ptr<IGPUPipelineLayout> layout;
Expand All @@ -167,9 +161,13 @@ bool CWindowPresenter::init_impl(CRenderer* renderer)
{
const IGPUPipelineBase::SShaderSpecInfo fragSpec = {
.shader = shader.get(),
.entryPoint = "present_default",
.entryPoint = "present_default"
};
m_present = fsTriProtoPPln.createPipeline(fragSpec,layout.get(),getRenderpass());

ext::FullScreenTriangle::ProtoPipeline fsTriProtoPln(assMan, device, logger.get().get());
if (!fsTriProtoPln) { logger.log("`CWindowPresenter::create` failed to create Full Screen Triangle protopipeline or load its vertex shader!",ILogger::ELL_ERROR); return false; }
m_present = fsTriProtoPln.createPipeline(fragSpec, layout.get(), getRenderpass());

if (!m_present)
logger.log("`CWindowPresenter::create` failed to create Graphics Pipeline!",ILogger::ELL_ERROR);
}
Expand Down Expand Up @@ -299,4 +297,4 @@ bool CWindowPresenter::beginRenderpass_impl()
return success;
}

}
}
1 change: 1 addition & 0 deletions 71_RayTracingPipeline/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ if(NBL_BUILD_IMGUI)
list(APPEND NBL_LIBRARIES
imtestengine
"${NBL_EXT_IMGUI_UI_LIB}"
Nabla::ext::FullScreenTriangle
)

nbl_create_executable_project("" "" "${NBL_INCLUDE_SERACH_DIRECTORIES}" "${NBL_LIBRARIES}" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")
Expand Down