Cleanup.
This commit is contained in:
Родитель
2f4c1980e2
Коммит
6cda5f1740
14
src/bgfx.cpp
14
src/bgfx.cpp
|
@ -542,10 +542,10 @@ namespace bgfx
|
|||
.add(Attrib::TexCoord0, 2, AttribType::Float)
|
||||
.end();
|
||||
|
||||
uint16_t width = 2048;
|
||||
uint16_t width = 2048;
|
||||
uint16_t height = 24;
|
||||
uint8_t bpp = 1;
|
||||
uint32_t pitch = width*bpp;
|
||||
uint8_t bpp = 1;
|
||||
uint32_t pitch = width*bpp;
|
||||
|
||||
const Memory* mem;
|
||||
|
||||
|
@ -1730,7 +1730,7 @@ namespace bgfx
|
|||
#if BX_PLATFORM_OSX || BX_PLATFORM_IOS
|
||||
{ mtl::rendererCreate, mtl::rendererDestroy, BGFX_RENDERER_METAL_NAME, !!BGFX_CONFIG_RENDERER_METAL }, // Metal
|
||||
#else
|
||||
{ noop::rendererCreate, noop::rendererDestroy, BGFX_RENDERER_NOOP_NAME, !!BGFX_CONFIG_RENDERER_NOOP }, // Noop
|
||||
{ noop::rendererCreate, noop::rendererDestroy, BGFX_RENDERER_NOOP_NAME, false }, // Noop
|
||||
#endif // BX_PLATFORM_OSX || BX_PLATFORM_IOS
|
||||
{ gl::rendererCreate, gl::rendererDestroy, BGFX_RENDERER_OPENGL_NAME, !!BGFX_CONFIG_RENDERER_OPENGLES }, // OpenGLES
|
||||
{ gl::rendererCreate, gl::rendererDestroy, BGFX_RENDERER_OPENGL_NAME, !!BGFX_CONFIG_RENDERER_OPENGL }, // OpenGL
|
||||
|
@ -1837,6 +1837,10 @@ namespace bgfx
|
|||
{
|
||||
score += RendererType::OpenGLES == renderer ? 20 : 0;
|
||||
}
|
||||
else if (BX_ENABLED(BX_PLATFORM_PS4) )
|
||||
{
|
||||
score += RendererType::Gnm == renderer ? 20 : 0;
|
||||
}
|
||||
else if (BX_ENABLED(0
|
||||
|| BX_PLATFORM_XBOXONE
|
||||
|| BX_PLATFORM_WINRT
|
||||
|
@ -3159,7 +3163,7 @@ error:
|
|||
{
|
||||
BGFX_CHECK_MAIN_THREAD();
|
||||
BX_CHECK(NULL != _mem, "_mem can't be NULL");
|
||||
if (_width == 0
|
||||
if (_width == 0
|
||||
|| _height == 0)
|
||||
{
|
||||
release(_mem);
|
||||
|
|
19
src/bgfx_p.h
19
src/bgfx_p.h
|
@ -402,13 +402,13 @@ namespace bgfx
|
|||
|
||||
void resize(bool _small = false, uint32_t _width = BGFX_DEFAULT_WIDTH, uint32_t _height = BGFX_DEFAULT_HEIGHT)
|
||||
{
|
||||
uint32_t width = bx::uint32_max(1, _width/8);
|
||||
uint32_t height = bx::uint32_max(1, _height/(_small ? 8 : 16) );
|
||||
uint32_t width = bx::uint32_imax(1, _width/8);
|
||||
uint32_t height = bx::uint32_imax(1, _height/(_small ? 8 : 16) );
|
||||
|
||||
if (NULL == m_mem
|
||||
|| m_width != width
|
||||
|| m_width != width
|
||||
|| m_height != height
|
||||
|| m_small != _small)
|
||||
|| m_small != _small)
|
||||
{
|
||||
m_small = _small;
|
||||
m_width = (uint16_t)width;
|
||||
|
@ -2187,9 +2187,14 @@ namespace bgfx
|
|||
|
||||
BGFX_API_FUNC(void reset(uint32_t _width, uint32_t _height, uint32_t _flags) )
|
||||
{
|
||||
BX_WARN(0 != _width && 0 != _height, "Frame buffer resolution width or height cannot be 0 (width %d, height %d).", _width, _height);
|
||||
m_resolution.m_width = bx::uint32_max(1, _width);
|
||||
m_resolution.m_height = bx::uint32_max(1, _height);
|
||||
BX_WARN(1 <= int32_t(_width)
|
||||
&& 1 <= int32_t(_height)
|
||||
, "Frame buffer resolution width or height cannot be 0 (width %d, height %d)."
|
||||
, _width
|
||||
, _height
|
||||
);
|
||||
m_resolution.m_width = bx::uint32_imax(1, _width);
|
||||
m_resolution.m_height = bx::uint32_imax(1, _height);
|
||||
m_resolution.m_flags = 0
|
||||
| _flags
|
||||
| (g_platformDataChangedSinceReset ? BGFX_RESET_INTERNAL_FORCE : 0)
|
||||
|
|
Загрузка…
Ссылка в новой задаче