Adding normal mapping
This commit is contained in:
@@ -22,9 +22,7 @@ TextureAsset::TextureAsset(std::string_view folderPath, std::string_view name) :
|
||||
|
||||
TextureAsset::~TextureAsset() {}
|
||||
|
||||
void TextureAsset::save(ArchiveBuffer& buffer) const {
|
||||
Serialization::save(buffer, ktxData);
|
||||
}
|
||||
void TextureAsset::save(ArchiveBuffer& buffer) const { Serialization::save(buffer, ktxData); }
|
||||
|
||||
void TextureAsset::load(ArchiveBuffer& buffer) {
|
||||
ktxTexture2* ktxHandle;
|
||||
@@ -33,7 +31,7 @@ void TextureAsset::load(ArchiveBuffer& buffer) {
|
||||
ktxTexture_CreateFromMemory(ktxData.data(), ktxData.size(), KTX_TEXTURE_CREATE_LOAD_IMAGE_DATA_BIT, (ktxTexture**)&ktxHandle));
|
||||
|
||||
ktxTexture2_TranscodeBasis(ktxHandle, KTX_TTF_RGBA32, 0);
|
||||
//ktxTexture2_DeflateZstd(ktxHandle, 0);
|
||||
// ktxTexture2_DeflateZstd(ktxHandle, 0);
|
||||
|
||||
Gfx::PGraphics graphics = buffer.getGraphics();
|
||||
TextureCreateInfo createInfo = {
|
||||
@@ -51,6 +49,7 @@ void TextureAsset::load(ArchiveBuffer& buffer) {
|
||||
.layers = ktxHandle->numFaces,
|
||||
.elements = ktxHandle->numLayers,
|
||||
.usage = Gfx::SE_IMAGE_USAGE_SAMPLED_BIT,
|
||||
.name = name,
|
||||
};
|
||||
if (ktxHandle->isCubemap) {
|
||||
texture = graphics->createTextureCube(createInfo);
|
||||
|
||||
@@ -33,7 +33,7 @@ RayTracingPass::RayTracingPass(Gfx::PGraphics graphics, PScene scene) : RenderPa
|
||||
pipelineLayout->addDescriptorLayout(StaticMeshVertexData::getInstance()->getInstanceDataLayout());
|
||||
graphics->getShaderCompiler()->registerRenderPass("RayTracing", Gfx::PassConfig{
|
||||
.baseLayout = pipelineLayout,
|
||||
.mainFile = "Callable",
|
||||
.mainFile = "ClosestHit",
|
||||
.useMaterial = true,
|
||||
.rayTracing = true,
|
||||
});
|
||||
@@ -42,8 +42,7 @@ RayTracingPass::RayTracingPass(Gfx::PGraphics graphics, PScene scene) : RenderPa
|
||||
void RayTracingPass::beginFrame(const Component::Camera& cam) { RenderPass::beginFrame(cam); }
|
||||
|
||||
void RayTracingPass::render() {
|
||||
Gfx::ORenderCommand command = graphics->createRenderCommand("RayTracing");
|
||||
Array<Gfx::RayTracingCallableGroup> callableGroups;
|
||||
Array<Gfx::RayTracingHitGroup> callableGroups;
|
||||
Array<Gfx::PBottomLevelAS> accelerationStructures;
|
||||
Array<InstanceData> instanceData;
|
||||
|
||||
@@ -64,8 +63,8 @@ void RayTracingPass::render() {
|
||||
|
||||
for (auto& inst : matData.instances) {
|
||||
for (uint32 i = 0; i < inst.instanceData.size(); ++i) {
|
||||
Gfx::RayTracingCallableGroup callableGroup = {
|
||||
.shader = collection->callableShader,
|
||||
Gfx::RayTracingHitGroup callableGroup = {
|
||||
.closestHitShader = collection->callableShader,
|
||||
};
|
||||
callableGroup.parameters.resize(sizeof(VertexData::DrawCallOffsets));
|
||||
std::memcpy(callableGroup.parameters.data(), &inst.offsets, sizeof(VertexData::DrawCallOffsets));
|
||||
@@ -77,6 +76,13 @@ void RayTracingPass::render() {
|
||||
}
|
||||
}
|
||||
}
|
||||
pipeline = graphics->createRayTracingPipeline(Gfx::RayTracingPipelineCreateInfo{
|
||||
.pipelineLayout = pipelineLayout,
|
||||
.rayGenGroup = {.shader = rayGen},
|
||||
.hitGroups = callableGroups,
|
||||
.missGroups = {{.shader = miss}},
|
||||
//.callableGroups = callableGroups,
|
||||
});
|
||||
tlas = graphics->createTopLevelAccelerationStructure(Gfx::TopLevelASCreateInfo{
|
||||
.instances = instanceData,
|
||||
.bottomLevelStructures = accelerationStructures,
|
||||
@@ -87,6 +93,7 @@ void RayTracingPass::render() {
|
||||
desc->updateBuffer(2, StaticMeshVertexData::getInstance()->getIndexBuffer());
|
||||
desc->writeChanges();
|
||||
|
||||
Gfx::ORenderCommand command = graphics->createRenderCommand("RayTracing");
|
||||
command->bindPipeline(pipeline);
|
||||
StaticMeshVertexData::getInstance()->getInstanceDataSet()->writeChanges();
|
||||
StaticMeshVertexData::getInstance()->getVertexDataSet()->writeChanges();
|
||||
@@ -118,26 +125,15 @@ void RayTracingPass::publishOutputs() {
|
||||
Gfx::SE_ACCESS_SHADER_WRITE_BIT, Gfx::SE_PIPELINE_STAGE_COMPUTE_SHADER_BIT);
|
||||
ShaderCompilationInfo compileInfo = {
|
||||
.name = "RT",
|
||||
.modules = {"RayGen", "ClosestHit", "Miss"},
|
||||
.entryPoints = {{"raygen", "RayGen"}, {"closestHit", "ClosestHit"}, {"miss", "Miss"}},
|
||||
.modules = {"RayGen", "Miss"},
|
||||
.entryPoints = {{"raygen", "RayGen"}, {"miss", "Miss"}},
|
||||
.defines = {{"RAY_TRACING", "1"}},
|
||||
.rootSignature = pipelineLayout,
|
||||
};
|
||||
graphics->beginShaderCompilation(compileInfo);
|
||||
rayGen = graphics->createRayGenShader({0});
|
||||
closestHit = graphics->createClosestHitShader({1});
|
||||
miss = graphics->createMissShader({2});
|
||||
miss = graphics->createMissShader({1});
|
||||
pipelineLayout->create();
|
||||
pipeline = graphics->createRayTracingPipeline(Gfx::RayTracingPipelineCreateInfo{
|
||||
.pipelineLayout = pipelineLayout,
|
||||
.rayGenGroup = {.shader = rayGen},
|
||||
.hitGroups = {{.closestHitShader = closestHit}},
|
||||
.missGroups = {{.shader = miss}},
|
||||
//.callableGroups = callableGroups,
|
||||
});
|
||||
Component::Transform transform;
|
||||
transform.setScale(Vector(1, 1, 1));
|
||||
transform.setPosition(Vector(0, 0, 1));
|
||||
}
|
||||
|
||||
void RayTracingPass::createRenderPass() {}
|
||||
|
||||
@@ -19,7 +19,6 @@ class RayTracingPass : public RenderPass {
|
||||
Gfx::OPipelineLayout pipelineLayout;
|
||||
Gfx::OTexture2D texture;
|
||||
Gfx::ORayGenShader rayGen;
|
||||
Gfx::OClosestHitShader closestHit;
|
||||
Gfx::OMissShader miss;
|
||||
Gfx::PRayTracingPipeline pipeline;
|
||||
Gfx::OTopLevelAS tlas;
|
||||
|
||||
@@ -129,7 +129,7 @@ void ShaderCompiler::createShaders(ShaderPermutation permutation, Gfx::OPipeline
|
||||
createInfo.modules.add(permutation.vertexMeshFile);
|
||||
} else if (permutation.rayTracing) {
|
||||
createInfo.defines["RAY_TRACING"] = "1";
|
||||
createInfo.entryPoints = {{"callable", "Callable"}};
|
||||
createInfo.entryPoints = {{"closestHit", "ClosestHit"}};
|
||||
createInfo.modules.add(permutation.vertexMeshFile);
|
||||
} else {
|
||||
createInfo.entryPoints.add({"vertexMain", permutation.vertexMeshFile});
|
||||
@@ -148,7 +148,7 @@ void ShaderCompiler::createShaders(ShaderPermutation permutation, Gfx::OPipeline
|
||||
}
|
||||
collection.meshShader = graphics->createMeshShader({shaderIndex++});
|
||||
} else if (permutation.rayTracing) {
|
||||
collection.callableShader = graphics->createCallableShader({shaderIndex++});
|
||||
collection.callableShader = graphics->createClosestHitShader({shaderIndex++});
|
||||
} else {
|
||||
collection.vertexShader = graphics->createVertexShader({shaderIndex++});
|
||||
}
|
||||
|
||||
@@ -154,7 +154,7 @@ struct ShaderCollection {
|
||||
OTaskShader taskShader;
|
||||
OMeshShader meshShader;
|
||||
OFragmentShader fragmentShader;
|
||||
OCallableShader callableShader;
|
||||
OClosestHitShader callableShader;
|
||||
};
|
||||
|
||||
struct PassConfig {
|
||||
|
||||
@@ -20,6 +20,7 @@ BufferAllocation::BufferAllocation(PGraphics graphics, const std::string& name,
|
||||
.objectHandle = (uint64)buffer,
|
||||
.pObjectName = name.c_str(),
|
||||
};
|
||||
assert(!name.empty());
|
||||
vkSetDebugUtilsObjectNameEXT(graphics->getDevice(), &nameInfo);
|
||||
if (bufferInfo.usage & VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT) {
|
||||
VkBufferDeviceAddressInfo addrInfo = {
|
||||
|
||||
@@ -490,7 +490,7 @@ PRayTracingPipeline PipelineCache::createPipeline(Gfx::RayTracingPipelineCreateI
|
||||
});
|
||||
}
|
||||
{
|
||||
for (auto hitgroup : createInfo.hitGroups) {
|
||||
for (const auto& hitgroup : createInfo.hitGroups) {
|
||||
auto hit = hitgroup.closestHitShader.cast<ClosestHitShader>();
|
||||
shaderStages.add(VkPipelineShaderStageCreateInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
|
||||
@@ -594,174 +594,105 @@ PRayTracingPipeline PipelineCache::createPipeline(Gfx::RayTracingPipelineCreateI
|
||||
};
|
||||
VkPipeline pipelineHandle;
|
||||
VK_CHECK(vkCreateRayTracingPipelinesKHR(graphics->getDevice(), VK_NULL_HANDLE, cache, 1, &pipelineInfo, nullptr, &pipelineHandle));
|
||||
/*
|
||||
const uint32_t handle_size = graphics->getRayTracingProperties().shaderGroupHandleSize;
|
||||
const uint32_t handle_size_aligned =
|
||||
align(graphics->getRayTracingProperties().shaderGroupHandleSize, graphics->getRayTracingProperties().shaderGroupHandleAlignment);
|
||||
const uint32_t handle_alignment = graphics->getRayTracingProperties().shaderGroupHandleAlignment;
|
||||
const uint32_t group_count = static_cast<uint32_t>(shaderGroups.size());
|
||||
const uint32_t sbt_size = group_count * handle_size_aligned;
|
||||
const VkBufferUsageFlags sbt_buffer_usage_flags =
|
||||
VK_BUFFER_USAGE_SHADER_BINDING_TABLE_BIT_KHR | VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT;
|
||||
const VmaMemoryUsage sbt_memory_usage = VMA_MEMORY_USAGE_CPU_TO_GPU;
|
||||
|
||||
// Raygen
|
||||
// Create binding table buffers for each shader type
|
||||
OBufferAllocation raygen_shader_binding_table = new BufferAllocation(graphics, "RayGen",
|
||||
VkBufferCreateInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
|
||||
.pNext = nullptr,
|
||||
.size = handle_size,
|
||||
.usage = sbt_buffer_usage_flags,
|
||||
},
|
||||
VmaAllocationCreateInfo{
|
||||
.usage = sbt_memory_usage,
|
||||
},
|
||||
Gfx::QueueType::GRAPHICS, 0);
|
||||
OBufferAllocation miss_shader_binding_table = new BufferAllocation(graphics, "Miss",
|
||||
VkBufferCreateInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
|
||||
.pNext = nullptr,
|
||||
.size = handle_size,
|
||||
.usage = sbt_buffer_usage_flags,
|
||||
},
|
||||
VmaAllocationCreateInfo{
|
||||
.usage = sbt_memory_usage,
|
||||
},
|
||||
Gfx::QueueType::GRAPHICS, 0);
|
||||
OBufferAllocation hit_shader_binding_table = new BufferAllocation(graphics, "Hit",
|
||||
VkBufferCreateInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
|
||||
.pNext = nullptr,
|
||||
.size = handle_size,
|
||||
.usage = sbt_buffer_usage_flags,
|
||||
},
|
||||
VmaAllocationCreateInfo{
|
||||
.usage = sbt_memory_usage,
|
||||
},
|
||||
Gfx::QueueType::GRAPHICS, 0);
|
||||
|
||||
// Copy the pipeline's shader handles into a host buffer
|
||||
std::vector<uint8_t> shader_handle_storage(sbt_size);
|
||||
VK_CHECK(vkGetRayTracingShaderGroupHandlesKHR(graphics->getDevice(), pipelineHandle, 0, group_count, sbt_size,
|
||||
shader_handle_storage.data()));
|
||||
|
||||
// Copy the shader handles from the host buffer to the binding tables
|
||||
uint8_t* data = static_cast<uint8_t*>(raygen_shader_binding_table->map());
|
||||
memcpy(data, shader_handle_storage.data(), handle_size);
|
||||
data = static_cast<uint8_t*>(miss_shader_binding_table->map());
|
||||
memcpy(data, shader_handle_storage.data() + handle_size_aligned, handle_size);
|
||||
data = static_cast<uint8_t*>(hit_shader_binding_table->map());
|
||||
memcpy(data, shader_handle_storage.data() + handle_size_aligned * 2, handle_size);
|
||||
raygen_shader_binding_table->unmap();
|
||||
miss_shader_binding_table->unmap();
|
||||
hit_shader_binding_table->unmap();*/
|
||||
|
||||
const uint32_t handleSize = graphics->getRayTracingProperties().shaderGroupHandleSize;
|
||||
const uint32_t handleSizeAligned =
|
||||
align(graphics->getRayTracingProperties().shaderGroupHandleSize, graphics->getRayTracingProperties().shaderGroupHandleAlignment);
|
||||
const uint32_t handleAlignment = graphics->getRayTracingProperties().shaderGroupHandleAlignment;
|
||||
const uint32_t sbtAlignment = graphics->getRayTracingProperties().shaderGroupBaseAlignment;
|
||||
const uint32_t groupCount = static_cast<uint32_t>(shaderGroups.size());
|
||||
const uint32_t sbtSize = groupCount * handleSizeAligned;
|
||||
const VkBufferUsageFlags sbtBufferUsage =
|
||||
VK_BUFFER_USAGE_SHADER_BINDING_TABLE_BIT_KHR | VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT;
|
||||
const VmaMemoryUsage sbtMemoryUsage = VMA_MEMORY_USAGE_CPU_TO_GPU;
|
||||
|
||||
VK_BUFFER_USAGE_SHADER_BINDING_TABLE_BIT_KHR | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT;
|
||||
const VmaMemoryUsage sbtMemoryUsage = VMA_MEMORY_USAGE_AUTO;
|
||||
|
||||
uint64 rayGenStride = align<uint64>(handleSize + createInfo.rayGenGroup.parameters.size(), handleAlignment);
|
||||
uint64 hitStride = handleSize;
|
||||
for (const auto& h : createInfo.hitGroups) {
|
||||
hitStride = std::max(hitStride, align<uint64>(handleSize + h.parameters.size(), handleAlignment));
|
||||
}
|
||||
uint64 missStride = handleSize;
|
||||
for (const auto& m : createInfo.missGroups) {
|
||||
missStride = std::max(missStride, align<uint64>(handleSize + m.parameters.size(), handleAlignment));
|
||||
}
|
||||
OBufferAllocation rayGenBuffer = new BufferAllocation(graphics, "RayGenSBT",
|
||||
VkBufferCreateInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
|
||||
.pNext = nullptr,
|
||||
.flags = 0,
|
||||
.size = handleSize,
|
||||
.size = rayGenStride,
|
||||
.usage = sbtBufferUsage,
|
||||
},
|
||||
VmaAllocationCreateInfo{
|
||||
.usage = sbtMemoryUsage,
|
||||
},
|
||||
Gfx::QueueType::GRAPHICS);
|
||||
Gfx::QueueType::GRAPHICS, sbtAlignment);
|
||||
|
||||
OBufferAllocation hitBuffer = new BufferAllocation(graphics, "HitSBT",
|
||||
VkBufferCreateInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
|
||||
.pNext = nullptr,
|
||||
.flags = 0,
|
||||
.size = handleSize * createInfo.hitGroups.size(),
|
||||
.size = hitStride * createInfo.hitGroups.size(),
|
||||
.usage = sbtBufferUsage,
|
||||
},
|
||||
VmaAllocationCreateInfo{
|
||||
.usage = sbtMemoryUsage,
|
||||
},
|
||||
Gfx::QueueType::GRAPHICS);
|
||||
Gfx::QueueType::GRAPHICS, sbtAlignment);
|
||||
|
||||
OBufferAllocation missBuffer = new BufferAllocation(graphics, "MissSBT",
|
||||
VkBufferCreateInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
|
||||
.pNext = nullptr,
|
||||
.flags = 0,
|
||||
.size = handleSize * createInfo.missGroups.size(),
|
||||
.size = missStride * createInfo.missGroups.size(),
|
||||
.usage = sbtBufferUsage,
|
||||
},
|
||||
VmaAllocationCreateInfo{
|
||||
.usage = sbtMemoryUsage,
|
||||
},
|
||||
Gfx::QueueType::GRAPHICS);
|
||||
Gfx::QueueType::GRAPHICS, sbtAlignment);
|
||||
|
||||
Array<uint8> sbt(sbtSize);
|
||||
vkGetRayTracingShaderGroupHandlesKHR(graphics->getDevice(), pipelineHandle, 0, shaderGroups.size(), sbtSize, sbt.data());
|
||||
|
||||
/* maxParamSize = 0;
|
||||
for (auto& callableGroup : createInfo.callableGroups) {
|
||||
maxParamSize = std::max<uint32>(maxParamSize, callableGroup.parameters.size());
|
||||
}
|
||||
uint64 callableStride = align(handleSize + maxParamSize, handleAlignment);
|
||||
|
||||
OBufferAllocation callableBuffer = new BufferAllocation(graphics, "CallableSBT",
|
||||
VkBufferCreateInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,
|
||||
.pNext = nullptr,
|
||||
.flags = 0,
|
||||
.size = callableStride * createInfo.callableGroups.size(),
|
||||
.usage = sbtBufferUsage,
|
||||
},
|
||||
VmaAllocationCreateInfo{
|
||||
.usage = sbtMemoryUsage,
|
||||
},
|
||||
Gfx::QueueType::GRAPHICS);
|
||||
uint8* callableData = static_cast<uint8*>(callableBuffer->map());
|
||||
for (uint64 i = 0; i < createInfo.callableGroups.size(); ++i) {
|
||||
std::memcpy(callableData, sbt.data() + sbtOffset, handleSize);
|
||||
std::memcpy(callableData + handleSize, createInfo.callableGroups[i].parameters.data(),
|
||||
createInfo.callableGroups[i].parameters.size());
|
||||
sbtOffset += handleSizeAligned;
|
||||
callableData += callableStride;
|
||||
}
|
||||
callableBuffer->unmap();
|
||||
*/
|
||||
uint64 sbtOffset = 0;
|
||||
uint8* rayGenData = static_cast<uint8*>(rayGenBuffer->map());
|
||||
std::memcpy(rayGenData, sbt.data() + sbtOffset, handleSize);
|
||||
rayGenBuffer->unmap();
|
||||
Array<uint8> rayGenSbt(rayGenStride);
|
||||
std::memcpy(rayGenSbt.data(), sbt.data() + sbtOffset, handleSize);
|
||||
std::memcpy(rayGenSbt.data() + handleSize, createInfo.rayGenGroup.parameters.data(), createInfo.rayGenGroup.parameters.size());
|
||||
sbtOffset += handleSizeAligned;
|
||||
rayGenBuffer->updateContents(0, rayGenSbt.size(), rayGenSbt.data());
|
||||
rayGenBuffer->pipelineBarrier(VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_SHADER_READ_BIT,
|
||||
VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR);
|
||||
|
||||
uint8* hitData = static_cast<uint8*>(hitBuffer->map());
|
||||
|
||||
Array<uint8> hitSbt(hitStride * createInfo.hitGroups.size());
|
||||
for (uint64 i = 0; i < createInfo.hitGroups.size(); ++i) {
|
||||
std::memcpy(hitData, sbt.data() + sbtOffset, handleSize);
|
||||
std::memcpy(hitSbt.data() + i * hitStride, sbt.data() + sbtOffset, handleSize);
|
||||
std::memcpy(hitSbt.data() + i * hitStride + handleSize, createInfo.hitGroups[i].parameters.data(),
|
||||
createInfo.hitGroups[i].parameters.size());
|
||||
sbtOffset += handleSizeAligned;
|
||||
hitData += handleSizeAligned;
|
||||
}
|
||||
hitBuffer->unmap();
|
||||
hitBuffer->updateContents(0, hitSbt.size(), hitSbt.data());
|
||||
hitBuffer->pipelineBarrier(VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_SHADER_READ_BIT,
|
||||
VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR);
|
||||
|
||||
uint8* missData = static_cast<uint8*>(missBuffer->map());
|
||||
|
||||
Array<uint8> missSbt(missStride * createInfo.missGroups.size());
|
||||
for (uint64 i = 0; i < createInfo.missGroups.size(); ++i) {
|
||||
std::memcpy(missData, sbt.data() + sbtOffset, handleSize);
|
||||
std::memcpy(missSbt.data() + i * missStride, sbt.data() + sbtOffset, handleSize);
|
||||
std::memcpy(missSbt.data() + i * missStride + handleSize, createInfo.missGroups[i].parameters.data(),
|
||||
createInfo.missGroups[i].parameters.size());
|
||||
sbtOffset += handleSizeAligned;
|
||||
missData += handleSizeAligned;
|
||||
}
|
||||
missBuffer->unmap();
|
||||
missBuffer->updateContents(0, missSbt.size(), missSbt.data());
|
||||
missBuffer->pipelineBarrier(VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_SHADER_READ_BIT,
|
||||
VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR);
|
||||
|
||||
ORayTracingPipeline pipeline =
|
||||
new RayTracingPipeline(graphics, pipelineHandle, std::move(rayGenBuffer), handleSizeAligned, std::move(hitBuffer),
|
||||
handleSizeAligned, std::move(missBuffer), handleSizeAligned, nullptr, 0, createInfo.pipelineLayout);
|
||||
new RayTracingPipeline(graphics, pipelineHandle, std::move(rayGenBuffer), rayGenStride, std::move(hitBuffer),
|
||||
hitStride, std::move(missBuffer), missStride, nullptr, 0, createInfo.pipelineLayout);
|
||||
PRayTracingPipeline handle = pipeline;
|
||||
rayTracingPipelines[hash] = std::move(pipeline);
|
||||
return handle;
|
||||
|
||||
@@ -56,7 +56,7 @@ TopLevelAS::TopLevelAS(PGraphics graphics, const Gfx::TopLevelASCreateInfo& crea
|
||||
},
|
||||
.instanceCustomIndex = i,
|
||||
.mask = 0xff,
|
||||
.instanceShaderBindingTableRecordOffset = 0,
|
||||
.instanceShaderBindingTableRecordOffset = i,
|
||||
.flags = VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR,
|
||||
.accelerationStructureReference = blas->getDeviceAddress(),
|
||||
};
|
||||
|
||||
@@ -78,9 +78,9 @@ void Seele::beginCompilation(const ShaderCompilationInfo& info, SlangCompileTarg
|
||||
Map<std::string, slang::IModule*> moduleMap;
|
||||
for (const auto& moduleName : info.modules) {
|
||||
slang::IModule* loaded = session->loadModule(moduleName.c_str(), diagnostics.writeRef());
|
||||
CHECK_DIAGNOSTICS();
|
||||
components.add(loaded);
|
||||
moduleMap[moduleName] = loaded;
|
||||
CHECK_DIAGNOSTICS();
|
||||
}
|
||||
entryPoints.clear();
|
||||
for (const auto& [name, mod] : info.entryPoints) {
|
||||
|
||||
@@ -40,21 +40,21 @@ void Material::init(Gfx::PGraphics graphics) {
|
||||
.descriptorType = Gfx::SE_DESCRIPTOR_TYPE_SAMPLED_IMAGE,
|
||||
.descriptorCount = 2000,
|
||||
.bindingFlags = Gfx::SE_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT,
|
||||
.shaderStages = Gfx::SE_SHADER_STAGE_FRAGMENT_BIT | Gfx::SE_SHADER_STAGE_CALLABLE_BIT_KHR,
|
||||
.shaderStages = Gfx::SE_SHADER_STAGE_FRAGMENT_BIT | Gfx::SE_SHADER_STAGE_CLOSEST_HIT_BIT_KHR,
|
||||
});
|
||||
layout->addDescriptorBinding(Gfx::DescriptorBinding{
|
||||
.binding = 1,
|
||||
.descriptorType = Gfx::SE_DESCRIPTOR_TYPE_SAMPLER,
|
||||
.descriptorCount = 2000,
|
||||
.bindingFlags = Gfx::SE_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT,
|
||||
.shaderStages = Gfx::SE_SHADER_STAGE_FRAGMENT_BIT | Gfx::SE_SHADER_STAGE_CALLABLE_BIT_KHR,
|
||||
.shaderStages = Gfx::SE_SHADER_STAGE_FRAGMENT_BIT | Gfx::SE_SHADER_STAGE_CLOSEST_HIT_BIT_KHR,
|
||||
});
|
||||
layout->addDescriptorBinding(Gfx::DescriptorBinding{
|
||||
.binding = 2,
|
||||
.descriptorType = Gfx::SE_DESCRIPTOR_TYPE_STORAGE_BUFFER,
|
||||
.descriptorCount = 1,
|
||||
.bindingFlags = Gfx::SE_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT,
|
||||
.shaderStages = Gfx::SE_SHADER_STAGE_FRAGMENT_BIT | Gfx::SE_SHADER_STAGE_CALLABLE_BIT_KHR,
|
||||
.shaderStages = Gfx::SE_SHADER_STAGE_FRAGMENT_BIT | Gfx::SE_SHADER_STAGE_CLOSEST_HIT_BIT_KHR,
|
||||
});
|
||||
layout->create();
|
||||
floatBuffer = graphics->createShaderBuffer(ShaderBufferCreateInfo{
|
||||
|
||||
@@ -23,12 +23,12 @@ using namespace Seele;
|
||||
GameView::GameView(Gfx::PGraphics graphics, PWindow window, const ViewportCreateInfo& createInfo, std::string dllPath)
|
||||
: View(graphics, window, createInfo, "Game"), scene(new Scene(graphics)), gameInterface(dllPath) {
|
||||
reloadGame();
|
||||
//renderGraph.addPass(new CachedDepthPass(graphics, scene));
|
||||
//renderGraph.addPass(new DepthCullingPass(graphics, scene));
|
||||
//renderGraph.addPass(new VisibilityPass(graphics, scene));
|
||||
//renderGraph.addPass(new LightCullingPass(graphics, scene));
|
||||
//renderGraph.addPass(new BasePass(graphics, scene));
|
||||
renderGraph.addPass(new RayTracingPass(graphics, scene));
|
||||
renderGraph.addPass(new CachedDepthPass(graphics, scene));
|
||||
renderGraph.addPass(new DepthCullingPass(graphics, scene));
|
||||
renderGraph.addPass(new VisibilityPass(graphics, scene));
|
||||
renderGraph.addPass(new LightCullingPass(graphics, scene));
|
||||
renderGraph.addPass(new BasePass(graphics, scene));
|
||||
//renderGraph.addPass(new RayTracingPass(graphics, scene));
|
||||
renderGraph.setViewport(viewport);
|
||||
renderGraph.createRenderPass();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user