Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/backend/dcmcore/defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,19 @@ inline int16_t byteswap<std::int16_t>(std::int16_t value)
template <>
inline uint32_t byteswap<uint32_t>(uint32_t value)
{
return std::uint32_t(byteswap<uint16_t>(value) << 16) | byteswap<uint16_t>(value >> 16);
return std::uint32_t(byteswap<uint16_t>(value & 0xFFFF) << 16) | byteswap<uint16_t>(value >> 16);
}

template <>
inline int32_t byteswap<int32_t>(int32_t value)
{
return std::int32_t(byteswap<int16_t>(value) << 16) | byteswap<int16_t>(value >> 16);
return std::int32_t(byteswap<int16_t>(value & 0xFFFF) << 16) | byteswap<int16_t>(value >> 16);
}

template <>
inline uint64_t byteswap<uint64_t>(uint64_t value)
{
return std::uint64_t((unsigned long long)byteswap<uint32_t>(value) << 32LL) | byteswap<uint32_t>(value >> 32LL);
return std::uint64_t((unsigned long long)byteswap<uint32_t>(value & 0xFFFFFFFFULL) << 32LL) | byteswap<uint32_t>(value >> 32LL);
}

template <typename T>
Expand Down
39 changes: 37 additions & 2 deletions src/core/renderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,45 @@ void Renderer::generateInitialBuffers() {
glCompileShader(GaussianFragmentShader);

GLint success;
char infoLog[1024];

// Check PCDVertexShader compilation
glGetShaderiv(PCDVertexShader, GL_COMPILE_STATUS, &success);
if (!success) {
char infoLog[1024];
glGetShaderInfoLog(PCDVertexShader, sizeof(infoLog), nullptr, infoLog);
std::cerr << "ERROR::SHADER_COMPILATION_ERROR of type: "
std::cerr << "ERROR::SHADER_COMPILATION_ERROR PCDVertexShader: "
<< "\n" << infoLog << "\n";
}

// Check PCDFragmentShader compilation
glGetShaderiv(PCDFragmentShader, GL_COMPILE_STATUS, &success);
if (!success) {
glGetShaderInfoLog(PCDFragmentShader, sizeof(infoLog), nullptr, infoLog);
std::cerr << "ERROR::SHADER_COMPILATION_ERROR PCDFragmentShader: "
<< "\n" << infoLog << "\n";
}

// Check veryRealComputeShader compilation
glGetShaderiv(veryRealComputeShader, GL_COMPILE_STATUS, &success);
if (!success) {
glGetShaderInfoLog(veryRealComputeShader, sizeof(infoLog), nullptr, infoLog);
std::cerr << "ERROR::SHADER_COMPILATION_ERROR veryRealComputeShader: "
<< "\n" << infoLog << "\n";
}

// Check GaussianVertexShader compilation
glGetShaderiv(GaussianVertexShader, GL_COMPILE_STATUS, &success);
if (!success) {
glGetShaderInfoLog(GaussianVertexShader, sizeof(infoLog), nullptr, infoLog);
std::cerr << "ERROR::SHADER_COMPILATION_ERROR GaussianVertexShader: "
<< "\n" << infoLog << "\n";
}

// Check GaussianFragmentShader compilation
glGetShaderiv(GaussianFragmentShader, GL_COMPILE_STATUS, &success);
if (!success) {
glGetShaderInfoLog(GaussianFragmentShader, sizeof(infoLog), nullptr, infoLog);
std::cerr << "ERROR::SHADER_COMPILATION_ERROR GaussianFragmentShader: "
<< "\n" << infoLog << "\n";
}

Expand All @@ -111,6 +145,7 @@ void Renderer::generateInitialBuffers() {
glDeleteShader(PCDFragmentShader);
glDeleteShader(veryRealComputeShader);
glDeleteShader(GaussianVertexShader);
glDeleteShader(GaussianFragmentShader);

}

Expand Down
8 changes: 5 additions & 3 deletions src/cuda/render_utils.cu
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void RenderUtils::sort_gaussians_gpu(
cub::DeviceRadixSort::SortPairs(
nullptr, _this::temp_storage_size, keys_in, keys_out, val_in, val_out, num
);
cudaMalloc(&_this::temp_storage, _this::temp_storage_size);
CHECK_CUDA(cudaMalloc(&_this::temp_storage, _this::temp_storage_size), true)
newScene = false;

std::cout << "New scene, needed storage of: " << _this::temp_storage_size << " bytes"
Expand All @@ -45,6 +45,8 @@ void RenderUtils::sort_gaussians_gpu(
void RenderUtils::cleanUp() {
using _this = RenderUtils;

cudaFree(_this::temp_storage);
_this::temp_storage = nullptr;
if (_this::temp_storage != nullptr) {
cudaFree(_this::temp_storage);
_this::temp_storage = nullptr;
}
}