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

Replaced use of dynamic StringT with FixedStringT.

Browse Source
This commit is contained in:
Branimir Karadžić
2025-09-19 20:38:15 -07:00
parent 9ab1cde267
commit 5eeed00aaa
3 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/common/entry/entry.cpp
View File

@@ -34,9 +34,7 @@ namespace entry
extern bx::AllocatorI* getDefaultAllocator();
bx::AllocatorI* g_allocator = getDefaultAllocator();
typedef bx::StringT<&g_allocator> String;
static String s_currentDir;
static bx::FilePath s_currentDir;
class FileReader : public bx::FileReader
{
@@ -45,9 +43,9 @@ namespace entry
public:
virtual bool open(const bx::FilePath& _filePath, bx::Error* _err) override
{
String filePath(s_currentDir);
filePath.append(_filePath);
return super::open(filePath.getPtr(), _err);
bx::FilePath filePath(s_currentDir);
filePath.join(_filePath);
return super::open(filePath.getCPtr(), _err);
}
};
@@ -58,9 +56,9 @@ namespace entry
public:
virtual bool open(const bx::FilePath& _filePath, bool _append, bx::Error* _err) override
{
String filePath(s_currentDir);
filePath.append(_filePath);
return super::open(filePath.getPtr(), _append, _err);
bx::FilePath filePath(s_currentDir);
filePath.join(_filePath);
return super::open(filePath.getCPtr(), _append, _err);
}
};

8
src/bgfx.cpp
View File

@@ -1811,12 +1811,12 @@ namespace bgfx
const char* getName(UniformHandle _handle)
{
return s_ctx->m_uniformRef[_handle.idx].m_name.getPtr();
return s_ctx->m_uniformRef[_handle.idx].m_name.getCPtr();
}
const char* getName(ShaderHandle _handle)
{
return s_ctx->m_shaderRef[_handle.idx].m_name.getPtr();
return s_ctx->m_shaderRef[_handle.idx].m_name.getCPtr();
}
static const char* s_topologyName[] =
@@ -2168,7 +2168,7 @@ namespace bgfx
BX_TRACE("\t%3d: %4d %s" \
, ii \
, idx \
, ref.m_name.getPtr() \
, ref.m_name.getCPtr() \
); \
} \
} \
@@ -2190,7 +2190,7 @@ namespace bgfx
BX_TRACE("\t%3d: %4d %s (count %d)" \
, ii \
, idx \
, ref.m_name.getPtr() \
, ref.m_name.getCPtr() \
, ref.m_refCount \
); \
} \

16
src/bgfx_p.h
View File

@@ -567,8 +567,6 @@ namespace bgfx
extern bx::AllocatorI* g_allocator;
extern Caps g_caps;
typedef bx::StringT<&g_allocator> String;
struct ProfilerScope
{
ProfilerScope(const char* _name, uint32_t _abgr, const char* _filePath, uint16_t _line)
@@ -1877,14 +1875,14 @@ namespace bgfx
struct IndexBuffer
{
String m_name;
bx::FixedString64 m_name;
uint32_t m_size;
uint16_t m_flags;
};
struct VertexBuffer
{
String m_name;
bx::FixedString64 m_name;
uint32_t m_size;
uint16_t m_stride;
};
@@ -1934,7 +1932,7 @@ namespace bgfx
struct ShaderRef
{
UniformHandle* m_uniforms;
String m_name;
bx::FixedString64 m_name;
uint32_t m_hashIn;
uint32_t m_hashOut;
uint16_t m_num;
@@ -1950,7 +1948,7 @@ namespace bgfx
struct UniformRef
{
String m_name;
bx::FixedString64 m_name;
UniformType::Enum m_type;
uint16_t m_num;
int16_t m_refCount;
@@ -2015,7 +2013,7 @@ namespace bgfx
return 0 < m_depth;
}
String m_name;
bx::FixedString64 m_name;
void* m_ptr;
uint64_t m_flags;
uint32_t m_storageSize;
@@ -2035,7 +2033,7 @@ namespace bgfx
struct FrameBufferRef
{
String m_name;
bx::FixedString64 m_name;
uint16_t m_width;
uint16_t m_height;
@@ -4976,7 +4974,7 @@ namespace bgfx
BGFX_CHECK_HANDLE("getUniformInfo", m_uniformHandle, _handle);
UniformRef& uniform = m_uniformRef[_handle.idx];
bx::strCopy(_info.name, sizeof(_info.name), uniform.m_name.getPtr() );
bx::strCopy(_info.name, sizeof(_info.name), uniform.m_name);
_info.type = uniform.m_type;
_info.num = uniform.m_num;
}