bgfx_interface changed

Author: cloudwu

Makefile

@@ -32,10 +32,13 @@ $(ODIR)/luabgfximgui.o : luabgfximgui.cpp  | $(ODIR)
 $(ODIR)/bgfx_alloc.o : bgfx_alloc.cpp  | $(ODIR)
 	$(CXX) $(CFLAGS) -c -DLUA_BUILD_AS_DLL -o $@ $^ $(LUAINC) $(BGFXINC) $(BGFXUTILINC)
 
+$(ODIR)/bgfx_interface.o : bgfx_interface.cpp  | $(ODIR)
+	$(CXX) $(CFLAGS) -c -DLUA_BUILD_AS_DLL -o $@ $^ $(LUAINC) $(BGFXINC) $(BGFXUTILINC)
+
 bin :
 	mkdir $@
 
-bin/bgfx.dll : $(ODIR)/luabgfx.o $(ODIR)/luabgfxutil.o $(ODIR)/luabgfximgui.o $(ODIR)/bgfx_alloc.o | bin
+bin/bgfx.dll : $(ODIR)/luabgfx.o $(ODIR)/luabgfxutil.o $(ODIR)/luabgfximgui.o $(ODIR)/bgfx_alloc.o $(ODIR)/bgfx_interface.o | bin
 	$(CC) $(CFLAGS) --shared -o $@ $^ $(LUALIB) $(BGFXUTILLIB) $(BIMGLIB) $(BGFXLIB)
 
 math :

bgfx_alloc.cpp

@@ -1,7 +1,7 @@
 #include "bgfx_alloc.h"
 #include <bx/allocator.h>
 #include <atomic>
-#include <malloc.h>
+#include <stdlib.h>
 
 #ifndef BX_CONFIG_ALLOCATOR_NATURAL_ALIGNMENT
 #    define BX_CONFIG_ALLOCATOR_NATURAL_ALIGNMENT 8
@@ -15,8 +15,10 @@ static std::atomic<int64_t> allocator_memory (0);
 #elif BX_PLATFORM_LINUX
 #define bx_malloc_size malloc_usable_size
 #elif BX_PLATFORM_OSX
+#include <malloc/malloc.h>
 #define bx_malloc_size malloc_size
 #elif BX_PLATFORM_IOS
+#include <malloc/malloc.h>
 #define bx_malloc_size malloc_size
 #else
 #    error "Unknown PLATFORM!"

bgfx_interface.cpp

@@ -0,0 +1,3 @@
+#include "bgfx_interface.h"
+
+bgfx_interface_vtbl_t* bgfx_inf_ = bgfx_get_interface(BGFX_API_VERSION);

bgfx_interface.h

@@ -5,49 +5,14 @@
 #include <lauxlib.h>
 #include <bgfx/c99/bgfx.h>
 
-extern bgfx_interface_vtbl_t* bgfx_inf_;
-
-#ifndef BGFX_INTERFACE_IMPORT
-bgfx_interface_vtbl_t* bgfx_inf_ = 0;
-#endif
-
-static inline void
-init_interface(lua_State* L) {
-	if (bgfx_inf_) {
-		return;
-	}
-#ifdef BGFX_STATIC_LINK
-	bgfx_interface_vtbl_t* inf = bgfx_get_interface(BGFX_API_VERSION);
-	if (inf == NULL) {
-		luaL_error(L, "BGFX_API_VERSION (%d) mismatch.", BGFX_API_VERSION);
-		return;
-	}
-	bgfx_inf_ = inf;
+#if defined(__cplusplus)
+extern "C"
 #else
-	if (LUA_TFUNCTION != lua_getfield(L, LUA_REGISTRYINDEX, "BGFX_GET_INTERFACE")) {
-		luaL_error(L, "BGFX_GET_INTERFACE is missing.");
-		return;
-	}
-	lua_CFunction fn = lua_tocfunction(L, -1);
-	if (fn == NULL) {
-		luaL_error(L, "BGFX_GET_INTERFACE is not a C function.");
-		return;
-	}
-	bgfx_interface_vtbl_t* inf = ((PFN_BGFX_GET_INTERFACE)fn)(BGFX_API_VERSION);
-	if (inf == NULL) {
-		luaL_error(L, "BGFX_API_VERSION (%d) mismatch.", BGFX_API_VERSION);
-		return;
-	}
-	bgfx_inf_ = inf;
-	lua_pop(L, 1);
+extern
 #endif
-}
+bgfx_interface_vtbl_t* bgfx_inf_;
 
 #define BGFX(api) bgfx_inf_->api
 #define BGFX_ENCODER(api, encoder, ...) (encoder ? (BGFX(encoder_##api)( encoder, ## __VA_ARGS__ )) : BGFX(api)( __VA_ARGS__ ))
 
-#ifdef EXPORT_BGFX_INTERFACE
-bgfx_interface_vtbl_t* ibgfx(){return bgfx_inf_;}
-#endif //EXPORT_BGFX_INTERFACE
-
 #endif

luabgfx.c

@@ -5113,7 +5113,6 @@ linitEncoder(lua_State *L) {
 LUAMOD_API int
 luaopen_bgfx(lua_State *L) {
 	luaL_checkversion(L);
-	init_interface(L);
 
 	int tfn = sizeof(c_texture_formats) / sizeof(c_texture_formats[0]);
 	lua_createtable(L, 0, tfn);

luabgfxutil.c

@@ -5,7 +5,6 @@
 #include <stdint.h>
 #include <math.h>
 
-#define BGFX_INTERFACE_IMPORT
 #include "bgfx_interface.h"
 
 static inline float
@@ -56,29 +55,13 @@ lencodeNormalRgba8(lua_State *L) {
 	return 1;
 }
 
-static void
-update_char_texture(uint16_t texid, 
-	uint16_t _layer, uint8_t _mip, 
-	uint16_t _x, uint16_t _y, uint16_t _width, uint16_t _height, uint16_t _pitch,
-	const uint8_t *mem, void (*release_fn)(void*, void*)){
-
-	bgfx_texture_handle_t th = {texid};
-	const bgfx_memory_t *m = BGFX(make_ref_release)(mem, _width * _height, release_fn, NULL);
-	BGFX(update_texture_2d)(th, _layer, _mip, _x, _y, _width, _height, m, _pitch);
-}
-
 LUAMOD_API int
 luaopen_bgfx_util(lua_State *L) {
 	luaL_checkversion(L);
-	init_interface(L);
 	luaL_Reg l[] = {
-		{ "update_char_texture", NULL},
 		{ "encodeNormalRgba8", lencodeNormalRgba8 },
 		{ NULL, NULL },
 	};
 	luaL_newlib(L, l);
-
-	lua_pushlightuserdata(L, update_char_texture);
-	lua_setfield(L, -2, "update_char_texture");
 	return 1;
 }