scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-02-16 11:50:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated compute shader header.

Browse source
This commit is contained in:
Branimir Karadžić 2015-02-10 14:22:56 -08:00
parent 3b2c0dc001
commit 06ad146d9f
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/bgfx_compute.sh
View file

@ -20,6 +20,10 @@ uint floatBitsToUint(float _x) { return asuint(_x); }
uvec2 floatBitsToUint(vec2 _x) { return asuint(_x); } uvec2 floatBitsToUint(vec2 _x) { return asuint(_x); }
uvec3 floatBitsToUint(vec3 _x) { return asuint(_x); } uvec3 floatBitsToUint(vec3 _x) { return asuint(_x); }
uvec4 floatBitsToUint(vec4 _x) { return asuint(_x); } uvec4 floatBitsToUint(vec4 _x) { return asuint(_x); }
int floatBitsToInt(float _x) { return asint(_x); }
ivec2 floatBitsToInt(vec2 _x) { return asint(_x); }
ivec3 floatBitsToInt(vec3 _x) { return asint(_x); }
ivec4 floatBitsToInt(vec4 _x) { return asint(_x); }
#define SHARED groupshared #define SHARED groupshared
@ -38,6 +42,16 @@ vec4 imageLoad(Texture2D _image, ivec2 _uv)
return _image.Load(uint3(_uv.xy, 0) ); return _image.Load(uint3(_uv.xy, 0) );
} }
uint imageLoad(Texture2D<uint> _image, ivec2 _uv)
{
return _image.Load(uint3(_uv.xy, 0) );
}
uint imageLoad(RWTexture2D<uint> _image, ivec2 _uv)
{
return _image[_uv.xy];
}
ivec2 imageSize(Texture2D _image) ivec2 imageSize(Texture2D _image)
{ {
ivec2 result; ivec2 result;
@ -45,11 +59,6 @@ ivec2 imageSize(Texture2D _image)
return result; return result;
} }
//vec4 imageLoad(RWTexture2D<float4> _image, ivec2 _uv)
//{
// return _image[_uv];
//}
ivec2 imageSize(RWTexture2D<float4> _image) ivec2 imageSize(RWTexture2D<float4> _image)
{ {
ivec2 result; ivec2 result;
@ -57,11 +66,23 @@ ivec2 imageSize(RWTexture2D<float4> _image)
return result; return result;
} }
ivec2 imageSize(RWTexture2D<uint> _image)
{
ivec2 result;
_image.GetDimensions(result.x, result.y);
return result;
}
void imageStore(RWTexture2D<float4> _image, ivec2 _uv, vec4 _rgba) void imageStore(RWTexture2D<float4> _image, ivec2 _uv, vec4 _rgba)
{ {
_image[_uv] = _rgba; _image[_uv] = _rgba;
} }
void imageStore(RWTexture2D<uint> _image, ivec2 _uv, uvec4 _r)
{
_image[_uv] = _r.x;
}
#define __ATOMIC_IMPL_TYPE(_genType, _glFunc, _dxFunc) \ #define __ATOMIC_IMPL_TYPE(_genType, _glFunc, _dxFunc) \
_genType _glFunc(_genType _mem, _genType _data) \ _genType _glFunc(_genType _mem, _genType _data) \
{ \ { \

2
src/bgfx_p.h
View file

@ -2178,7 +2178,7 @@ namespace bgfx
return ptr; return ptr;
} }
BGFX_API_FUNC(DynamicVertexBufferHandle createDynamicVertexBuffer(uint16_t _num, const VertexDecl& _decl, uint8_t _flags) ) BGFX_API_FUNC(DynamicVertexBufferHandle createDynamicVertexBuffer(uint32_t _num, const VertexDecl& _decl, uint8_t _flags) )
{ {
DynamicVertexBufferHandle handle = BGFX_INVALID_HANDLE; DynamicVertexBufferHandle handle = BGFX_INVALID_HANDLE;
uint32_t size = strideAlign16( (_num+1)*_decl.m_stride, _decl.m_stride); uint32_t size = strideAlign16( (_num+1)*_decl.m_stride, _decl.m_stride);