Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 20:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Бранимир Караџић
2020-06-20 14:29:25 -07:00
parent 54e4b60055
commit d5d3d29e9c
2 changed files with 5 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/renderer_gl.cpp
View File

@@ -6448,22 +6448,14 @@ namespace bgfx { namespace gl
if (0 == compiled)
{
LineReader lineReader(code);
bx::Error err;
for (int32_t line = 1; err.isOk(); ++line)
bx::LineReader lineReader(code);
for (int32_t line = 1; !lineReader.isDone(); ++line)
{
char str[4096];
int32_t len = bx::read(&lineReader, str, BX_COUNTOF(str)-1, &err);
bx::StringView str = lineReader.next();
if (err.isOk() )
if (!lineReader.isDone() )
{
str[len] = '\0';
bx::StringView eol = bx::strFindEol(str);
if (eol.getPtr() != str)
{
*const_cast<char*>(eol.getPtr() ) = '\0';
}
BX_TRACE("%3d %s", line, str);
BX_TRACE("%3d %.*s", line, str.getLength(), str.getPtr() );
}
}

46
src/renderer_gl.h
View File

@@ -1671,52 +1671,6 @@ namespace bgfx { namespace gl
bx::RingBufferControl m_control;
};
class LineReader : public bx::ReaderI
{
public:
LineReader(const void* _str)
: m_str( (const char*)_str)
, m_pos(0)
, m_size(bx::strLen( (const char*)_str) )
{
}
LineReader(const bx::StringView& _str)
: m_str(_str.getPtr() )
, m_pos(0)
, m_size(_str.getLength() )
{
}
virtual int32_t read(void* _data, int32_t _size, bx::Error* _err) override
{
if (m_str[m_pos] == '\0'
|| m_pos == m_size)
{
BX_ERROR_SET(_err, BX_ERROR_READERWRITER_EOF, "LineReader: EOF.");
return 0;
}
uint32_t pos = m_pos;
const char* str = &m_str[pos];
const char* nl = bx::strFindNl(str).getPtr();
pos += (uint32_t)(nl - str);
const char* eol = &m_str[pos];
uint32_t size = bx::uint32_min(uint32_t(eol - str), _size);
bx::memCopy(_data, str, size);
m_pos += size;
return size;
}
const char* m_str;
uint32_t m_pos;
uint32_t m_size;
};
} /* namespace gl */ } // namespace bgfx
#endif // BGFX_RENDERER_GL_H_HEADER_GUARD