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

Added bx::Location, and removed allocator macros.

Browse Source
This commit is contained in:
Branimir Karadžić
2023-04-23 19:19:22 -07:00
parent 277b5f4ada
commit 290295136b
42 changed files with 314 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/renderer_webgpu.cpp
View File

@@ -1023,11 +1023,11 @@ namespace bgfx { namespace webgpu
{
if (NULL != m_uniforms[_handle.idx])
{
BX_FREE(g_allocator, m_uniforms[_handle.idx]);
bx::free(g_allocator, m_uniforms[_handle.idx]);
}
uint32_t size = bx::alignUp(g_uniformTypeSize[_type]*_num, 16);
void* data = BX_ALLOC(g_allocator, size);
void* data = bx::alloc(g_allocator, size);
bx::memSet(data, 0, size);
m_uniforms[_handle.idx] = data;
m_uniformReg.add(_handle, _name);
@@ -1035,7 +1035,7 @@ namespace bgfx { namespace webgpu
void destroyUniform(UniformHandle _handle) override
{
BX_FREE(g_allocator, m_uniforms[_handle.idx]);
bx::free(g_allocator, m_uniforms[_handle.idx]);
m_uniforms[_handle.idx] = NULL;
m_uniformReg.remove(_handle);
}
@@ -2459,7 +2459,7 @@ namespace bgfx { namespace webgpu
s_renderWgpu = BX_NEW(g_allocator, RendererContextWgpu);
if (!s_renderWgpu->init(_init) )
{
BX_DELETE(g_allocator, s_renderWgpu);
bx::deleteObject(g_allocator, s_renderWgpu);
s_renderWgpu = NULL;
}
return s_renderWgpu;
@@ -2468,7 +2468,7 @@ namespace bgfx { namespace webgpu
void rendererDestroy()
{
s_renderWgpu->shutdown();
BX_DELETE(g_allocator, s_renderWgpu);
bx::deleteObject(g_allocator, s_renderWgpu);
s_renderWgpu = NULL;
}
@@ -2717,7 +2717,7 @@ namespace bgfx { namespace webgpu
const uint32_t* code = (const uint32_t*)reader.getDataPtr();
bx::skip(&reader, shaderSize+1);
m_code = (uint32_t*)BX_ALLOC(g_allocator, shaderSize);
m_code = (uint32_t*)bx::alloc(g_allocator, shaderSize);
m_codeSize = shaderSize;
bx::memCopy(m_code, code, shaderSize);
@@ -2938,7 +2938,7 @@ namespace bgfx { namespace webgpu
m_fsh = NULL;
if ( NULL != m_computePS )
{
BX_DELETE(g_allocator, m_computePS);
bx::deleteObject(g_allocator, m_computePS);
m_computePS = NULL;
}
}
@@ -2981,7 +2981,7 @@ namespace bgfx { namespace webgpu
{
if ( m_dynamic == NULL )
{
m_dynamic = (uint8_t*)BX_ALLOC(g_allocator, m_size);
m_dynamic = (uint8_t*)bx::alloc(g_allocator, m_size);
}
bx::memCopy(m_dynamic + _offset, _data, _size);
@@ -3202,7 +3202,7 @@ namespace bgfx { namespace webgpu
uint8_t layer;
};
ImageInfo* imageInfos = (ImageInfo*)BX_ALLOC(g_allocator, sizeof(ImageInfo) * numSrd);
ImageInfo* imageInfos = (ImageInfo*)bx::alloc(g_allocator, sizeof(ImageInfo) * numSrd);
bx::memSet(imageInfos, 0, sizeof(ImageInfo) * numSrd);
uint32_t alignment = 1; // tightly aligned buffer
@@ -3221,7 +3221,7 @@ namespace bgfx { namespace webgpu
const uint32_t slice = bx::strideAlign(bx::max<uint32_t>(mip.m_height, 4) * pitch, alignment);
const uint32_t size = slice * mip.m_depth;
uint8_t* temp = (uint8_t*)BX_ALLOC(g_allocator, size);
uint8_t* temp = (uint8_t*)bx::alloc(g_allocator, size);
bimg::imageDecodeToBgra8(
g_allocator
, temp
@@ -3248,7 +3248,7 @@ namespace bgfx { namespace webgpu
const uint32_t slice = bx::strideAlign((mip.m_height / blockInfo.blockHeight) * pitch, alignment);
const uint32_t size = slice * mip.m_depth;
uint8_t* temp = (uint8_t*)BX_ALLOC(g_allocator, size);
uint8_t* temp = (uint8_t*)bx::alloc(g_allocator, size);
bimg::imageCopy(
temp
, mip.m_height / blockInfo.blockHeight
@@ -3274,7 +3274,7 @@ namespace bgfx { namespace webgpu
const uint32_t slice = bx::strideAlign(mip.m_height * pitch, alignment);
const uint32_t size = slice * mip.m_depth;
uint8_t* temp = (uint8_t*)BX_ALLOC(g_allocator, size);
uint8_t* temp = (uint8_t*)bx::alloc(g_allocator, size);
bimg::imageCopy(temp
, mip.m_height
, mip.m_width * mip.m_bpp / 8
@@ -3338,9 +3338,9 @@ namespace bgfx { namespace webgpu
stagingBuffer.Unmap();
}
wgpu::ImageCopyBuffer* imageCopyBuffer = (wgpu::ImageCopyBuffer*)BX_ALLOC(g_allocator, sizeof(wgpu::ImageCopyBuffer) * numSrd);
wgpu::ImageCopyTexture* imageCopyTexture = (wgpu::ImageCopyTexture*)BX_ALLOC(g_allocator, sizeof(wgpu::ImageCopyTexture) * numSrd);
wgpu::Extent3D* textureCopySize = (wgpu::Extent3D*)BX_ALLOC(g_allocator, sizeof(wgpu::Extent3D) * numSrd);
wgpu::ImageCopyBuffer* imageCopyBuffer = (wgpu::ImageCopyBuffer*)bx::alloc(g_allocator, sizeof(wgpu::ImageCopyBuffer) * numSrd);
wgpu::ImageCopyTexture* imageCopyTexture = (wgpu::ImageCopyTexture*)bx::alloc(g_allocator, sizeof(wgpu::ImageCopyTexture) * numSrd);
wgpu::Extent3D* textureCopySize = (wgpu::Extent3D*)bx::alloc(g_allocator, sizeof(wgpu::Extent3D) * numSrd);
uint64_t offset = 0;
@@ -3392,14 +3392,14 @@ namespace bgfx { namespace webgpu
//vkFreeMemory(device, stagingDeviceMem, allocatorCb);
//vkDestroy(stagingBuffer);
BX_FREE(g_allocator, imageCopyBuffer);
BX_FREE(g_allocator, imageCopyTexture);
BX_FREE(g_allocator, textureCopySize);
bx::free(g_allocator, imageCopyBuffer);
bx::free(g_allocator, imageCopyTexture);
bx::free(g_allocator, textureCopySize);
for (uint32_t ii = 0; ii < numSrd; ++ii)
{
BX_FREE(g_allocator, imageInfos[ii].data);
bx::free(g_allocator, imageInfos[ii].data);
}
BX_FREE(g_allocator, imageInfos);
bx::free(g_allocator, imageInfos);
}
}
@@ -3418,7 +3418,7 @@ namespace bgfx { namespace webgpu
if (convert)
{
temp = (uint8_t*)BX_ALLOC(g_allocator, rectpitch*_rect.m_height);
temp = (uint8_t*)bx::alloc(g_allocator, rectpitch*_rect.m_height);
bimg::imageDecodeToBgra8(
g_allocator
, temp
@@ -3478,7 +3478,7 @@ namespace bgfx { namespace webgpu
if (NULL != temp)
{
BX_FREE(g_allocator, temp);
bx::free(g_allocator, temp);
}
}
@@ -3860,7 +3860,7 @@ namespace bgfx { namespace webgpu
{
if (NULL != m_swapChain)
{
BX_DELETE(g_allocator, m_swapChain);
bx::deleteObject(g_allocator, m_swapChain);
m_swapChain = NULL;
}