mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OSX: Added weak framework for linking Metal.

Browse Source
This commit is contained in:
Branimir Karadžić 2015-12-23 14:26:20 -08:00
parent b5f3cc34f7
commit caf305ceb1
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/bgfx.lua
View File

@ -83,9 +83,9 @@ function bgfxProject(_name, _kind, _defines)
configuration { "osx" } configuration { "osx" }
linkoptions { linkoptions {
"-framework Cocoa", "-framework Cocoa",
"-framework Metal",
"-framework QuartzCore", "-framework QuartzCore",
"-framework OpenGL", "-framework OpenGL",
"-weak_framework Metal",
} }
configuration { "not nacl" } configuration { "not nacl" }

4
scripts/genie.lua
View File

@ -326,9 +326,9 @@ function exampleProject(_name)
configuration { "osx" } configuration { "osx" }
linkoptions { linkoptions {
"-framework Cocoa", "-framework Cocoa",
"-framework Metal",
"-framework QuartzCore", "-framework QuartzCore",
"-framework OpenGL", "-framework OpenGL",
"-weak_framework Metal",
} }
configuration { "ios* or tvos*" } configuration { "ios* or tvos*" }
@ -336,10 +336,10 @@ function exampleProject(_name)
linkoptions { linkoptions {
"-framework CoreFoundation", "-framework CoreFoundation",
"-framework Foundation", "-framework Foundation",
"-framework Metal",
"-framework OpenGLES", "-framework OpenGLES",
"-framework UIKit", "-framework UIKit",
"-framework QuartzCore", "-framework QuartzCore",
"-weak_framework Metal",
} }
configuration { "xcode4", "ios" } configuration { "xcode4", "ios" }

4
src/renderer_mtl.mm
View File

@ -329,10 +329,10 @@ namespace bgfx { namespace mtl
: m_metalLayer(NULL) : m_metalLayer(NULL)
, m_backBufferPixelFormatHash(0) , m_backBufferPixelFormatHash(0)
, m_maxAnisotropy(1) , m_maxAnisotropy(1)
, m_uniformBufferIndex(0)
, m_numWindows(1) , m_numWindows(1)
, m_rtMsaa(false) , m_rtMsaa(false)
, m_drawable(NULL) , m_drawable(NULL)
, m_uniformBufferIndex(0)
{ {
} }
@ -1231,7 +1231,7 @@ namespace bgfx { namespace mtl
OcclusionQueryMTL m_occlusionQuery; OcclusionQueryMTL m_occlusionQuery;
Buffer m_uniformBuffer; Buffer m_uniformBuffer;
Buffer m_uniformBuffers[UNIFORM_BUFFER_COUNT]; Buffer m_uniformBuffers[UNIFORM_BUFFER_COUNT];
uint32_t m_uniformBufferVertexOffset; uint32_t m_uniformBufferVertexOffset;
uint32_t m_uniformBufferFragmentOffset; uint32_t m_uniformBufferFragmentOffset;