From f6a97f9d87f39b35b0f43fac684ac4b92145680e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sun, 22 Oct 2017 18:37:51 -0700 Subject: [PATCH] Changed setViewOrder API to specify type required for array. --- include/bgfx/bgfx.h | 2 +- include/bgfx/c99/bgfx.h | 2 +- include/bgfx/c99/platform.h | 2 +- include/bgfx/defines.h | 2 +- src/bgfx.cpp | 4 ++-- src/bgfx_p.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/bgfx/bgfx.h b/include/bgfx/bgfx.h index 986033bf7..c06a210fa 100644 --- a/include/bgfx/bgfx.h +++ b/include/bgfx/bgfx.h @@ -2463,7 +2463,7 @@ namespace bgfx void setViewOrder( uint8_t _id = 0 , uint8_t _num = UINT8_MAX - , const void* _remap = NULL + , const uint8_t* _remap = NULL ); /// Reset all view settings to default. diff --git a/include/bgfx/c99/bgfx.h b/include/bgfx/c99/bgfx.h index b27c1dc6c..a9d68fc9f 100644 --- a/include/bgfx/c99/bgfx.h +++ b/include/bgfx/c99/bgfx.h @@ -840,7 +840,7 @@ BGFX_C_API void bgfx_set_view_transform(uint8_t _id, const void* _view, const vo BGFX_C_API void bgfx_set_view_transform_stereo(uint8_t _id, const void* _view, const void* _projL, uint8_t _flags, const void* _projR); /**/ -BGFX_C_API void bgfx_set_view_order(uint8_t _id, uint8_t _num, const void* _order); +BGFX_C_API void bgfx_set_view_order(uint8_t _id, uint8_t _num, const uint8_t* _order); /**/ BGFX_C_API void bgfx_reset_view(uint8_t _id); diff --git a/include/bgfx/c99/platform.h b/include/bgfx/c99/platform.h index 32d2e2f31..b2fab719f 100644 --- a/include/bgfx/c99/platform.h +++ b/include/bgfx/c99/platform.h @@ -163,7 +163,7 @@ typedef struct bgfx_interface_vtbl void (*set_view_frame_buffer)(uint8_t _id, bgfx_frame_buffer_handle_t _handle); void (*set_view_transform)(uint8_t _id, const void* _view, const void* _proj); void (*set_view_transform_stereo)(uint8_t _id, const void* _view, const void* _projL, uint8_t _flags, const void* _projR); - void (*set_view_order)(uint8_t _id, uint8_t _num, const void* _order); + void (*set_view_order)(uint8_t _id, uint8_t _num, const uint8_t* _order); void (*set_marker)(const char* _marker); void (*set_state)(uint64_t _state, uint32_t _rgba); void (*set_condition)(bgfx_occlusion_query_handle_t _handle, bool _visible); diff --git a/include/bgfx/defines.h b/include/bgfx/defines.h index a45a99500..748540a7f 100644 --- a/include/bgfx/defines.h +++ b/include/bgfx/defines.h @@ -6,7 +6,7 @@ #ifndef BGFX_DEFINES_H_HEADER_GUARD #define BGFX_DEFINES_H_HEADER_GUARD -#define BGFX_API_VERSION UINT32_C(52) +#define BGFX_API_VERSION UINT32_C(53) /// Color RGB/alpha/depth write. When it's not specified write will be disabled. #define BGFX_STATE_RGB_WRITE UINT64_C(0x0000000000000001) //!< Enable RGB write. diff --git a/src/bgfx.cpp b/src/bgfx.cpp index 33056d358..82475cc8d 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -3743,7 +3743,7 @@ error: s_ctx->setViewTransform(_id, _view, _projL, _flags, _projR); } - void setViewOrder(uint8_t _id, uint8_t _num, const void* _order) + void setViewOrder(uint8_t _id, uint8_t _num, const uint8_t* _order) { BGFX_CHECK_MAIN_THREAD(); BX_CHECK(checkView(_id), "Invalid view id: %d", _id); @@ -4856,7 +4856,7 @@ BGFX_C_API void bgfx_set_view_transform_stereo(uint8_t _id, const void* _view, c bgfx::setViewTransform(_id, _view, _projL, _flags, _projR); } -BGFX_C_API void bgfx_set_view_order(uint8_t _id, uint8_t _num, const void* _order) +BGFX_C_API void bgfx_set_view_order(uint8_t _id, uint8_t _num, const uint8_t* _order) { bgfx::setViewOrder(_id, _num, _order); } diff --git a/src/bgfx_p.h b/src/bgfx_p.h index 9d6b4748e..8881a881c 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -4094,7 +4094,7 @@ namespace bgfx setViewTransform(_id, NULL, NULL, BGFX_VIEW_NONE, NULL); } - BGFX_API_FUNC(void setViewOrder(uint8_t _id, uint8_t _num, const void* _order) ) + BGFX_API_FUNC(void setViewOrder(uint8_t _id, uint8_t _num, const uint8_t* _order) ) { const uint32_t num = bx::uint32_min(_id + _num, BGFX_CONFIG_MAX_VIEWS) - _id; if (NULL == _order)