mitchellhansen/voxel-raycaster
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Leaving it compiling at least, CL seems to have broken at some point on my thinkpad

Browse Source
This commit is contained in:
mitchell hansen
2018-02-17 02:08:48 -08:00
parent 51be54c964
commit d6bdcbdeca
5 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/CLCaster.cpp
View File

@@ -723,11 +723,11 @@ bool CLCaster::compile_kernel(std::string kernel_source, bool is_path, std::stri
std::stringstream build_string_stream;
// walk the settings index's and add them to the defines
for (auto i: settings_index_map){
build_string_stream << " -D" << i.first << "=" << std::to_string(i.second);
for (auto const& define : defines_map){
build_string_stream << " -D" << define.first << "=" << define.second;
}
build_string_stream << "-DOCTDIM=" << std::to_string(Application::MAP_X);
//build_string_stream << "-DOCTDIM=" << std::to_string(Application::MAP_X);
build_string_stream << " -cl-finite-math-only -cl-fast-relaxed-math -cl-unsafe-math-optimizations";
std::string build_string = build_string_stream.str();
@@ -745,8 +745,8 @@ bool CLCaster::compile_kernel(std::string kernel_source, bool is_path, std::stri
// Grab the log
clGetProgramBuildInfo(program, device_id, CL_PROGRAM_BUILD_LOG, log_size, log, NULL);
Logger::log("Failed at clBuildProgram() : " + cl_err_lookup(error), Logger::LogLevel::ERROR, __LINE__, __FILE__);
Logger::log(log, Logger::LogLevel::ERROR, __LINE__, __FILE__);
Logger::log("Failed at clBuildProgram() with " + cl_err_lookup(error), Logger::LogLevel::ERROR, __LINE__, __FILE__);
Logger::log("CL_ERROR -->" + std::string(log), Logger::LogLevel::ERROR, __LINE__, __FILE__);
return false;
}
@@ -1177,6 +1177,14 @@ std::string CLCaster::cl_err_lookup(int error_code) {
}
void CLCaster::setDefine(std::string name, std::string value) {
defines_map[name] = value;
}
void CLCaster::removeDefine(std::string name) {
defines_map.erase(name);
}
CLCaster::device::device(cl_device_id device_id, cl_platform_id platform_id) {