From 26532b94d95f61204bfb221b0fd2d3f618e71ee6 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Wed, 4 Jan 2023 14:00:25 +0000 Subject: [PATCH 1/5] remove full paths --- CMakeUserPresets.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeUserPresets.json b/CMakeUserPresets.json index 3def49bb5..38465a7e9 100644 --- a/CMakeUserPresets.json +++ b/CMakeUserPresets.json @@ -15,8 +15,8 @@ "CMAKE_POLICY_DEFAULT_CMP0091": "NEW", "CMAKE_BUILD_TYPE": "Debug" }, - "toolchainFile": "/home/bam4d/qmul/Griddly/build/conan_toolchain.cmake", - "binaryDir": "/home/bam4d/qmul/Griddly/build" + "toolchainFile": "build/conan_toolchain.cmake", + "binaryDir": "build" }, { "name": "Debug WASM", @@ -28,8 +28,8 @@ "CMAKE_BUILD_TYPE": "Debug", "WASM": "ON" }, - "toolchainFile": "/home/bam4d/qmul/Griddly/build_wasm/conan_toolchain.cmake", - "binaryDir": "/home/bam4d/qmul/Griddly/build_wasm" + "toolchainFile": "build_wasm/conan_toolchain.cmake", + "binaryDir": "build_wasm" } ], "buildPresets": [ From 8fd2bf1ded6df5136eecf41f634ab6ad65341e96 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Wed, 4 Jan 2023 14:33:44 +0000 Subject: [PATCH 2/5] fixing shader compilation --- CMakeLists.txt | 3 +++ deps/conanfile.txt | 1 + 2 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1ace72cf..636c848d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,8 +149,11 @@ if(NOT WASM) # ShaderC for compiling shaders find_package(shaderc REQUIRED) + endif() +include(${CMAKE_BINARY_DIR}/conan_paths.cmake) + include(${CMAKE_CONFIG_FOLDER}/targets/griddly.cmake) if(WASM) diff --git a/deps/conanfile.txt b/deps/conanfile.txt index 84a0212bb..8d4821078 100644 --- a/deps/conanfile.txt +++ b/deps/conanfile.txt @@ -14,5 +14,6 @@ tools.cmake.cmaketoolchain:generator=Ninja [generators] CMakeToolchain CMakeDeps +cmake_paths From 3627012b0f6b04b8ab04907ee195091de3b52ae8 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Wed, 4 Jan 2023 15:19:08 +0000 Subject: [PATCH 3/5] shaders are broken again in latest version, fixing them --- CMakeLists.txt | 15 +++++++++++---- CMakeUserPresets.json | 6 ++++-- compile_shaders.sh | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 636c848d2..99413ac06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,6 +128,9 @@ find_package(yaml-cpp REQUIRED) find_package(spdlog REQUIRED) if(NOT WASM) + + include(${CMAKE_BINARY_DIR}/conan_paths.cmake) + # find the dependencies from conan set(PYBIND11_FINDPYTHON FALSE) @@ -152,8 +155,6 @@ if(NOT WASM) endif() -include(${CMAKE_BINARY_DIR}/conan_paths.cmake) - include(${CMAKE_CONFIG_FOLDER}/targets/griddly.cmake) if(WASM) @@ -166,9 +167,15 @@ else() set(ENV{GLSLC_BIN} ${CONAN_SHADERC_ROOT}/bin/glslc) if(MSVC) - execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/compile_shaders.bat RESULT_VARIABLE rv) + execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/compile_shaders.bat RESULT_VARIABLE STATUS) + if(STATUS AND NOT STATUS EQUAL 0) + message( FATAL_ERROR "Cannot compile shaders: ${STATUS}") + endif() else() - execute_process(COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/compile_shaders.sh RESULT_VARIABLE rv) + execute_process(COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/compile_shaders.sh RESULT_VARIABLE STATUS) + if(STATUS AND NOT STATUS EQUAL 0) + message( FATAL_ERROR "Cannot compile shaders: ${STATUS}") + endif() endif() if(ENABLE_PYTHON_BINDINGS) diff --git a/CMakeUserPresets.json b/CMakeUserPresets.json index 38465a7e9..6baf625c0 100644 --- a/CMakeUserPresets.json +++ b/CMakeUserPresets.json @@ -35,11 +35,13 @@ "buildPresets": [ { "name": "Debug WASM", - "configurePreset": "Debug WASM" + "configurePreset": "Debug WASM", + "configuration": "Debug" }, { "name": "Debug Native", - "configurePreset": "Debug Native" + "configurePreset": "Debug Native", + "configuration": "Debug" } ] } \ No newline at end of file diff --git a/compile_shaders.sh b/compile_shaders.sh index 8123853e3..67225c0cb 100755 --- a/compile_shaders.sh +++ b/compile_shaders.sh @@ -1,5 +1,5 @@ #!/bin/bash - +set -e cd "$(dirname "$0")" compile_shaders_in_dir () { From 65be3ffaf7e7bf5b54b32f8318d2567787998de6 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Wed, 4 Jan 2023 15:29:03 +0000 Subject: [PATCH 4/5] updating readme --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index b2e000f41..40fc9c8ba 100644 --- a/README.md +++ b/README.md @@ -235,6 +235,15 @@ You will need to set up a python environment of your choice and then install con pip install conan ``` +### Debug Layers for Vulkan + +When compiling using Debug, you will need the install vulkan validation layers which are part of the [vulkan sdk](https://vulkan.lunarg.com/). +Otherwise you will run into errors like: +``` +[2023-01-04 15:21:54.412] [warning] Required vulkan layer unavailable: VK_LAYER_KHRONOS_validation +[2023-01-04 15:21:54.412] [error] Missing vulkan extensions in driver. Please upgrade your vulkan drivers. +``` + ### Ubuntu ``` From 1c978f36adf4c9fb1da30b7332305df2f22aac14 Mon Sep 17 00:00:00 2001 From: Bam4d Date: Wed, 4 Jan 2023 16:03:15 +0000 Subject: [PATCH 5/5] bumping version numbers --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- CMakeLists.txt | 2 +- bindings/python.cpp | 2 +- docs/conf.py | 2 +- js/griddlyjs-app/package-lock.json | 2 +- js/griddlyjs-app/package.json | 2 +- python/setup.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index f6e3f4f10..8202016af 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,7 +24,7 @@ If applicable, add screenshots to help explain your problem. **Desktop (please complete the following information):** - OS: [e.g. mac/linux/windows] - - Version [e.g. 1.6.5] + - Version [e.g. 1.6.6] **Additional context** Add any other context about the problem here. diff --git a/CMakeLists.txt b/CMakeLists.txt index 99413ac06..3b6308f60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.18.0) set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") -project(Griddly VERSION 1.6.5) +project(Griddly VERSION 1.6.6) string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) diff --git a/bindings/python.cpp b/bindings/python.cpp index 76617d025..d12195c94 100644 --- a/bindings/python.cpp +++ b/bindings/python.cpp @@ -12,7 +12,7 @@ namespace griddly { PYBIND11_MODULE(python_griddly, m) { m.doc() = "Griddly python bindings"; - m.attr("version") = "1.6.5"; + m.attr("version") = "1.6.6"; #ifndef NDEBUG spdlog::set_level(spdlog::level::debug); diff --git a/docs/conf.py b/docs/conf.py index 2a1825be9..200086089 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,7 +22,7 @@ author = 'Chris Bamford' # The full version, including alpha/beta/rc tags -release = '1.6.5' +release = '1.6.6' # -- General configuration --------------------------------------------------- diff --git a/js/griddlyjs-app/package-lock.json b/js/griddlyjs-app/package-lock.json index 8efe9507d..4fe8b48aa 100644 --- a/js/griddlyjs-app/package-lock.json +++ b/js/griddlyjs-app/package-lock.json @@ -1,6 +1,6 @@ { "name": "griddlyjs-app", - "version": "1.6.5", + "version": "1.6.6", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/js/griddlyjs-app/package.json b/js/griddlyjs-app/package.json index 82d0eb323..cd25d4dbb 100644 --- a/js/griddlyjs-app/package.json +++ b/js/griddlyjs-app/package.json @@ -1,6 +1,6 @@ { "name": "griddlyjs-app", - "version": "1.6.5", + "version": "1.6.6", "private": true, "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.1.1", diff --git a/python/setup.py b/python/setup.py index cbc8e60b7..a7c0e0b6e 100644 --- a/python/setup.py +++ b/python/setup.py @@ -71,7 +71,7 @@ def griddly_package_data(config='Debug'): setup( name='griddly', - version="1.6.5", + version="1.6.6", author_email="chrisbam4d@gmail.com", description="Griddly Python Libraries", long_description=long_description,