scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 18:45:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Metal: Fixed build.

Browse source
This commit is contained in:
Branimir Karadžić 2015-11-01 19:51:14 -08:00
parent cda2261c6e
commit 0faf6f53c1
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/renderer_mtl.h
View file

@ -674,7 +674,7 @@ namespace bgfx { namespace mtl
MTL_RELEASE(m_ptrStencil); MTL_RELEASE(m_ptrStencil);
} }
void update(uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem); void update(uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem);
void commit(uint8_t _stage, uint32_t _flags = BGFX_SAMPLER_DEFAULT_FLAGS); void commit(uint8_t _stage, uint32_t _flags = BGFX_TEXTURE_INTERNAL_DEFAULT_SAMPLER);
Texture m_ptr; Texture m_ptr;
Texture m_ptrStencil; // for emulating packed depth/stencil formats - only for iOS8... Texture m_ptrStencil; // for emulating packed depth/stencil formats - only for iOS8...

34
src/renderer_mtl.mm
View file

@ -908,7 +908,7 @@ namespace bgfx { namespace mtl
|| m_resolution.m_flags != _resolution.m_flags) || m_resolution.m_flags != _resolution.m_flags)
{ {
m_resolution = _resolution; m_resolution = _resolution;
m_resolution.m_flags &= ~BGFX_RESET_FORCE; m_resolution.m_flags &= ~BGFX_RESET_INTERNAL_FORCE;
m_textureDescriptor.textureType = MTLTextureType2D; m_textureDescriptor.textureType = MTLTextureType2D;
@ -2034,7 +2034,7 @@ namespace bgfx { namespace mtl
{ {
//TODO: vertex or fragment stage? //TODO: vertex or fragment stage?
s_renderMtl->m_renderCommandEncoder.setFragmentTexture(m_ptr, _stage); s_renderMtl->m_renderCommandEncoder.setFragmentTexture(m_ptr, _stage);
s_renderMtl->m_renderCommandEncoder.setFragmentSamplerState(0 == (BGFX_SAMPLER_DEFAULT_FLAGS & _flags) s_renderMtl->m_renderCommandEncoder.setFragmentSamplerState(0 == (BGFX_TEXTURE_INTERNAL_DEFAULT_SAMPLER & _flags)
? s_renderMtl->getSamplerState(_flags) ? s_renderMtl->getSamplerState(_flags)
: m_sampler, _stage); : m_sampler, _stage);
} }
@ -2146,8 +2146,8 @@ namespace bgfx { namespace mtl
RenderDraw currentState; RenderDraw currentState;
currentState.clear(); currentState.clear();
currentState.m_flags = BGFX_STATE_NONE; currentState.m_stateFlags = BGFX_STATE_NONE;
currentState.m_stencil = packStencil(BGFX_STENCIL_NONE, BGFX_STENCIL_NONE); currentState.m_stencil = packStencil(BGFX_STENCIL_NONE, BGFX_STENCIL_NONE);
_render->m_hmdInitialized = false; _render->m_hmdInitialized = false;
@ -2370,9 +2370,9 @@ namespace bgfx { namespace mtl
const RenderDraw& draw = renderItem.draw; const RenderDraw& draw = renderItem.draw;
const uint64_t newFlags = draw.m_flags; const uint64_t newFlags = draw.m_stateFlags;
uint64_t changedFlags = currentState.m_flags ^ draw.m_flags; uint64_t changedFlags = currentState.m_stateFlags ^ draw.m_stateFlags;
currentState.m_flags = newFlags; currentState.m_stateFlags = newFlags;
const uint64_t newStencil = draw.m_stencil; const uint64_t newStencil = draw.m_stencil;
uint64_t changedStencil = currentState.m_stencil ^ draw.m_stencil; uint64_t changedStencil = currentState.m_stencil ^ draw.m_stencil;
@ -2384,8 +2384,8 @@ namespace bgfx { namespace mtl
currentState.m_scissor = !draw.m_scissor; currentState.m_scissor = !draw.m_scissor;
changedFlags = BGFX_STATE_MASK; changedFlags = BGFX_STATE_MASK;
changedStencil = packStencil(BGFX_STENCIL_MASK, BGFX_STENCIL_MASK); changedStencil = packStencil(BGFX_STENCIL_MASK, BGFX_STENCIL_MASK);
currentState.m_flags = newFlags; currentState.m_stateFlags = newFlags;
currentState.m_stencil = newStencil; currentState.m_stencil = newStencil;
programIdx = invalidHandle; programIdx = invalidHandle;
setDepthStencilState(newFlags, packStencil(BGFX_STENCIL_DEFAULT, BGFX_STENCIL_DEFAULT)); setDepthStencilState(newFlags, packStencil(BGFX_STENCIL_DEFAULT, BGFX_STENCIL_DEFAULT));
@ -2574,13 +2574,13 @@ namespace bgfx { namespace mtl
const Binding& sampler = draw.m_bind[stage]; const Binding& sampler = draw.m_bind[stage];
Binding& current = currentState.m_bind[stage]; Binding& current = currentState.m_bind[stage];
if (current.m_idx != sampler.m_idx if (current.m_idx != sampler.m_idx
|| current.m_un.m_draw.m_flags != sampler.m_un.m_draw.m_flags || current.m_un.m_draw.m_textureFlags != sampler.m_un.m_draw.m_textureFlags
|| programChanged) || programChanged)
{ {
if (invalidHandle != sampler.m_idx) if (invalidHandle != sampler.m_idx)
{ {
TextureMtl& texture = m_textures[sampler.m_idx]; TextureMtl& texture = m_textures[sampler.m_idx];
texture.commit(stage, sampler.m_un.m_draw.m_flags); texture.commit(stage, sampler.m_un.m_draw.m_textureFlags);
} }
} }
@ -2589,13 +2589,13 @@ namespace bgfx { namespace mtl
} }
if (currentState.m_vertexBuffer.idx != draw.m_vertexBuffer.idx if (currentState.m_vertexBuffer.idx != draw.m_vertexBuffer.idx
|| currentState.m_startVertex != draw.m_startVertex || currentState.m_startVertex != draw.m_startVertex
|| currentState.m_instanceDataBuffer.idx != draw.m_instanceDataBuffer.idx || currentState.m_instanceDataBuffer.idx != draw.m_instanceDataBuffer.idx
|| currentState.m_instanceDataOffset != draw.m_instanceDataOffset || currentState.m_instanceDataOffset != draw.m_instanceDataOffset
) )
{ {
currentState.m_vertexBuffer = draw.m_vertexBuffer; currentState.m_vertexBuffer = draw.m_vertexBuffer;
currentState.m_startVertex = draw.m_startVertex; currentState.m_startVertex = draw.m_startVertex;
currentState.m_instanceDataBuffer.idx = draw.m_instanceDataBuffer.idx; currentState.m_instanceDataBuffer.idx = draw.m_instanceDataBuffer.idx;
currentState.m_instanceDataOffset = draw.m_instanceDataOffset; currentState.m_instanceDataOffset = draw.m_instanceDataOffset;