mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

This commit is contained in:
Branimir Karadžić 2015-08-19 13:34:07 -07:00
parent 682a0519ef
commit 51c10dd59d
2 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bgfx.cpp
View File

@ -210,7 +210,7 @@ namespace bgfx
#if BGFX_CONFIG_MEMORY_TRACKING
// BK - CallbackStub will be deleted after printing this info, so there is always one
// leak if CallbackStub is used.
BX_WARN( (NULL != s_callbackStub ? 1 : 0) == m_numBlocks
BX_WARN(uint32_t(NULL != s_callbackStub ? 1 : 0) == m_numBlocks
, "MEMORY LEAK: %d (max: %d)"
, m_numBlocks
, m_maxBlocks

31
src/bgfx_compute.sh
View File

@ -71,25 +71,12 @@ vec2 unpackHalf2x16(uint _x)
#define NUM_THREADS(_x, _y, _z) [numthreads(_x, _y, _z)]
#define __IMAGE_IMPL(_textureType, _storeComponents, _type, _loadComponents) \
_type imageLoad(Texture2D<_textureType> _image, ivec2 _uv) \
{ \
return _image.mips[0][_uv]._loadComponents; \
} \
\
void imageStore(RWTexture2D<_textureType> _image, ivec2 _uv, _type _value) \
{ \
_image[_uv] = _value._storeComponents; \
} \
\
_type imageLoad(Texture3D<_textureType> _image, ivec3 _uv) \
{ \
return _image.mips[0][_uv]._loadComponents; \
} \
\
void imageStore(RWTexture3D<_textureType> _image, ivec3 _uv, _type _value) \
{ \
_image[_uv] = _value._storeComponents; \
}
_type imageLoad( Texture2D<_textureType> _image, ivec2 _uv) { return _image[_uv ]._loadComponents; } \
_type imageLoad( Texture3D<_textureType> _image, ivec3 _uvw) { return _image[_uvw]._loadComponents; } \
_type imageLoad(RWTexture2D<_textureType> _image, ivec2 _uv) { return _image[_uv ]._loadComponents; } \
_type imageLoad(RWTexture3D<_textureType> _image, ivec3 _uvw, _type _value) { return _image[_uvw]._loadComponents; } \
void imageStore(RWTexture2D<_textureType> _image, ivec2 _uv, _type _value) { _image[_uv ] = _value._storeComponents; } \
void imageStore(RWTexture3D<_textureType> _image, ivec3 _uvw, _type _value) { _image[_uvw] = _value._storeComponents; }
__IMAGE_IMPL(float, x, vec4, xxxx)
__IMAGE_IMPL(vec2, xy, vec4, xyyy)
@ -104,12 +91,6 @@ __IMAGE_IMPL(ivec2, xy, ivec4, xyyy)
__IMAGE_IMPL(ivec3, xyz, ivec4, xyzz)
__IMAGE_IMPL(ivec4, xyzw, ivec4, xyzw)
uint4 imageLoad(RWTexture2D<uint> _image, ivec2 _uv)
{
uint rr = _image[_uv.xy];
return uint4(rr, rr, rr, rr);
}
ivec2 imageSize(Texture2D _image)
{
ivec2 result;