Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

It works now?????

Browse Source
This commit is contained in:
Dynamitos
2024-10-02 15:59:52 +02:00
parent e0514d8a78
commit c89fd405b8
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
-1
View File
@@ -22,7 +22,6 @@ set(CMAKE_TOOLCHAIN_FILE ${EXTERNAL_ROOT}/vcpkg/scripts/buildsystems/vcpkg.cmake
set(CRCPP_ROOT ${EXTERNAL_ROOT}/CRCpp) set(CRCPP_ROOT ${EXTERNAL_ROOT}/CRCpp)
set(METAL_ROOT ${EXTERNAL_ROOT}/metal-cpp) set(METAL_ROOT ${EXTERNAL_ROOT}/metal-cpp)
set(SLANG_ROOT ${EXTERNAL_ROOT}/slang)
set(Boost_NO_WARN_NEW_VERSIONS 1) set(Boost_NO_WARN_NEW_VERSIONS 1)
cmake/SuperBuild.cmake
+2 -2
View File
@@ -5,7 +5,7 @@ include (ExternalProject)
add_library(slang SHARED IMPORTED) add_library(slang SHARED IMPORTED)
if(WIN32) if(WIN32)
add_library(slang-glslang SHARED IMPORTED) add_library(slang-glslang SHARED IMPORTED)
set(SLANG_ROOT ${EXTERNAL_ROOT}/slang/build/Release/) set(SLANG_ROOT ${PROJECT_SOURCE_DIR}/../slang/build/Debug/)
set_target_properties(slang-glslang PROPERTIES IMPORTED_LOCATION ${SLANG_ROOT}bin/slang-glslang.dll) set_target_properties(slang-glslang PROPERTIES IMPORTED_LOCATION ${SLANG_ROOT}bin/slang-glslang.dll)
set_target_properties(slang-glslang PROPERTIES IMPORTED_IMPLIB ${SLANG_ROOT}lib/slang.lib) set_target_properties(slang-glslang PROPERTIES IMPORTED_IMPLIB ${SLANG_ROOT}lib/slang.lib)
set_target_properties(slang PROPERTIES IMPORTED_LOCATION ${SLANG_ROOT}bin/slang.dll) set_target_properties(slang PROPERTIES IMPORTED_LOCATION ${SLANG_ROOT}bin/slang.dll)
@@ -26,7 +26,7 @@ elseif(APPLE)
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
endif() endif()
target_include_directories(slang INTERFACE target_include_directories(slang INTERFACE
$<BUILD_INTERFACE:${EXTERNAL_ROOT}/slang/include> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/../slang/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
res/shaders/DepthCullingMesh.slang
+8 -7
View File
@@ -34,15 +34,16 @@ void meshMain(
{ {
uint p = min(i, m.primitiveCount - 1); uint p = min(i, m.primitiveCount - 1);
{ {
uint local_idx0 = pScene.primitiveIndices[m.primitiveOffset + (p * 3) + 0]; uint baseIndex = m.primitiveOffset + (p * 3);
uint local_idx1 = pScene.primitiveIndices[m.primitiveOffset + (p * 3) + 1]; uint local_idx0 = pScene.primitiveIndices[baseIndex + 0];
uint local_idx2 = pScene.primitiveIndices[m.primitiveOffset + (p * 3) + 2]; uint local_idx1 = pScene.primitiveIndices[baseIndex + 1];
indices[p] = uint3(local_idx0, local_idx1, local_idx2); uint local_idx2 = pScene.primitiveIndices[baseIndex + 2];
PrimitiveAttributes primAttr; indices[p] = uint3(local_idx0, local_idx1, local_idx2);
PrimitiveAttributes primAttr;
#ifdef VISIBILITY #ifdef VISIBILITY
primAttr.prim = encodePrimitive(meshletId); primAttr.prim = encodePrimitive(meshletId);
#endif #endif
prim[p] = primAttr; prim[p] = primAttr;
} }
} }
for(uint i = threadID; i < MAX_VERTICES; i += MESH_GROUP_SIZE) for(uint i = threadID; i < MAX_VERTICES; i += MESH_GROUP_SIZE)
res/shaders/DrawListMesh.slang
+9 -8
View File
@@ -35,16 +35,17 @@ void meshMain(
{ {
uint p = min(i, m.primitiveCount - 1); uint p = min(i, m.primitiveCount - 1);
{ {
uint local_idx0 = pScene.primitiveIndices[m.primitiveOffset + (p * 3) + 0]; uint baseIndex = m.primitiveOffset + (p * 3);
uint local_idx1 = pScene.primitiveIndices[m.primitiveOffset + (p * 3) + 1]; uint local_idx0 = pScene.primitiveIndices[baseIndex + 0];
uint local_idx2 = pScene.primitiveIndices[m.primitiveOffset + (p * 3) + 2]; uint local_idx1 = pScene.primitiveIndices[baseIndex + 1];
indices[p] = uint3(local_idx0, local_idx1, local_idx2); uint local_idx2 = pScene.primitiveIndices[baseIndex + 2];
PrimitiveAttributes primAttr; indices[p] = uint3(local_idx0, local_idx1, local_idx2);
primAttr.cull = false;//cull.triangleCulled(p); PrimitiveAttributes primAttr;
primAttr.cull = false;//cull.triangleCulled(p);
#ifdef VISIBILITY #ifdef VISIBILITY
primAttr.prim = encodePrimitive(meshletId); primAttr.prim = encodePrimitive(meshletId);
#endif #endif
prim[p] = primAttr; prim[p] = primAttr;
} }
} }
for(uint i = threadID; i < MAX_VERTICES; i += MESH_GROUP_SIZE) for(uint i = threadID; i < MAX_VERTICES; i += MESH_GROUP_SIZE)
src/Engine/Graphics/slang-compile.cpp
+1 -1
View File
@@ -86,7 +86,7 @@ void Seele::beginCompilation(const ShaderCompilationInfo& info, SlangCompileTarg
for (const auto& [name, mod] : info.entryPoints) { for (const auto& [name, mod] : info.entryPoints) {
entryPoints.add(name); entryPoints.add(name);
slang::IEntryPoint* entry; slang::IEntryPoint* entry;
moduleMap[mod]->findEntryPointByName(name.c_str(), &entry); CHECK_RESULT(moduleMap[mod]->findEntryPointByName(name.c_str(), &entry));
components.add(entry); components.add(entry);
} }