memory semantics

diff --git a/vg.h b/vg.h
index 62651c0277e9a249d6364d5fbdf760db61c6383b..9b8c0234cab184c88209ee405a516e76d9d4dd06 100644 (file)
--- a/vg.h
+++ b/vg.h
@@ -458,6 +458,9 @@ VG_STATIC void _vg_gameloop_render(void)
       }
       else vg_gui();
 
+      /* vg tools */
+      audio_debug_ui( vg.pv );
+
       ui_postrender();
 #if 0
       ui_begin( vg.window_x, vg.window_y );
@@ -505,7 +508,6 @@ VG_STATIC void _vg_gameloop_render(void)
       }
 
       /* FIXME */
-      audio_debug_ui( vg.pv );
       vg_gui();
       
       ui_resolve();

diff --git a/vg_audio.h b/vg_audio.h
index 120622cc658307bcb15239b88b08f9c8b733d584..67cc3f100072d82a456c1ad89371bfb3245a17c0 100644 (file)
--- a/vg_audio.h
+++ b/vg_audio.h
@@ -125,7 +125,8 @@ static struct vg_audio_system{
 
    struct audio_channel{
       int allocated;
-      u32 group;
+      u16 group;
+      u8  world_id;
 
       char name[32];       /* only editable while allocated == 0 */
       audio_clip *source;  /* ... */
@@ -327,6 +328,7 @@ VG_STATIC void vg_audio_free(void)
 static void audio_channel_init( audio_channel *ch, audio_clip *clip, u32 flags )
 {
    ch->group = 0;
+   ch->world_id = 0;
    ch->source = clip;
    ch->flags = flags;
    ch->colour = 0x00333333;
@@ -352,10 +354,15 @@ static void audio_channel_init( audio_channel *ch, audio_clip *clip, u32 flags )
    ch->editble_state_write_mask = 0x00;
 }
 
-static void audio_channel_group( audio_channel *ch, u32 group )
+static void audio_channel_group( audio_channel *ch, u16 group )
 {
    ch->group = group;
-   ch->colour = ((group * 29986577) & 0x00ffffff) | 0xff000000;
+   ch->colour = (((u32)group * 29986577) & 0x00ffffff) | 0xff000000;
+}
+
+static void audio_channel_world( audio_channel *ch, u8 world_id )
+{
+   ch->world_id = world_id;
 }
 
 static audio_channel *audio_get_first_idle_channel(void)
@@ -371,7 +378,7 @@ static audio_channel *audio_get_first_idle_channel(void)
    return NULL;
 }
 
-static audio_channel *audio_get_group_idle_channel( u32 group, u32 max_count )
+static audio_channel *audio_get_group_idle_channel( u16 group, u32 max_count )
 {
    u32 count = 0;
    audio_channel *dest = NULL;
@@ -397,7 +404,7 @@ static audio_channel *audio_get_group_idle_channel( u32 group, u32 max_count )
    return NULL;
 }
 
-static audio_channel *audio_get_group_first_active_channel( u32 group )
+static audio_channel *audio_get_group_first_active_channel( u16 group )
 {
    for( int i=0; i<AUDIO_CHANNELS; i++ ){
       audio_channel *ch = &vg_audio.channels[i];
@@ -1262,37 +1269,30 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
     * -----------------------------------------------------------------------
     */
 
-#if 0
    float budget = ((double)vg_audio.samples_last / 44100.0) * 1000.0;
+#if 0
    vg_profile_drawn( (struct vg_profile *[]){ &vg_prof_audio_decode,
                                               &vg_prof_audio_mix,
                                               &vg_prof_audio_dsp}, 3, 
                      budget, (ui_rect){ 4, VG_PROFILE_SAMPLE_COUNT*2 + 8,
                                         512, 0 }, 3 );
+#endif
 
 
    char perf[128];
        
    /* Draw UI */
-   vg_uictx.cursor[0] = 512 + 8;
-   vg_uictx.cursor[1] = VG_PROFILE_SAMPLE_COUNT*2+8+24+12+12;
-   vg_uictx.cursor[2] = 150;
-   vg_uictx.cursor[3] = 12;
+   ui_rect window = {
+      0,
+      0,
+      800,
+      AUDIO_CHANNELS * 18
+   };
 
    if( vg_audio.debug_dsp ){
       ui_rect view_thing = { 4, vg.window_y-512-4, 512, 512 };
-      ui_push_image( view_thing, vg_dsp.view_texture );
+      ui_image( view_thing, vg_dsp.view_texture );
    }
-   
-   float mb1      = 1024.0f*1024.0f,
-         usage    = vg_linear_get_cur( vg_audio.audio_pool )      / mb1,
-         total    = vg_linear_get_capacity( vg_audio.audio_pool ) / mb1,
-         percent  = (usage/total) * 100.0f;
-
-   snprintf( perf, 127, "Mem: %.1f/%.1fmb (%.1f%%)\n", usage, total, percent );
-
-   ui_text( vg_uictx.cursor, perf, 1, 0 );
-   vg_uictx.cursor[1] += 20;
 
    ui_rect overlap_buffer[ AUDIO_CHANNELS ];
    u32 overlap_length = 0;
@@ -1301,16 +1301,11 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
        for( int i=0; i<AUDIO_CHANNELS; i ++ ){
       audio_channel *ch = &vg_audio.channels[i];
 
-               vg_uictx.cursor[2] = 400;
-               vg_uictx.cursor[3] = 18;
-               
-               ui_new_node();
+      ui_rect row;
+      ui_split( window, k_ui_axis_h, 18, 1, row, window );
 
       if( !ch->allocated ){
-         ui_fill_rect( vg_uictx.cursor, 0x50333333 );
-
-         ui_end_down();
-         vg_uictx.cursor[1] += 1;
+         ui_fill( row, 0x50333333 );
          continue;
       }
 
@@ -1345,8 +1340,9 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
 
       u32 format_index = (ch->source->flags & AUDIO_FLAG_FORMAT)>>9;
 
-      snprintf( perf, 127, "%02d %c%c%cD %s [%s] %4.2fv'%s'", 
+      snprintf( perf, 127, "%02d[%#04x.%#06x]%c%c%cD %s [%s] %4.2fv'%s'", 
                i,
+               ch->world_id, ch->group,
                (ch->editable_state.relinquished)? 'r': '_',
                0?                                 'r': '_',
                0?                                 '3': '2',
@@ -1355,14 +1351,8 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
                ch->editable_state.volume,
                ch->name );
 
-      ui_fill_rect( vg_uictx.cursor, 0xa0000000 | ch->colour );
-
-      vg_uictx.cursor[0] += 2;
-      vg_uictx.cursor[1] += 2;
-      ui_text( vg_uictx.cursor, perf, 1, 0 );
-
-               ui_end_down();
-               vg_uictx.cursor[1] += 1;
+      ui_fill( row, 0xa0000000 | ch->colour );
+      ui_text( row, perf, 1, k_ui_align_middle_left, 0 );
       
       if( AUDIO_FLAG_SPACIAL_3D ){
          v4f wpos;
@@ -1378,7 +1368,7 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
             ui_rect wr;
             wr[0] = vg_clampf(wpos[0] * vg.window_x, -32000.0f,32000.0f);
             wr[1] = vg_clampf((1.0f-wpos[1]) * vg.window_y,-32000.0f,32000.0f);
-            wr[2] = 100;
+            wr[2] = 1000;
             wr[3] = 17;
             
             for( int j=0; j<12; j++ ){
@@ -1399,13 +1389,11 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
                   wr[1] += 18;
             }
 
-            ui_text( wr, perf, 1, 0 );
-
-            ui_rect_copy( wr, overlap_buffer[ overlap_length ++ ] );
+            ui_text( wr, perf, 1, k_ui_align_middle_left, 0 );
+            rect_copy( wr, overlap_buffer[ overlap_length ++ ] );
          }
       }
        }
-#endif
 
    audio_unlock();
 }

diff --git a/vg_lines.h b/vg_lines.h
index 4a77502f07ca3e83a433eedba5542c458ed36a69..5c88d9bc8f40c57f9e7838a3c5b722c0cefa302b 100644 (file)
--- a/vg_lines.h
+++ b/vg_lines.h
@@ -149,6 +149,8 @@ VG_STATIC void vg_line2( line_co from, line_co to, u32 fc, u32 tc )
    if( !vg_lines.allow_input )
       return;
 
+   return;
+
    u32 size = 2 * sizeof(struct vg_lines_vert);
        struct vg_lines_vert *v = vg_linear_alloc( vg_lines.vertex_buffer, size );
 

diff --git a/vg_mem.h b/vg_mem.h
index 598bc83c352f3c7e382a0835cad459b0cbb2a113..49ab3e3061a8af2eb1cb87aaae01f51cd6877728 100644 (file)
--- a/vg_mem.h
+++ b/vg_mem.h
@@ -49,37 +49,12 @@ struct vg_allocation_meta
 struct vg_linear_allocator
 {
    u32 size;
-   /*     */
-   /*     */
-   /*     */
    u32 cur;
-   /*    */
-   /*    */
-   /*    */
    u16 allocation_count;
-   /*                 */
    u16 flags;
-   /*      */
    u32 last_alloc_size;
-   /*                */
-   /*                */
-   /*                */
    void *last_alloc;
-   /*             */
-   /*             */
-   /*             */
-   /*             */
-   /*             */
-   /*             */
-   /*             */
    vg_allocation_meta *alloc_table;
-   /*                            */
-   /*                            */
-   /*                            */
-   /*                            */
-   /*                            */
-   /*                            */
-   /*                            */
 
 #ifdef _WIN32
    /* 32 bit pointers! */
@@ -216,8 +191,10 @@ VG_STATIC void vg_linear_del( void *buffer, void *data )
 {
    vg_linear_allocator *alloc = vg_linear_header( buffer );
 
-   if( alloc->last_alloc != data )
-      vg_fatal_error( "This block has been fixed!" );
+   if( alloc->last_alloc != data ){
+      vg_fatal_error( "This block has been fixed! Last alloc: %p, this: %p\n",
+                      alloc->last_alloc, data );
+   }
 
    if( vg_mem.use_libc_malloc && (alloc->flags & VG_MEMORY_SYSTEM) ){
       vg_allocation_meta *meta = &alloc->alloc_table[alloc->allocation_count-1];
@@ -339,9 +316,8 @@ VG_STATIC void *vg_create_linear_allocator( void *lin_alloc, u32 size,
       }
       
       alloc->cur += block_size;
-      alloc->last_alloc = NULL; /* cant resize this block! */
+      alloc->last_alloc = header;
       alloc->last_alloc_size = block_size;
-
       alloc->allocation_count ++;
    }
    else{

diff --git a/vg_platform.h b/vg_platform.h
index c7e178b93df5dbb8a891e52e30d09da31bc8c843..98baef896a60196c0a85521e9f6ea3386120bf99 100644 (file)
--- a/vg_platform.h
+++ b/vg_platform.h
@@ -41,9 +41,11 @@ struct vg_achievement
 
 enum strncpy_behaviour{
    k_strncpy_always_add_null = 0,
-   k_strncpy_allow_cutoff = 1
+   k_strncpy_allow_cutoff = 1,
+   k_strncpy_overflow_fatal = 2
 };
 
+VG_STATIC void vg_fatal_error( const char *fmt, ... );
 VG_STATIC u32 vg_strncpy( const char *src, char *dst, u32 len,
                           enum strncpy_behaviour behaviour )
 {
@@ -52,9 +54,14 @@ VG_STATIC u32 vg_strncpy( const char *src, char *dst, u32 len,
 
       if( !src[i] ) return i;
 
-      if( (behaviour == k_strncpy_always_add_null) && (i == len-1) ){
-         dst[i] = '\0';
-         return i;
+      if( i == len-1 ){
+         if( behaviour == k_strncpy_always_add_null ){
+            dst[i] = '\0';
+            return i;
+         }
+         else if( behaviour == k_strncpy_overflow_fatal ){
+            vg_fatal_error( "Strncpy dest exceeded buffer length\n" );
+         }
       }
    }