mirror of
https://github.com/bkaradzic/bgfx.git
synced 2026-02-18 04:53:06 +01:00
Merge branch 'master' of github.com:bkaradzic/bgfx
This commit is contained in:
@@ -4883,9 +4883,9 @@ namespace bgfx { namespace gl
|
||||
{
|
||||
switch (target)
|
||||
{
|
||||
case GL_TEXTURE_CUBE_MAP: target = GL_TEXTURE_CUBE_MAP_ARRAY;
|
||||
case GL_TEXTURE_2D_MULTISAMPLE: target = GL_TEXTURE_2D_MULTISAMPLE_ARRAY;
|
||||
default: target = GL_TEXTURE_2D_ARRAY;
|
||||
case GL_TEXTURE_CUBE_MAP: target = GL_TEXTURE_CUBE_MAP_ARRAY; break;
|
||||
case GL_TEXTURE_2D_MULTISAMPLE: target = GL_TEXTURE_2D_MULTISAMPLE_ARRAY; break;
|
||||
default: target = GL_TEXTURE_2D_ARRAY; break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4262,7 +4262,7 @@ BX_UNUSED(currentSamplerStateIdx);
|
||||
restoreScissor = false;
|
||||
VkRect2D rc;
|
||||
rc.offset.x = viewScissorRect.m_x;
|
||||
rc.offset.x = viewScissorRect.m_y;
|
||||
rc.offset.y = viewScissorRect.m_y;
|
||||
rc.extent.width = viewScissorRect.m_x + viewScissorRect.m_width;
|
||||
rc.extent.height = viewScissorRect.m_y + viewScissorRect.m_height;
|
||||
vkCmdSetScissor(m_commandBuffer, 0, 1, &rc);
|
||||
@@ -4280,7 +4280,7 @@ BX_UNUSED(currentSamplerStateIdx);
|
||||
|
||||
VkRect2D rc;
|
||||
rc.offset.x = scissorRect.m_x;
|
||||
rc.offset.x = scissorRect.m_y;
|
||||
rc.offset.y = scissorRect.m_y;
|
||||
rc.extent.width = scissorRect.m_x + scissorRect.m_width;
|
||||
rc.extent.height = scissorRect.m_y + scissorRect.m_height;
|
||||
vkCmdSetScissor(m_commandBuffer, 0, 1, &rc);
|
||||
|
||||
Reference in New Issue
Block a user