From 281901ba4ef1498ff84143275b50086f3b771e60 Mon Sep 17 00:00:00 2001 From: Andre Taulien Date: Thu, 24 Nov 2016 19:52:53 +0100 Subject: [PATCH] Fixed an update to bgfx breaking the build --- lib/bgfx-cmake | 2 +- src/content/Texture.cpp | 2 +- src/engine/Platform.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bgfx-cmake b/lib/bgfx-cmake index 907e1dbb..7c29120c 160000 --- a/lib/bgfx-cmake +++ b/lib/bgfx-cmake @@ -1 +1 @@ -Subproject commit 907e1dbbc976c1f07e5d53b753935c45cb2891e3 +Subproject commit 7c29120c10d62b81661f3a051f66924e23f94aa0 diff --git a/src/content/Texture.cpp b/src/content/Texture.cpp index d9854b1f..d4e3c8ce 100755 --- a/src/content/Texture.cpp +++ b/src/content/Texture.cpp @@ -76,7 +76,7 @@ Handle::TextureHandle TextureAllocator::loadTextureRGBA8(const std::vectordata, data.data(), data.size()); - bgfx::TextureHandle bth = bgfx::createTexture2D(width, height, false, 1, bgfx::TextureFormat::RGBA8, BGFX_TEXTURE_NONE, mem); + bgfx::TextureHandle bth = bgfx::createTexture2D(width, height, 1, bgfx::TextureFormat::RGBA8, BGFX_TEXTURE_NONE, mem); // Free imange //stbi_image_free(out); diff --git a/src/engine/Platform.cpp b/src/engine/Platform.cpp index 25a8a5a2..16ba1077 100644 --- a/src/engine/Platform.cpp +++ b/src/engine/Platform.cpp @@ -50,7 +50,7 @@ void Platform::windowSizeEvent(int width, int height) int32_t Platform::run(int argc, char** argv) { - + return 0; } void Platform::mainLoop(std::promise&& returnValue, int argc, char** argv)