Ver Fonte

Changed setViewOrder API to specify type required for array.

Branimir Karadžić há 8 anos atrás
pai
commit
f6a97f9d87
6 ficheiros alterados com 7 adições e 7 exclusões
  1. 1 1
      include/bgfx/bgfx.h
  2. 1 1
      include/bgfx/c99/bgfx.h
  3. 1 1
      include/bgfx/c99/platform.h
  4. 1 1
      include/bgfx/defines.h
  5. 2 2
      src/bgfx.cpp
  6. 1 1
      src/bgfx_p.h

+ 1 - 1
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.

+ 1 - 1
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);

+ 1 - 1
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);

+ 1 - 1
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.

+ 2 - 2
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);
 }

+ 1 - 1
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)