zdoom/zdray
0
0
Fork 0
mirror of https://github.com/ZDoom/ZDRay.git synced 2024-11-22 03:51:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add --no-rtx option for testing the non-rayquery path on hardware that can do RTX

Browse source
This commit is contained in:
Magnus Norddahl 2022-09-01 00:10:33 +02:00
parent 3202713eee
commit 0c6954a767
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/lightmap/gpuraytracer.cpp
View file

@ -19,11 +19,12 @@
#include "glsl_vert.h" #include "glsl_vert.h"
extern bool VKDebug; extern bool VKDebug;
extern bool NoRtx;
GPURaytracer::GPURaytracer() GPURaytracer::GPURaytracer()
{ {
device = std::make_unique<VulkanDevice>(0, VKDebug); device = std::make_unique<VulkanDevice>(0, VKDebug);
//useRayQuery = device->physicalDevice.rayQueryProperties.supportsRayQuery; useRayQuery = !NoRtx;// && device->physicalDevice.rayQueryProperties.supportsRayQuery;
PrintVulkanInfo(); PrintVulkanInfo();
} }

8
src/main.cpp
View file

@ -117,6 +117,7 @@ int NumThreads = 0;
int LMDims = 1024; int LMDims = 1024;
bool VKDebug = false; bool VKDebug = false;
bool DumpMesh = false; bool DumpMesh = false;
bool NoRtx = false;
int ambientSampleCount = 2048; int ambientSampleCount = 2048;
@ -158,10 +159,11 @@ static option long_opts[] =
{"vkdebug", no_argument, 0, 'D'}, {"vkdebug", no_argument, 0, 'D'},
{"dump-mesh", no_argument, 0, 1004}, {"dump-mesh", no_argument, 0, 1004},
{"preview", no_argument, 0, 1005}, {"preview", no_argument, 0, 1005},
{"no-rtx", no_argument, 0, 1006},
{0,0,0,0} {0,0,0,0}
}; };
static const char short_opts[] = "wVgGvbNrReEm:o:f:p:s:d:PqtzZXx5cj:S:D::"; static const char short_opts[] = "wVgGvbNrReEm:o:f:p:s:d:PqtzZXx5cj:S:D:::";
// CODE -------------------------------------------------------------------- // CODE --------------------------------------------------------------------
@ -458,6 +460,9 @@ static void ParseArgs(int argc, char **argv)
case 1005: case 1005:
ambientSampleCount = 16; ambientSampleCount = 16;
break; break;
case 1006:
NoRtx = true;
break;
case 1000: case 1000:
ShowUsage(); ShowUsage();
exit(0); exit(0);
@ -503,6 +508,7 @@ static void ShowUsage()
" -S, --size=NNN lightmap texture dimensions for width and height must be in powers of two (1, 2, 4, 8, 16, etc)\n" " -S, --size=NNN lightmap texture dimensions for width and height must be in powers of two (1, 2, 4, 8, 16, etc)\n"
" -D, --vkdebug Print messages from the Vulkan validation layer\n" " -D, --vkdebug Print messages from the Vulkan validation layer\n"
" --dump-mesh Export level mesh and lightmaps for debugging\n" " --dump-mesh Export level mesh and lightmaps for debugging\n"
" --no-rtx Do not use RTX acceleration for the ray tracing\n"
" -w, --warn Show warning messages\n" " -w, --warn Show warning messages\n"
#if HAVE_TIMING #if HAVE_TIMING
" -t, --no-timing Suppress timing information\n" " -t, --no-timing Suppress timing information\n"