zdoom/zdray
0
0
Fork 0
mirror of https://github.com/ZDoom/ZDRay.git synced 2024-11-25 13:21:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor code clean up

Browse source
This commit is contained in:
Magnus Norddahl 2021-11-05 23:50:19 +01:00
parent 9ebe31ee72
commit b12f31f182
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/lightmap/gpuraytracer.cpp
View file

@ -20,10 +20,24 @@
#include "glsl_closesthit.h"
extern int LightBounce;
extern float GridSize;
static RENDERDOC_API_1_4_2* renderdoc = nullptr;
GPURaytracer::GPURaytracer()
{
if (!renderdoc)
{
if (HMODULE mod = GetModuleHandle(TEXT("renderdoc.dll")))
{
pRENDERDOC_GetAPI RENDERDOC_GetAPI = (pRENDERDOC_GetAPI)GetProcAddress(mod, "RENDERDOC_GetAPI");
int ret = RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_4_2, (void**)&renderdoc);
if (ret == 1)
printf("Renderdoc detected!\n");
else
renderdoc = nullptr;
}
}
auto printLog = [](const char* typestr, const std::string& msg)
{
printf("\n[%s] %s\n", typestr, msg.c_str());
@ -103,17 +117,6 @@ void GPURaytracer::Raytrace(LevelMesh* level)
}
}
RENDERDOC_API_1_4_2* renderdoc = nullptr;
if (HMODULE mod = GetModuleHandle(TEXT("renderdoc.dll")))
{
pRENDERDOC_GetAPI RENDERDOC_GetAPI = (pRENDERDOC_GetAPI)GetProcAddress(mod, "RENDERDOC_GetAPI");
int ret = RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_4_2, (void**)&renderdoc);
if (ret == 1)
printf("Renderdoc detected!\n");
else
renderdoc = nullptr;
}
if (renderdoc)
renderdoc->StartFrameCapture(0, 0);
@ -132,7 +135,7 @@ void GPURaytracer::Raytrace(LevelMesh* level)
finishbuildbarrier.addMemory(VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR, VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR);
finishbuildbarrier.execute(cmdbuffer.get(), VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR, VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR);
size_t maxTasks = rayTraceImageSize * rayTraceImageSize;
size_t maxTasks = (size_t)rayTraceImageSize * rayTraceImageSize;
if (tasks.size() > maxTasks)
throw std::runtime_error("Ray trace task count is too large");

1
src/lightmap/raytracer.cpp
View file

@ -14,7 +14,6 @@
#include <zlib.h>
extern int LightBounce;
extern float GridSize;
Raytracer::Raytracer()
{