AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Windows PCH fixes

This commit is contained in:
Jack Andersen 2017-12-29 15:07:15 -10:00
parent aae0dc56b7
commit 9daa74e08e
7 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/athena vendored

@ -1 +1 @@
Subproject commit 017a921fdc0207590df519093fc06362ab04d457 Subproject commit f414abe5a5d359a77add09061fe1ad5e4413ee32

2
hecl/extern/boo vendored

@ -1 +1 @@
Subproject commit fa8989bed30bd5022c4951ae46adc4de50a261f1 Subproject commit 2ada7130d37ef699be48ceaa043407889f8218ea

18
hecl/lib/Backend/GLSL.cpp
View File

@ -5,7 +5,7 @@
#include <boo/graphicsdev/GL.hpp> #include <boo/graphicsdev/GL.hpp>
#include <boo/graphicsdev/Vulkan.hpp> #include <boo/graphicsdev/Vulkan.hpp>
static logvisor::Module GLSL_Log("hecl::Backend::GLSL"); static logvisor::Module Log("hecl::Backend::GLSL");
namespace hecl::Backend namespace hecl::Backend
{ {
@ -406,7 +406,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
cachedSz += fragSource.size() + 1; cachedSz += fragSource.size() + 1;
if (m_backend.m_texMapEnd > 8) if (m_backend.m_texMapEnd > 8)
GLSL_Log.report(logvisor::Fatal, "maximum of 8 texture maps supported"); Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
objOut = objOut =
static_cast<boo::GLDataFactory::Context&>(ctx). static_cast<boo::GLDataFactory::Context&>(ctx).
@ -419,7 +419,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
tag.getDepthWrite(), true, false, tag.getDepthWrite(), true, false,
tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None); tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None);
if (!objOut) if (!objOut)
GLSL_Log.report(logvisor::Fatal, "unable to build shader"); Log.report(logvisor::Fatal, "unable to build shader");
ShaderCachedData dataOut(tag, cachedSz); ShaderCachedData dataOut(tag, cachedSz);
athena::io::MemoryWriter w(dataOut.m_data.get(), dataOut.m_sz); athena::io::MemoryWriter w(dataOut.m_data.get(), dataOut.m_sz);
@ -447,7 +447,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
return nullptr; return nullptr;
if (texMapEnd > 8) if (texMapEnd > 8)
GLSL_Log.report(logvisor::Fatal, "maximum of 8 texture maps supported"); Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
auto ret = auto ret =
static_cast<boo::GLDataFactory::Context&>(ctx). static_cast<boo::GLDataFactory::Context&>(ctx).
@ -459,7 +459,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
tag.getDepthWrite(), true, false, tag.getDepthWrite(), true, false,
tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None); tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None);
if (!ret) if (!ret)
GLSL_Log.report(logvisor::Fatal, "unable to build shader"); Log.report(logvisor::Fatal, "unable to build shader");
return ret; return ret;
} }
@ -474,7 +474,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
size_t cachedSz = 3; size_t cachedSz = 3;
if (m_backend.m_texMapEnd > 8) if (m_backend.m_texMapEnd > 8)
GLSL_Log.report(logvisor::Fatal, "maximum of 8 texture maps supported"); Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
std::vector<std::pair<std::string, std::string>> sources; std::vector<std::pair<std::string, std::string>> sources;
sources.reserve(extensionSlots.size()); sources.reserve(extensionSlots.size());
@ -530,7 +530,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
(tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None) : (tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None) :
boo::CullMode(slot.cullMode)); boo::CullMode(slot.cullMode));
if (!ret) if (!ret)
GLSL_Log.report(logvisor::Fatal, "unable to build shader"); Log.report(logvisor::Fatal, "unable to build shader");
returnFunc(ret); returnFunc(ret);
} }
@ -563,7 +563,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
return false; return false;
if (texMapEnd > 8) if (texMapEnd > 8)
GLSL_Log.report(logvisor::Fatal, "maximum of 8 texture maps supported"); Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
for (const ShaderCacheExtensions::ExtensionSlot& slot : extensionSlots) for (const ShaderCacheExtensions::ExtensionSlot& slot : extensionSlots)
{ {
@ -613,7 +613,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
(tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None) : (tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None) :
boo::CullMode(slot.cullMode)); boo::CullMode(slot.cullMode));
if (!ret) if (!ret)
GLSL_Log.report(logvisor::Fatal, "unable to build shader"); Log.report(logvisor::Fatal, "unable to build shader");
returnFunc(ret); returnFunc(ret);
} }

3
hecl/lib/Backend/HLSL.cpp
View File

@ -347,7 +347,8 @@ std::string HLSL::makeFrag(bool alphaTest, ReflectionType reflectionType,
} }
} }
namespace Runtime
namespace hecl::Runtime
{ {
struct HLSLBackendFactory : IShaderBackendFactory struct HLSLBackendFactory : IShaderBackendFactory

3
hecl/lib/Blender/Connection.cpp
View File

@ -22,6 +22,9 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#undef min
#undef max
namespace std namespace std
{ {
template <> struct hash<std::pair<uint32_t,uint32_t>> template <> struct hash<std::pair<uint32_t,uint32_t>>

3
hecl/lib/Blender/HMDL.cpp
View File

@ -2,6 +2,9 @@
#include <cmath> #include <cmath>
#include <cfloat> #include <cfloat>
#undef min
#undef max
namespace hecl::blender namespace hecl::blender
{ {

3
hecl/lib/Runtime/ShaderCacheManager.cpp
View File

@ -8,6 +8,9 @@
#include "hecl/Backend/GLSL.hpp" #include "hecl/Backend/GLSL.hpp"
#include "hecl/Backend/Metal.hpp" #include "hecl/Backend/Metal.hpp"
#undef min
#undef max
namespace hecl::Runtime namespace hecl::Runtime
{ {
#if BOO_HAS_GL #if BOO_HAS_GL