Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-18 04:53:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build.

Browse Source
This commit is contained in:
Бранимир Караџић
2020-06-17 23:17:47 -07:00
parent 77c974b69f
commit 4f0ff97ec7
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/glcontext_eagl.mm
View File

@@ -102,7 +102,7 @@ namespace bgfx { namespace gl
GL_CHECK(glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilRbo) );
GLenum err = glCheckFramebufferStatus(GL_FRAMEBUFFER);
BX_CHECK(GL_FRAMEBUFFER_COMPLETE == err, "glCheckFramebufferStatus failed 0x%08x", err);
BX_ASSERT(GL_FRAMEBUFFER_COMPLETE == err, "glCheckFramebufferStatus failed 0x%08x", err);
BX_UNUSED(err);
makeCurrent();
@@ -162,7 +162,7 @@ namespace bgfx { namespace gl
void GlContext::create(uint32_t _width, uint32_t _height)
{
s_opengles = bx::dlopen("/System/Library/Frameworks/OpenGLES.framework/OpenGLES");
BX_CHECK(NULL != s_opengles, "OpenGLES dynamic library is not found!");
BX_ASSERT(NULL != s_opengles, "OpenGLES dynamic library is not found!");
BX_UNUSED(_width, _height);
CAEAGLLayer* layer = (__bridge CAEAGLLayer*)g_platformData.nwh;
@@ -185,7 +185,7 @@ namespace bgfx { namespace gl
context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
}
}
BX_CHECK(NULL != context, "No valid OpenGLES context.");
BX_ASSERT(NULL != context, "No valid OpenGLES context.");
m_context = (__bridge void*)context;
[EAGLContext setCurrentContext:context];
@@ -212,7 +212,7 @@ namespace bgfx { namespace gl
GL_CHECK(glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilRbo) );
GL_CHECK(glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilRbo) );
BX_CHECK(GL_FRAMEBUFFER_COMPLETE == glCheckFramebufferStatus(GL_FRAMEBUFFER)
BX_ASSERT(GL_FRAMEBUFFER_COMPLETE == glCheckFramebufferStatus(GL_FRAMEBUFFER)
, "glCheckFramebufferStatus failed 0x%08x"
, glCheckFramebufferStatus(GL_FRAMEBUFFER)
);
@@ -298,7 +298,7 @@ namespace bgfx { namespace gl
GL_CHECK(glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilRbo) );
GL_CHECK(glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, m_depthStencilRbo) );
BX_CHECK(GL_FRAMEBUFFER_COMPLETE == glCheckFramebufferStatus(GL_FRAMEBUFFER)
BX_ASSERT(GL_FRAMEBUFFER_COMPLETE == glCheckFramebufferStatus(GL_FRAMEBUFFER)
, "glCheckFramebufferStatus failed 0x%08x"
, glCheckFramebufferStatus(GL_FRAMEBUFFER)
);

2
src/glcontext_nsgl.mm
View File

@@ -64,7 +64,7 @@ namespace bgfx { namespace gl
BX_UNUSED(_width, _height);
s_opengl = bx::dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL");
BX_CHECK(NULL != s_opengl, "OpenGL dynamic library is not found!");
BX_ASSERT(NULL != s_opengl, "OpenGL dynamic library is not found!");
const AutoreleasePoolHolder pool;
NSObject* nwh = (NSObject*)g_platformData.nwh;

14
src/renderer_mtl.mm
View File

@@ -345,7 +345,7 @@ namespace bgfx { namespace mtl
break;
};
BX_CHECK(false, "Unrecognized Mtl Data type 0x%04x.", _type);
BX_ASSERT(false, "Unrecognized Mtl Data type 0x%04x.", _type);
return UniformType::End;
}
@@ -855,7 +855,7 @@ namespace bgfx { namespace mtl
m_cmd.kick(false, true);
m_commandBuffer = m_cmd.alloc();
BX_CHECK(_mip<texture.m_numMips,"Invalid mip: %d num mips:",_mip,texture.m_numMips);
BX_ASSERT(_mip<texture.m_numMips,"Invalid mip: %d num mips:",_mip,texture.m_numMips);
uint32_t srcWidth = bx::uint32_max(1, texture.m_ptr.width() >> _mip);
uint32_t srcHeight = bx::uint32_max(1, texture.m_ptr.height() >> _mip);
@@ -1075,7 +1075,7 @@ namespace bgfx { namespace mtl
break;
default:
BX_CHECK(false, "Invalid handle type?! %d", _handle.type);
BX_ASSERT(false, "Invalid handle type?! %d", _handle.type);
break;
}
}
@@ -1807,8 +1807,8 @@ namespace bgfx { namespace mtl
if (arg.type == MTLArgumentTypeBuffer
&& 0 == bx::strCmp(utf8String(arg.name), SHADER_UNIFORM_NAME) )
{
BX_CHECK( arg.index == 0, "Uniform buffer must be in the buffer slot 0.");
BX_CHECK( MTLDataTypeStruct == arg.bufferDataType, "%s's type must be a struct",SHADER_UNIFORM_NAME );
BX_ASSERT( arg.index == 0, "Uniform buffer must be in the buffer slot 0.");
BX_ASSERT( MTLDataTypeStruct == arg.bufferDataType, "%s's type must be a struct",SHADER_UNIFORM_NAME );
if (MTLDataTypeStruct == arg.bufferDataType)
{
@@ -2120,7 +2120,7 @@ namespace bgfx { namespace mtl
bool normalized;
bool asInt;
layout.decode(attr, num, type, normalized, asInt);
BX_CHECK(num <= 4, "num must be <= 4");
BX_ASSERT(num <= 4, "num must be <= 4");
if (UINT16_MAX != layout.m_attributes[attr])
{
@@ -2507,7 +2507,7 @@ namespace bgfx { namespace mtl
void ProgramMtl::create(const ShaderMtl* _vsh, const ShaderMtl* _fsh)
{
BX_CHECK(NULL != _vsh->m_function.m_obj, "Vertex shader doesn't exist.");
BX_ASSERT(NULL != _vsh->m_function.m_obj, "Vertex shader doesn't exist.");
m_vsh = _vsh;
m_fsh = _fsh;