AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-12-16 00:17:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Metal platform fixes

Browse Source
This commit is contained in:
Jack Andersen
2016-07-31 10:25:02 -10:00
parent 0ee5944387
commit 2ec943f0b2
5 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/graphicsdev/Metal.mm
View File

@@ -621,10 +621,6 @@ struct MetalShaderDataBinding : IShaderDataBinding
}
for (size_t i=0 ; i<texCount ; ++i)
{
#ifndef NDEBUG
if (!texs[i])
Log.report(logvisor::Fatal, "null texture %d provided to newShaderDataBinding", int(i));
#endif
m_texs[i] = texs[i];
}
}
@@ -653,7 +649,8 @@ struct MetalShaderDataBinding : IShaderDataBinding
[enc setVertexBuffer:GetBufferGPUResource(m_ubufs[i], b) offset:0 atIndex:i+2];
}
for (size_t i=0 ; i<m_texCount ; ++i)
[enc setFragmentTexture:GetTextureGPUResource(m_texs[i], b) atIndex:i];
if (m_texs[i])
[enc setFragmentTexture:GetTextureGPUResource(m_texs[i], b) atIndex:i];
}
};

6
lib/mac/CocoaCommon.hpp
View File

@@ -6,10 +6,7 @@
#error ARC Required
#endif
#include <Availability.h>
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
#define BOO_HAS_METAL 1
#if BOO_HAS_METAL
#include <Metal/Metal.h>
#include <QuartzCore/CAMetalLayer.h>
@@ -35,7 +32,6 @@ struct MetalContext
}
#else
#define BOO_HAS_METAL 0
namespace boo
{
struct MetalContext {};