Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove internal code #1

Closed
wants to merge 2 commits into from
Closed

Remove internal code #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae7992c
minor fixes
skallweitNV Feb 8, 2024
4f6d759
remove internal code
skallweitNV Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion source/ProgramManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ SlangCompileRequest* ProgramManager::createSlangCompileRequest(const Program& pr
if (!findFileInShaderDirectories(path, fullPath))
{
spDestroyCompileRequest(pSlangRequest);
std::string msg = std::string("Can't find shader file ") + std::string(path);
std::string msg = std::string("Can't find shader file ") + path.string();
printf("%s\n", msg.c_str());
assert(0);
}
Expand Down
2 changes: 1 addition & 1 deletion source/ProgramManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "ProgramReflection.h"
#include "Types.h"

class ProgramDesc;
struct ProgramDesc;
class Device;
class Program;
class ProgramVersion;
Expand Down
8 changes: 4 additions & 4 deletions source/Utility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ inline const std::filesystem::path& getExecutablePath()
);
return path;
}
#elif defined(Windows)
#elif defined(_WIN32)
#include <windows.h>
inline const std::filesystem::path& getExecutablePath()
{
Expand Down Expand Up @@ -176,7 +176,7 @@ inline bool findFileInShaderDirectories(const std::filesystem::path& path, std::

inline void DumpArguments(slang::SessionDesc& sessionDesc, std::vector<const char*> args)
{
printf("targetCount = %ld\n", sessionDesc.targetCount);
printf("targetCount = %lld\n", sessionDesc.targetCount);

for (uint32_t i = 0; i < sessionDesc.targetCount; i++)
{
Expand All @@ -190,11 +190,11 @@ inline void DumpArguments(slang::SessionDesc& sessionDesc, std::vector<const cha

printf("flags = %d\n", sessionDesc.flags);
printf("defaultMatrixLayoutMode = %d\n", sessionDesc.defaultMatrixLayoutMode);
printf("searchPathCount = %ld\n", sessionDesc.searchPathCount);
printf("searchPathCount = %lld\n", sessionDesc.searchPathCount);
for (uint32_t i = 0; i < sessionDesc.searchPathCount; i++)
printf("searchPaths = %s\n", sessionDesc.searchPaths[i]);

printf("preprocessorMacroCount = %ld\n", sessionDesc.preprocessorMacroCount);
printf("preprocessorMacroCount = %lld\n", sessionDesc.preprocessorMacroCount);
for (uint32_t i = 0; i < sessionDesc.preprocessorMacroCount; i++)
printf("macro [name = %s, value = %s]\n", sessionDesc.preprocessorMacros[i].name, sessionDesc.preprocessorMacros[i].value);

Expand Down
3 changes: 1 addition & 2 deletions source/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ void LoadShaderModules(ProgramDesc& desc)
ProgramDesc::ShaderModuleList shaderModules;

shaderModules.push_back(ProgramDesc::ShaderModule::fromFile("Rendering/Materials/StandardMaterial.slang"));
shaderModules.push_back(ProgramDesc::ShaderModule::fromFile("MaterialXTemp/MxLayered_mixedLobes_Material.slang"));
shaderModules.push_back(ProgramDesc::ShaderModule::fromFile("Rendering/Materials/ClothMaterial.slang"));
shaderModules.push_back(ProgramDesc::ShaderModule::fromFile("Rendering/Materials/HairMaterial.slang"));
shaderModules.push_back(ProgramDesc::ShaderModule::fromFile("Rendering/Materials/MERLMaterial.slang"));
Expand All @@ -49,7 +48,7 @@ void LoadShaderModules(ProgramDesc& desc)
shaderModules.push_back(ProgramDesc::ShaderModule::fromFile("Rendering/Materials/PBRT/PBRTDiffuseTransmissionMaterial.slang"));

desc.addShaderModules(shaderModules);
desc.addShaderLibrary("RenderPasses/InternalPathTracer/TracePass.cs.slang").csEntry("main");
desc.addShaderLibrary("RenderPasses/PathTracer/TracePassSimpleInline.cs.slang").csEntry("main");
}

void TestCase(ref<Device>& device)
Expand Down
48 changes: 1 addition & 47 deletions source/path-tracer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,17 @@
#include "path-tracer.h"

#define FALCOR_INTERNAL 1

enum class SDFGridIntersectionMethod : uint32_t
{
None = 0,
GridSphereTracing = 1,
VoxelSphereTracing = 2,
#ifdef FALCOR_INTERNAL
VoxelOptimizedSphereTracing = 3,
VoxelCubicAnalytic = 4,
VoxelCubicNumericMarmitt = 5,
VoxelCubicNumericNewtonRaphson = 6,
#endif
};

enum class SDFGridGradientEvaluationMethod : uint32_t
{
None = 0,
NumericDiscontinuous = 1,
NumericContinuous = 2,
#ifdef FALCOR_INTERNAL
AnalyticDiscontinuous = 3,
InterpolatedContinuous = 4,
#endif
};

class SDFGrid
Expand Down Expand Up @@ -56,7 +44,6 @@ DefineList PathTracer::StaticParams::getDefines(const PathTracer& owner) const
defines.add("USE_MIS", useMIS ? "1" : "0");
defines.add("USE_RUSSIAN_ROULETTE", useRussianRoulette ? "1" : "0");
defines.add("USE_SCREEN_SPACE_RESTIR", useScreenSpaceReSTIR ? "1" : "0");
defines.add("USE_NEURAL_RADIANCE_CACHE", useNRC ? "1" : "0");
defines.add("USE_ALPHA_TEST", useAlphaTest ? "1" : "0");
defines.add("USE_LIGHTS_IN_DIELECTRIC_VOLUMES", useLightsInDielectricVolumes ? "1" : "0");
defines.add("LIMIT_TRANSMISSION", limitTransmission ? "1" : "0");
Expand All @@ -74,22 +61,15 @@ DefineList PathTracer::StaticParams::getDefines(const PathTracer& owner) const
defines.add("USE_NRD_DEMODULATION", useNRDDemodulation ? "1" : "0");

// Scheduling configuration.
defines.add("USE_SPECULAR_QUEUE", useSpecularQueue ? "1" : "0");
defines.add("PATH_REGENERATION_COUNT_MAIN", std::to_string(usePathRegeneration ? pathRegenerationCountMain : 32u));
defines.add("PATH_REGENERATION_COUNT_SPECULAR", std::to_string(usePathRegeneration ? pathRegenerationCountSpecular : 32u));
defines.add("PATH_REGENERATION_COUNT_DELTA_REFLECTION", std::to_string(usePathRegeneration ? pathRegenerationCountDeltaReflection : 32u));
defines.add("PATH_REGENERATION_COUNT_DELTA_TRANSMISSION", std::to_string(usePathRegeneration ? pathRegenerationCountDeltaTransmission : 32u));
defines.add("USE_SER", useSER ? "1" : "0");
defines.add("USE_REORDER_TRACE_RAY_FAST_PATH", useReorderTraceRayFastPath ? "1" : "0");
defines.add("USE_TRACE_RAY_VISIBILITY", useTraceRayVisibility ? "1" : "0");

defines.add("USE_ENV_LIGHT", "1");
defines.add("USE_ANALYTIC_LIGHTS", "0");
defines.add("USE_EMISSIVE_LIGHTS", "1");
defines.add("USE_GRID_VOLUMES", "0");
defines.add("USE_CURVES", "0");
defines.add("USE_SDF_GRIDS", "0");
defines.add("USE_HAIR_MATERIAL", "1");
defines.add("USE_RTXDI", "0");

defines.add("_ACTUAL_MAX_TRIANGLES_PER_NODE", "10");
defines.add("_DISABLE_NODE_FLUX", "0");
Expand All @@ -106,10 +86,7 @@ DefineList PathTracer::StaticParams::getDefines(const PathTracer& owner) const
defines.add("MATERIAL_SYSTEM_UDIM_INDIRECTION_ENABLED", "0");
defines.add("MATERIAL_SYSTEM_HAS_SPEC_GLOSS_MATERIALS", "0");
defines.add("FALCOR_MATERIAL_INSTANCE_SIZE", std::to_string(128));
defines.add("FALCOR_INTERNAL", std::to_string(FALCOR_INTERNAL));
defines.add("FALCOR_ENABLE_TIN", std::to_string(0));
defines.add("FALCOR_NVAPI_AVAILABLE", std::to_string(0));
defines.add("FALCOR_ENABLE_NV_COOP_VECTOR", std::to_string(0));

defines.add("SAMPLE_GENERATOR_TYPE", std::to_string(0));
defines.add("SAMPLES_PER_PIXEL", std::to_string(1));
Expand All @@ -132,22 +109,10 @@ DefineList PathTracer::StaticParams::getDefines(const PathTracer& owner) const
defines.add("SCENE_SDF_NO_VOXEL_SOLVER", std::to_string((uint32_t)SDFGridIntersectionMethod::GridSphereTracing));
defines.add("SCENE_SDF_VOXEL_SPHERE_TRACING", std::to_string((uint32_t)SDFGridIntersectionMethod::VoxelSphereTracing));

#ifdef FALCOR_INTERNAL
defines.add("SCENE_SDF_VOXEL_OPTIMIZED_SPHERE_TRACING", std::to_string((uint32_t)SDFGridIntersectionMethod::VoxelOptimizedSphereTracing));
defines.add("SCENE_SDF_VOXEL_CUBIC_SOLVER_ANALYTIC", std::to_string((uint32_t)SDFGridIntersectionMethod::VoxelCubicAnalytic));
defines.add("SCENE_SDF_VOXEL_CUBIC_SOLVER_NUMERIC_MARMITT", std::to_string((uint32_t)SDFGridIntersectionMethod::VoxelCubicNumericMarmitt));
defines.add("SCENE_SDF_VOXEL_CUBIC_SOLVER_NUMERIC_NEWTON_RAPHSON", std::to_string((uint32_t)SDFGridIntersectionMethod::VoxelCubicNumericNewtonRaphson));
#endif

defines.add("SCENE_SDF_NO_GRADIENT_EVALUATION_METHOD", std::to_string((uint32_t)SDFGridGradientEvaluationMethod::None));
defines.add("SCENE_SDF_GRADIENT_NUMERIC_DISCONTINUOUS", std::to_string((uint32_t)SDFGridGradientEvaluationMethod::NumericDiscontinuous));
defines.add("SCENE_SDF_GRADIENT_NUMERIC_CONTINUOUS", std::to_string((uint32_t)SDFGridGradientEvaluationMethod::NumericContinuous));

#ifdef FALCOR_INTERNAL
defines.add("SCENE_SDF_GRADIENT_ANALYTIC_DISCONTINUOUS", std::to_string((uint32_t)SDFGridGradientEvaluationMethod::AnalyticDiscontinuous));
defines.add("SCENE_SDF_GRADIENT_INTERPOLATED_CONTINUOUS", std::to_string((uint32_t)SDFGridGradientEvaluationMethod::InterpolatedContinuous));
#endif

// Setup dynamic defines based on current configuration.
defines.add("SCENE_SDF_GRID_COUNT", std::to_string(0));
defines.add("SCENE_SDF_GRID_MAX_LOD_COUNT", std::to_string(0));
Expand All @@ -167,13 +132,6 @@ DefineList PathTracer::StaticParams::getDefines(const PathTracer& owner) const
defines.add("GRID_VOLUME_SAMPLER_USE_BRICKEDGRID", std::to_string((uint32_t)1));
defines.add("GRID_VOLUME_SAMPLER_TRANSMITTANCE_ESTIMATOR", std::to_string((uint32_t)2));
defines.add("GRID_VOLUME_SAMPLER_DISTANCE_SAMPLER", std::to_string((uint32_t)1));
#ifdef FALCOR_INTERNAL
defines.add("GRID_VOLUME_SAMPLER_RAY_MARCHING_ROULETTE_THRESHOLD", std::to_string(0.03f));
defines.add("GRID_VOLUME_SAMPLER_BIASED_RAY_MARCHING_LOOKUP_MULTIPLIER", std::to_string(0.5f));
defines.add("GRID_VOLUME_SAMPLER_BIASED_RAY_MARCHING_LOCAL_CDF_STEP_SIZE", std::to_string(1.0f));
defines.add("GRID_VOLUME_SAMPLER_UNBIASED_RAY_MARCHING_LOOKUP_MULTIPLIER", std::to_string(1.0f));
defines.add("GRID_VOLUME_SAMPLER_UNBIASED_RAY_MARCHING_MAX_ORDER", std::to_string(12));
#endif

defines.add("HIT_INFO_DEFINES", "1");
defines.add("HIT_INFO_USE_COMPRESSION", "0");
Expand All @@ -191,9 +149,5 @@ DefineList PathTracer::StaticParams::getDefines(const PathTracer& owner) const
defines.add("OUTPUT_DEBUG", "0");
defines.add("ENABLE_STATS", "0");

// Stochastic texture filtering specialization
defines.add("USE_STOCHASTIC_BICUBIC_FILTERING", useStochasticBicubicFiltering ? "1" : "0");
defines.add("USE_SPATIO_TEMP_BLUE_NOISE", useSpatioTemporalBlueNoise ? "1" : "0");

return defines;
}
49 changes: 0 additions & 49 deletions source/shaders/Internal/MDL/MDLMaterialData.slang
View file
Open in desktop

This file was deleted.

Loading
Loading