From afc351746d7e7ba7d14450031b581f792fd2ca37 Mon Sep 17 00:00:00 2001 From: Florian Ziesche Date: Sat, 30 Jul 2016 18:22:28 +0200 Subject: [PATCH] * version bump to v0.2.2-f1, going for release * disabled spir-v param workaround by default, always using byval actually seems to work (+amd has more problems when this is enabled ...) --- floor/build_version | 2 +- floor/build_version.hpp | 2 +- floor/floor.cpp | 2 +- floor/floor_version.hpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/floor/build_version b/floor/build_version index 32a1cfdb..4a6d39c9 100644 --- a/floor/build_version +++ b/floor/build_version @@ -1 +1 @@ -7112 +7113 diff --git a/floor/build_version.hpp b/floor/build_version.hpp index ddb9e8c2..92fe50ab 100644 --- a/floor/build_version.hpp +++ b/floor/build_version.hpp @@ -1 +1 @@ -#define FLOOR_BUILD_VERSION 7112 +#define FLOOR_BUILD_VERSION 7113 diff --git a/floor/floor.cpp b/floor/floor.cpp index b8eab56e..2837283c 100644 --- a/floor/floor.cpp +++ b/floor/floor.cpp @@ -276,7 +276,7 @@ void floor::init(const char* callpath_, const char* datapath_, config.opencl_validate_spirv = config_doc.get("compute.opencl.validate_spirv", false); config.opencl_force_spirv_check = config_doc.get("compute.opencl.force_spirv", false); config.opencl_disable_spirv = config_doc.get("compute.opencl.disable_spirv", false); - config.opencl_spirv_param_workaround = config_doc.get("compute.opencl.spirv_param_workaround", true); + config.opencl_spirv_param_workaround = config_doc.get("compute.opencl.spirv_param_workaround", false); extract_whitelist(config.opencl_whitelist, "compute.opencl.whitelist"); config.opencl_compiler = config_doc.get("compute.opencl.compiler", config.default_compiler); config.opencl_llc = config_doc.get("compute.opencl.llc", config.default_llc); diff --git a/floor/floor_version.hpp b/floor/floor_version.hpp index a9b4f258..ceab31ae 100644 --- a/floor/floor_version.hpp +++ b/floor/floor_version.hpp @@ -30,8 +30,8 @@ #define FLOOR_MAJOR_VERSION 0 #define FLOOR_MINOR_VERSION 2 #define FLOOR_REVISION_VERSION 2 -#define FLOOR_DEV_STAGE_VERSION 0xb3 -#define FLOOR_DEV_STAGE_VERSION_STR "b3" +#define FLOOR_DEV_STAGE_VERSION 0xf1 +#define FLOOR_DEV_STAGE_VERSION_STR "f1" // FLOOR_BUILD_VERSION defined in build_version.hpp #define FLOOR_MAJOR_VERSION_STR FLOOR_VERSION_EVAL(FLOOR_MAJOR_VERSION)