perf profiler, simplify 2d render, string struct, many small things

2 files changed, 4 insertions, 3 deletions

diff --git a/src/gui/base.cpp b/src/gui/base.cpp
index 5d345d8..1e8a493 100644
--- a/src/gui/base.cpp
+++ b/src/gui/base.cpp
@@ -38,7 +38,7 @@ void gui_end() {
 
 void gui_draw( GAME_DATA* game ) {
   _gui.gl2d = game->shaders.gl2d;
-  _gui.gl2d_font = game->shaders.gl2d_texcoord;
+  _gui.gl2d_font = game->shaders.gl2d;
 
   _gui.windows.each( fn( GUI_WINDOW** w ) {
     GUI_WINDOW* wnd = *w;
@@ -58,7 +58,7 @@ void gui_input( GAME_DATA* game ) {
   }
 }
 
-void gui_onframe( GAME_DATA* game ) {
+void gui_onframe( GAME_DATA* game ) { _profiled
   gui_run_callbacks();
 
   gui_input( game );
diff --git a/src/gui/view.cpp b/src/gui/view.cpp
index da470e7..d053f99 100644
--- a/src/gui/view.cpp
+++ b/src/gui/view.cpp
@@ -1,6 +1,7 @@
 #include "base.h"
+#include "../util/profiler.h"
 
-void gui_view_draw_fn( void* ptr ) {
+void gui_view_draw_fn( void* ptr ) { _profiled
   GUI_VIEW* view = (GUI_VIEW*)ptr;
 
   I32 x = gui_relx( view );