From 720e5534c036639aa86f5d1982c379f7a6e73343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sat, 29 Sep 2018 20:04:24 -0700 Subject: [PATCH] Fixed caps. --- include/bgfx/defines.h | 10 ++++---- src/bgfx.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/include/bgfx/defines.h b/include/bgfx/defines.h index cc11d1cdf..24d213d22 100644 --- a/include/bgfx/defines.h +++ b/include/bgfx/defines.h @@ -450,15 +450,15 @@ #define BGFX_CAPS_SWAP_CHAIN UINT64_C(0x0000000000008000) //!< Multiple windows are supported. #define BGFX_CAPS_TEXTURE_2D_ARRAY UINT64_C(0x0000000000010000) //!< 2D texture array is supported. #define BGFX_CAPS_TEXTURE_3D UINT64_C(0x0000000000020000) //!< 3D textures are supported. -#define BGFX_CAPS_TEXTURE_BLIT UINT64_C(0x00000000000c0000) //!< Texture blit is supported. -#define BGFX_CAPS_TEXTURE_COMPARE_ALL UINT64_C(0x0000000000080000) //!< All texture compare modes are supported. +#define BGFX_CAPS_TEXTURE_BLIT UINT64_C(0x0000000000040000) //!< Texture blit is supported. +#define BGFX_CAPS_TEXTURE_COMPARE_ALL UINT64_C(0x0000000000180000) //!< All texture compare modes are supported. #define BGFX_CAPS_TEXTURE_COMPARE_LEQUAL UINT64_C(0x0000000000100000) //!< Texture compare less equal mode is supported. #define BGFX_CAPS_TEXTURE_CUBE_ARRAY UINT64_C(0x0000000000200000) //!< Cubemap texture array is supported. #define BGFX_CAPS_TEXTURE_DIRECT_ACCESS UINT64_C(0x0000000000400000) //!< CPU direct access to GPU texture memory. #define BGFX_CAPS_TEXTURE_READ_BACK UINT64_C(0x0000000000800000) //!< Read-back texture is supported. -#define BGFX_CAPS_VERTEX_ATTRIB_HALF UINT64_C(0x0000000000800000) //!< Vertex attribute half-float is supported. -#define BGFX_CAPS_VERTEX_ATTRIB_UINT10 UINT64_C(0x0000000001000000) //!< Vertex attribute 10_10_10_2 is supported. -#define BGFX_CAPS_VERTEX_ID UINT64_C(0x0000000002000000) //!< Rendering with VertexID only is supported. +#define BGFX_CAPS_VERTEX_ATTRIB_HALF UINT64_C(0x0000000001000000) //!< Vertex attribute half-float is supported. +#define BGFX_CAPS_VERTEX_ATTRIB_UINT10 UINT64_C(0x0000000002000000) //!< Vertex attribute 10_10_10_2 is supported. +#define BGFX_CAPS_VERTEX_ID UINT64_C(0x0000000004000000) //!< Rendering with VertexID only is supported. /// #define BGFX_CAPS_FORMAT_TEXTURE_NONE UINT16_C(0x0000) //!< Texture format is not supported. diff --git a/src/bgfx.cpp b/src/bgfx.cpp index 35dd0ac33..c53f29ad2 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -4642,6 +4642,60 @@ BX_STATIC_ASSERT( (0 ^ BGFX_STATE_RESERVED_MASK ) ); +BX_STATIC_ASSERT(FLAGS_MASK_TEST(BGFX_CAPS_TEXTURE_COMPARE_LEQUAL, BGFX_CAPS_TEXTURE_COMPARE_ALL) ); + +BX_STATIC_ASSERT( (0 + | BGFX_CAPS_ALPHA_TO_COVERAGE + | BGFX_CAPS_BLEND_INDEPENDENT + | BGFX_CAPS_COMPUTE + | BGFX_CAPS_CONSERVATIVE_RASTER + | BGFX_CAPS_DRAW_INDIRECT + | BGFX_CAPS_FRAGMENT_DEPTH + | BGFX_CAPS_FRAGMENT_ORDERING + | BGFX_CAPS_GRAPHICS_DEBUGGER + | BGFX_CAPS_HDR10 + | BGFX_CAPS_HIDPI + | BGFX_CAPS_INDEX32 + | BGFX_CAPS_INSTANCING + | BGFX_CAPS_OCCLUSION_QUERY + | BGFX_CAPS_RENDERER_MULTITHREADED + | BGFX_CAPS_SWAP_CHAIN + | BGFX_CAPS_TEXTURE_2D_ARRAY + | BGFX_CAPS_TEXTURE_3D + | BGFX_CAPS_TEXTURE_BLIT + | BGFX_CAPS_TEXTURE_CUBE_ARRAY + | BGFX_CAPS_TEXTURE_DIRECT_ACCESS + | BGFX_CAPS_TEXTURE_READ_BACK + | BGFX_CAPS_VERTEX_ATTRIB_HALF + | BGFX_CAPS_VERTEX_ATTRIB_UINT10 + | BGFX_CAPS_VERTEX_ID + ) == (0 + ^ BGFX_CAPS_ALPHA_TO_COVERAGE + ^ BGFX_CAPS_BLEND_INDEPENDENT + ^ BGFX_CAPS_COMPUTE + ^ BGFX_CAPS_CONSERVATIVE_RASTER + ^ BGFX_CAPS_DRAW_INDIRECT + ^ BGFX_CAPS_FRAGMENT_DEPTH + ^ BGFX_CAPS_FRAGMENT_ORDERING + ^ BGFX_CAPS_GRAPHICS_DEBUGGER + ^ BGFX_CAPS_HDR10 + ^ BGFX_CAPS_HIDPI + ^ BGFX_CAPS_INDEX32 + ^ BGFX_CAPS_INSTANCING + ^ BGFX_CAPS_OCCLUSION_QUERY + ^ BGFX_CAPS_RENDERER_MULTITHREADED + ^ BGFX_CAPS_SWAP_CHAIN + ^ BGFX_CAPS_TEXTURE_2D_ARRAY + ^ BGFX_CAPS_TEXTURE_3D + ^ BGFX_CAPS_TEXTURE_BLIT + ^ BGFX_CAPS_TEXTURE_CUBE_ARRAY + ^ BGFX_CAPS_TEXTURE_DIRECT_ACCESS + ^ BGFX_CAPS_TEXTURE_READ_BACK + ^ BGFX_CAPS_VERTEX_ATTRIB_HALF + ^ BGFX_CAPS_VERTEX_ATTRIB_UINT10 + ^ BGFX_CAPS_VERTEX_ID + ) ); + #undef FLAGS_MASK_TEST #define BGFX_C99_ENUM_CHECK(_enum, _c99enumcount) \