Deleting redundant submodules
This commit is contained in:
+1
-40
@@ -1,45 +1,6 @@
|
|||||||
[submodule "external/glm"]
|
|
||||||
path = external/glm
|
|
||||||
url = https://github.com/g-truc/glm.git
|
|
||||||
[submodule "external/glfw"]
|
|
||||||
path = external/glfw
|
|
||||||
url = https://github.com/glfw/glfw.git
|
|
||||||
[submodule "external/json"]
|
|
||||||
path = external/json
|
|
||||||
url = https://github.com/nlohmann/json.git
|
|
||||||
[submodule "external/assimp"]
|
|
||||||
path = external/assimp
|
|
||||||
url = https://github.com/assimp/assimp.git
|
|
||||||
[submodule "external/stb"]
|
|
||||||
path = external/stb
|
|
||||||
url = https://github.com/nothings/stb
|
|
||||||
[submodule "external/slang"]
|
|
||||||
path = external/slang
|
|
||||||
url = https://github.com/shader-slang/slang.git
|
|
||||||
[submodule "external/ktx"]
|
|
||||||
path = external/ktx
|
|
||||||
url = https://github.com/KhronosGroup/KTX-Software
|
|
||||||
[submodule "external/ttf-parser"]
|
|
||||||
path = external/ttf-parser
|
|
||||||
url = git@github.com:kv01/ttf-parser.git
|
|
||||||
[submodule "external/freetype"]
|
|
||||||
path = external/freetype
|
|
||||||
url = https://gitlab.freedesktop.org/freetype/freetype.git
|
|
||||||
[submodule "external/entt"]
|
|
||||||
path = external/entt
|
|
||||||
url = git@github.com:skypjack/entt.git
|
|
||||||
[submodule "external/thread-pool"]
|
|
||||||
path = external/thread-pool
|
|
||||||
url = https://github.com/DeveloperPaul123/thread-pool.git
|
|
||||||
[submodule "external/zlib"]
|
|
||||||
path = external/zlib
|
|
||||||
url = https://github.com/madler/zlib.git
|
|
||||||
[submodule "external/CRCpp"]
|
[submodule "external/CRCpp"]
|
||||||
path = external/CRCpp
|
path = external/CRCpp
|
||||||
url = https://github.com/d-bahr/CRCpp.git
|
url = https://github.com/d-bahr/CRCpp.git
|
||||||
[submodule "external/odeint"]
|
|
||||||
path = external/odeint
|
|
||||||
url = https://github.com/headmyshoulder/odeint-v2.git
|
|
||||||
[submodule "external/vcpkg"]
|
[submodule "external/vcpkg"]
|
||||||
path = external/vcpkg
|
path = external/vcpkg
|
||||||
url = https://github.com/Microsoft/vcpkg.git
|
url = https://github.com/Microsoft/vcpkg.git
|
||||||
Vendored
-1
Submodule external/assimp deleted from 8f0c6b04b2
Vendored
-1
Submodule external/entt deleted from ebc0c18534
Vendored
-1
Submodule external/freetype deleted from e50798b720
Vendored
-1
Submodule external/glfw deleted from d973acc123
Vendored
-1
Submodule external/glm deleted from bf71a83494
Vendored
-1
Submodule external/json deleted from bc889afb4c
Vendored
-1
Submodule external/ktx deleted from 5ab6d7595e
Vendored
-1
Submodule external/odeint deleted from 2bfbe61a00
Vendored
-1
Submodule external/slang deleted from 4fb3b10b81
Vendored
-1
Submodule external/stb deleted from b42009b3b9
Vendored
-1
Submodule external/thread-pool deleted from dad69c1661
Vendored
-1
Submodule external/ttf-parser deleted from 065fcd9db7
Vendored
-1
Submodule external/zlib deleted from 09155eaa2f
@@ -75,13 +75,13 @@ struct PrimitiveAttributes
|
|||||||
void meshMain(
|
void meshMain(
|
||||||
in uint threadID: SV_GroupIndex,
|
in uint threadID: SV_GroupIndex,
|
||||||
in uint groupID: SV_GroupID,
|
in uint groupID: SV_GroupID,
|
||||||
in payload MeshPayload meshPayload,
|
//in payload MeshPayload meshPayload,
|
||||||
out Vertices<FragmentParameter, MAX_VERTICES> vertices,
|
out Vertices<FragmentParameter, MAX_VERTICES> vertices,
|
||||||
out Indices<uint3, MAX_PRIMITIVES> indices
|
out Indices<uint3, MAX_PRIMITIVES> indices
|
||||||
){
|
){
|
||||||
InstanceData inst = pScene.instances[meshPayload.instanceId[groupID]];
|
InstanceData inst = pScene.instances[0];//meshPayload.instanceId[groupID]];
|
||||||
MeshData md = pScene.meshData[meshPayload.instanceId[groupID]];
|
MeshData md = pScene.meshData[0];//meshPayload.instanceId[groupID]];
|
||||||
MeshletDescription m = pScene.meshletInfos[meshPayload.meshletId[groupID]];
|
MeshletDescription m = pScene.meshletInfos[0];//meshPayload.meshletId[groupID]];
|
||||||
SetMeshOutputCounts(m.vertexCount, m.primitiveCount);
|
SetMeshOutputCounts(m.vertexCount, m.primitiveCount);
|
||||||
|
|
||||||
uint p = min(threadID, m.primitiveCount - 1);
|
uint p = min(threadID, m.primitiveCount - 1);
|
||||||
@@ -118,7 +118,7 @@ void meshMain(
|
|||||||
{
|
{
|
||||||
uint v = min(i, m.vertexCount - 1);
|
uint v = min(i, m.vertexCount - 1);
|
||||||
{
|
{
|
||||||
int vertexIndex = pScene.vertexIndices[m.vertexOffset + v];
|
uint vertexIndex = pScene.vertexIndices[m.vertexOffset + v];
|
||||||
vertices[v] = pVertexData.getAttributes(md.indicesOffset + vertexIndex).getParameter(inst.transformMatrix);
|
vertices[v] = pVertexData.getAttributes(md.indicesOffset + vertexIndex).getParameter(inst.transformMatrix);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -495,7 +495,14 @@ public:
|
|||||||
if(new_cap > allocated)
|
if(new_cap > allocated)
|
||||||
{
|
{
|
||||||
T* temp = allocateArray(new_cap);
|
T* temp = allocateArray(new_cap);
|
||||||
std::uninitialized_move_n(begin(), arraySize, temp);
|
if constexpr (std::is_trivially_copyable_v<T>)
|
||||||
|
{
|
||||||
|
std::memcpy(temp, _data, sizeof(T) * arraySize);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
std::uninitialized_move_n(begin(), arraySize, temp);
|
||||||
|
}
|
||||||
_data = temp;
|
_data = temp;
|
||||||
}
|
}
|
||||||
allocated = new_cap;
|
allocated = new_cap;
|
||||||
|
|||||||
Reference in New Issue
Block a user