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

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić 2017-07-17 22:14:34 -07:00
parent f76d3bd33e
commit a247d29298
2 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/common/entry/entry_osx.mm
View File

@ -290,7 +290,7 @@ namespace entry
case NSLeftMouseUp: case NSLeftMouseUp:
m_eventQueue.postMouseEvent(s_defaultWindow, m_mx, m_my, m_scroll, MouseButton::Left, false); m_eventQueue.postMouseEvent(s_defaultWindow, m_mx, m_my, m_scroll, MouseButton::Left, false);
m_eventQueue.postMouseEvent(s_defaultWindow, m_mx, m_my, m_scroll, MouseButton::Middle, false); // TODO: remove! m_eventQueue.postMouseEvent(s_defaultWindow, m_mx, m_my, m_scroll, MouseButton::Middle, false);
break; break;
case NSRightMouseDown: case NSRightMouseDown:

58
src/renderer_gl.cpp
View File

@ -2448,12 +2448,12 @@ namespace bgfx { namespace gl
{ {
GL_CHECK(glDebugMessageCallback(debugProcCb, NULL) ); GL_CHECK(glDebugMessageCallback(debugProcCb, NULL) );
GL_CHECK(glDebugMessageControl(GL_DONT_CARE GL_CHECK(glDebugMessageControl(GL_DONT_CARE
, GL_DONT_CARE , GL_DONT_CARE
, GL_DEBUG_SEVERITY_MEDIUM , GL_DEBUG_SEVERITY_MEDIUM
, 0 , 0
, NULL , NULL
, GL_TRUE , GL_TRUE
) ); ) );
} }
} }
@ -4680,21 +4680,21 @@ namespace bgfx { namespace gl
&& !normalized) && !normalized)
{ {
GL_CHECK(glVertexAttribIPointer(loc GL_CHECK(glVertexAttribIPointer(loc
, num , num
, s_attribType[type] , s_attribType[type]
, _vertexDecl.m_stride , _vertexDecl.m_stride
, (void*)(uintptr_t)baseVertex) , (void*)(uintptr_t)baseVertex)
); );
} }
else else
{ {
GL_CHECK(glVertexAttribPointer(loc GL_CHECK(glVertexAttribPointer(loc
, num , num
, s_attribType[type] , s_attribType[type]
, normalized , normalized
, _vertexDecl.m_stride , _vertexDecl.m_stride
, (void*)(uintptr_t)baseVertex) , (void*)(uintptr_t)baseVertex)
); );
} }
m_unboundUsedAttrib[ii] = Attrib::Count; m_unboundUsedAttrib[ii] = Attrib::Count;
@ -4800,21 +4800,21 @@ namespace bgfx { namespace gl
if (_target == GL_TEXTURE_3D) if (_target == GL_TEXTURE_3D)
{ {
GL_CHECK(glTexStorage3D(_target GL_CHECK(glTexStorage3D(_target
, _numMips , _numMips
, internalFmt , internalFmt
, m_width , m_width
, m_height , m_height
, _depth , _depth
) ); ) );
} }
else else
{ {
GL_CHECK(glTexStorage2D(_target GL_CHECK(glTexStorage2D(_target
, _numMips , _numMips
, internalFmt , internalFmt
, m_width , m_width
, m_height , m_height
) ); ) );
} }
} }
@ -7161,7 +7161,6 @@ namespace bgfx { namespace gl
{ {
const IndexBufferGL& buffer = m_indexBuffers[bind.m_idx]; const IndexBufferGL& buffer = m_indexBuffers[bind.m_idx];
GL_CHECK(glBindBufferBase(GL_SHADER_STORAGE_BUFFER, stage, buffer.m_id) ); GL_CHECK(glBindBufferBase(GL_SHADER_STORAGE_BUFFER, stage, buffer.m_id) );
// TODO: barriers?
} }
break; break;
@ -7169,7 +7168,6 @@ namespace bgfx { namespace gl
{ {
const VertexBufferGL& buffer = m_vertexBuffers[bind.m_idx]; const VertexBufferGL& buffer = m_vertexBuffers[bind.m_idx];
GL_CHECK(glBindBufferBase(GL_SHADER_STORAGE_BUFFER, stage, buffer.m_id) ); GL_CHECK(glBindBufferBase(GL_SHADER_STORAGE_BUFFER, stage, buffer.m_id) );
// TODO: barriers?
} }
break; break;
} }