Changeset 322

Timestamp:

08/25/14 04:27:26 (11 years ago)

Author:

epyon

Message:

• profiler control via define/NV_DEBUG
• weird RELEASE mode audio error - need to investigate
• fixed - render_state in RELEASE mode would not set depth_mask!

Location:

trunk

Files:

• nv/core/common.hh (modified) (1 diff)
• nv/core/profiler.hh (modified) (1 diff)
• nv/interface/render_state.hh (modified) (2 diffs)
• src/gui/gui_renderer.cc (modified) (4 diffs)
• src/sdl/sdl_audio.cc (modified) (1 diff)

trunk/nv/core/common.hh

@@ -82 +82 @@
 #define NV_DEBUG 0
 #endif
+#endif
+
+#if NV_DEBUG
+#ifndef NV_PROFILER
+#define NV_PROFILER 
+#endif
+#endif
+
+#ifdef NV_PROFILER
+#undef NV_PROFILER
+#define NV_PROFILER 1
+#else
+#define NV_PROFILER 0
 #endif
 

trunk/nv/core/profiler.hh

@@ -18 +18 @@
 #include <unordered_map>
 
+#if NV_PROFILER 
 #define NV_PROFILE( tag ) nv::profiler_guard __profile( tag )
+#else
+#define NV_PROFILE( tag )
+#endif
 
 namespace nv

trunk/nv/interface/render_state.hh

@@ -95 +95 @@
 
                 blending() :
+                        enabled( false ),
                         src_rgb_factor( ONE ), src_alpha_factor( ONE ), 
                         dst_rgb_factor( ZERO ), dst_alpha_factor( ZERO ), 
@@ -199 +200 @@
                 nv::polygon_mode polygon_mode;
                 bool depth_mask;
+                render_state() : depth_mask( true ) {}
         };
 

trunk/src/gui/gui_renderer.cc

@@ -11 +11 @@
 #include "nv/interface/device.hh"
 #include "nv/interface/context.hh"
+#include "nv/core/logging.hh"
 
 static const char *nv_gui_vertex_shader =
@@ -123 +124 @@
         , m_reupload( true )
 {
+        NV_LOG( LOG_TRACE, "Creating GUI renderer..." );
         m_context = w->get_context();
         m_area.dim( dimension( w->get_width(), w->get_height() ) );
@@ -133 +135 @@
         delete[] wfill;
 
+        NV_LOG( LOG_TRACE, "Creating render data..." );
         screen_render_data* sr = new screen_render_data( w->get_context(), 1024 );
         m_render_data = sr;
@@ -152 +155 @@
         m_render_state.blending.src_alpha_factor = blending::SRC_ALPHA;
         m_render_state.blending.dst_alpha_factor = blending::ONE_MINUS_SRC_ALPHA;
+        NV_LOG( LOG_TRACE, "GUI Renderer created" );
 }
 

trunk/src/sdl/sdl_audio.cc

@@ -43 +43 @@
 nv::sound* nv::sdl::audio::load_sound( const std::string& a_path )
 {
-        Mix_Chunk *sample = Mix_LoadWAV( a_path.c_str() );
+        // TODO: this is a really wierd error - if we remove this check, all hell gets loose
+        if ( Mix_LoadWAV_RW == nullptr || SDL_RWFromFile == nullptr ) 
+        {
+                NV_LOG( LOG_ERROR, "SDL_mixer not loaded!" );
+        }
+        Mix_Chunk *sample = Mix_LoadWAV_RW(SDL_RWFromFile(a_path.c_str(), "rb"), 1);
         if ( sample == nullptr )
         {