From 5aa92bcf6229e0eff37e98d5725e0a27771bebb6 Mon Sep 17 00:00:00 2001 From: Sergen Eren Date: Thu, 2 May 2019 18:50:10 +0300 Subject: [PATCH] remove debug of 3d cuda textures Former-commit-id: 5926bc46e57d245699143b13c221e1e5c8ea0847 --- source/main.cpp | 5 +---- source/render_kernel.cu | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source/main.cpp b/source/main.cpp index fa9a0cf..06fd663 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -197,9 +197,6 @@ static void init_gvdb() fprintf(stderr, "Could not determine CUDA device for GVDB context\n."); exit(EXIT_FAILURE); } - cudaDeviceProp prop; - cudaGetDeviceProperties(&prop, cuda_devices[0]); - printf("\nMax 3d texture dimensions x:%d y:%d z:%d\n", prop.maxTexture3D[0], prop.maxTexture3D[1], prop.maxTexture3D[2]); gvdb.SetCudaDevice(cuda_devices[0]); gvdb.Initialize(); @@ -871,7 +868,7 @@ int main(const int argc, const char* argv[]) gvdb.AddPath(ASSET_PATH); char scnpath[1024]; - if (!gvdb.FindFile("wdas_cloud_half_filled.vdb", scnpath)) { + if (!gvdb.FindFile("wdas_cloud_quarter_filled.vdb", scnpath)) { printf("Cannot find vdb file.\n"); exit(-1); } diff --git a/source/render_kernel.cu b/source/render_kernel.cu index 8510d3d..5e3b1f0 100644 --- a/source/render_kernel.cu +++ b/source/render_kernel.cu @@ -1006,7 +1006,7 @@ extern "C" __global__ void volume_rt_kernel( if (kernel_params.iteration < kernel_params.max_interactions && kernel_params.render) { - value = direct_integrator(rand_state, scn.campos, ray_dir, kernel_params, gvdb); + value = vol_integrator(rand_state, scn.campos, ray_dir, kernel_params, gvdb); }