From 8bf39efcd89cd8ecf8e06a3dcbe9d364aea47722 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Fri, 27 Nov 2015 18:08:28 -1000 Subject: [PATCH] Update boo --- hecl/extern/libBoo | 2 +- hecl/include/HECL/Runtime.hpp | 4 ++-- hecl/lib/Backend/Metal.cpp | 2 +- hecl/test/main.cpp | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hecl/extern/libBoo b/hecl/extern/libBoo index 0b6f3cac3..c0b93f39d 160000 --- a/hecl/extern/libBoo +++ b/hecl/extern/libBoo @@ -1 +1 @@ -Subproject commit 0b6f3cac3467ddd125d03d335001d29c2e28cb7c +Subproject commit c0b93f39d833d3d0e8a9eb5188b96d1f04b307e7 diff --git a/hecl/include/HECL/Runtime.hpp b/hecl/include/HECL/Runtime.hpp index ab6bb0d9f..cdfc95d43 100644 --- a/hecl/include/HECL/Runtime.hpp +++ b/hecl/include/HECL/Runtime.hpp @@ -153,7 +153,7 @@ class IShaderBackendFactory { friend class ShaderCacheManager; protected: - boo::ITextureR* m_rtHint = nullptr; + unsigned m_rtHint = 1; using FReturnExtensionShader = std::function; virtual ShaderCachedData buildShaderFromIR(const ShaderTag& tag, const HECL::Frontend::IR& ir, @@ -212,7 +212,7 @@ public: /* Some platforms (like Metal) require information about the render target * for encoding the pipeline state. This must be called before building shaders */ - void setRenderTargetHint(boo::ITextureR* tex) {m_factory->m_rtHint = tex;} + void setRenderTargetSamples(unsigned samps) {m_factory->m_rtHint = samps;} boo::IShaderPipeline* buildShader(const ShaderTag& tag, const std::string& source, const std::string& diagName); diff --git a/hecl/lib/Backend/Metal.cpp b/hecl/lib/Backend/Metal.cpp index da36b88cb..ba7662f4f 100644 --- a/hecl/lib/Backend/Metal.cpp +++ b/hecl/lib/Backend/Metal.cpp @@ -118,7 +118,7 @@ std::string Metal::makeVert(unsigned col, unsigned uv, unsigned w, GenerateVertInStruct(col, uv, w) + "\n" + GenerateVertToFragStruct() + "\n" + GenerateVertUniformStruct(s, tm) + - "\nvertex VertToFrag vmain(VertData v [[ stage_in ]], constant HECLVertUniform& vu [[ buffer(1) ]])\n{\n" + "\nvertex VertToFrag vmain(VertData v [[ stage_in ]], constant HECLVertUniform& vu [[ buffer(2) ]])\n{\n" " VertToFrag vtf;\n"; if (s) diff --git a/hecl/test/main.cpp b/hecl/test/main.cpp index 43a7c50d0..bd5352278 100644 --- a/hecl/test/main.cpp +++ b/hecl/test/main.cpp @@ -80,7 +80,6 @@ struct HECLApplicationCallback : boo::IApplicationCallback /* HECL managers */ HECL::Runtime::FileStoreManager fileMgr(app->getUniqueName()); HECL::Runtime::ShaderCacheManager shaderMgr(fileMgr, gfxF); - shaderMgr.setRenderTargetHint(renderTex); /* Compile HECL shader */ static std::string testShader = "HECLOpaque(Texture(0, UV(0)))";