diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ez_arena.h | 7 | ||||
| -rw-r--r-- | src/smrt_arena.c | 2 | ||||
| -rw-r--r-- | src/smrt_arena.h | 27 | ||||
| -rw-r--r-- | src/string.h | 6 | ||||
| -rw-r--r-- | src/vec2.h | 6 | ||||
| -rw-r--r-- | src/wav.c | 4 | ||||
| -rw-r--r-- | src/wav.h | 22 |
7 files changed, 44 insertions, 30 deletions
diff --git a/src/ez_arena.h b/src/ez_arena.h index 19def60..9581d0c 100644 --- a/src/ez_arena.h +++ b/src/ez_arena.h @@ -6,11 +6,12 @@ typedef struct { u64 alloc_size; - u64 pos; + u64 pos; } ez_arena_t; -ez_arena_t *ez_arena_create(u64 size, b32 zero_out); - void *ez_arena_alloc(ez_arena_t *arena, u64 alloc_amount); +ez_arena_t * ez_arena_create(u64 size, b32 zero_out); + + void * ez_arena_alloc(ez_arena_t *arena, u64 alloc_amount); void *ez_arena_alloc_nz(ez_arena_t *arena, u64 alloc_amount); void ez_arena_clear(ez_arena_t *arena, b32 zero_out); void ez_arena_destroy(ez_arena_t *arena); diff --git a/src/smrt_arena.c b/src/smrt_arena.c index 6862212..3618771 100644 --- a/src/smrt_arena.c +++ b/src/smrt_arena.c @@ -171,7 +171,7 @@ smrta_temp_t smrta_scratch_start(smrt_arena_t **conflicts, u32 num_conflicts) { smrt_arena_t **selected = &_scratch_pool[candidate_idx]; if (!*selected) { - *selected = smrt_arena_create(MiB(64), plat_get_pagesize(), true); + *selected = smrt_arena_create(SMRTA_SCRATCH_RESERVE_SIZE, plat_get_pagesize(), true); } return smrta_temp_start(*selected); diff --git a/src/smrt_arena.h b/src/smrt_arena.h index 0c8d848..48774e2 100644 --- a/src/smrt_arena.h +++ b/src/smrt_arena.h @@ -5,26 +5,23 @@ #define SMRT_ARENA_BASE_POS (sizeof(smrt_arena_t)) typedef struct { - u64 reserve_size; - u64 commit_size; - - u64 mark_pos; - - u64 pos; - u64 commit_pos; - + u64 reserve_size; + u64 commit_size; + u64 mark_pos; + u64 pos; + u64 commit_pos; b32 auto_decommit; } smrt_arena_t; -smrt_arena_t *smrt_arena_create(u64 reserve_size, u64 commit_size, b32 auto_decommit); - void *smrt_arena_push(smrt_arena_t *arena, u64 alloc_amount, b32 zero_out); +smrt_arena_t * smrt_arena_create(u64 reserve_size, u64 commit_size, b32 auto_decommit); + + void * smrt_arena_push(smrt_arena_t *arena, u64 alloc_amount, b32 zero_out); void smrt_arena_pop(smrt_arena_t *arena, u64 pop_amount); void smrt_arena_pop_to(smrt_arena_t *arena, u64 location); void smrt_arena_clear(smrt_arena_t *arena, b32 zero_out); void smrt_arena_destroy(smrt_arena_t *arena); - void smrt_arena_mark(smrt_arena_t *arena); - void *smrt_arena_mark_push(smrt_arena_t *arena, u64 alloc_amount, b32 zero_out); + void * smrt_arena_mark_push(smrt_arena_t *arena, u64 alloc_amount, b32 zero_out); b32 smrt_arena_pop_to_mark(smrt_arena_t *arena); #define SMRTA_ALLOC_ARRAY(arena, T, n) (T*)smrt_arena_push(arena, sizeof(T) * (n), true) @@ -40,7 +37,13 @@ smrta_temp_t smrta_temp_start(smrt_arena_t *arena); smrta_temp_t smrta_scratch_start(smrt_arena_t **conflicts, u32 num_conflicts); void smrta_scratch_end(smrta_temp_t temp); +#ifndef SCRATCH_POOL_SIZE #define SCRATCH_POOL_SIZE 2 +#endif + +#ifndef SMRTA_SCRATCH_RESERVE_SIZE +#define SMRTA_SCRATCH_RESERVE_SIZE MiB(64) +#endif #define TEMP_ARENA_PUSH(temp, T) (T*)smrt_arena_push(temp.arena, sizeof(T), true) #define TEMP_ARENA_PUSH_ARRAY(temp, T, n) (T*)smrt_arena_push(temp.arena, sizeof(T) * (n), true) diff --git a/src/string.h b/src/string.h index 419ef96..7e3cf66 100644 --- a/src/string.h +++ b/src/string.h @@ -10,10 +10,10 @@ typedef struct { u64 len; } strng_t; -strng_t *strng_new(smrt_arena_t *arena, u64 size); +strng_t * strng_new(smrt_arena_t *arena, u64 size); strng_t *strng_from(smrt_arena_t *arena, char const *c); -strng_t *strng_dup(smrt_arena_t *arena, strng_t const *src); - char *strng_str(smrt_arena_t *arena, strng_t const *string); +strng_t * strng_dup(smrt_arena_t *arena, strng_t const *src); + char * strng_str(smrt_arena_t *arena, strng_t const *string); b32 strng_set(strng_t *string, char const *c); void strng_clear(strng_t *string); @@ -7,12 +7,12 @@ typedef union { struct { f64 x, y; }; - f64 d[2]; + f64 d[2]; } vec2d_t; typedef struct { - f64 *xs; - f64 *ys; + f64 * xs; + f64 * ys; u64 size; } vec2d_soa_t; @@ -50,10 +50,10 @@ wav_data_t load_wav_file(smrt_arena_t *arena, FILE *wav_file, wav_master_chunk_t u32 sampled_data_size; fread(&sampled_data_size, 4, 1, wav_file); - data.samples = smrt_arena_push(arena, sizeof(wav_data_t) + sampled_data_size, true); + data.samples = smrt_arena_push(arena, sampled_data_size, true); if (!data.samples) return data; - fread((u8*)data.samples+WAV_DATA_BASE_POS, sampled_data_size, 1, wav_file); + fread((u8*)data.samples, sampled_data_size, 1, wav_file); data.sample_count = sampled_data_size / ((format_o->bits_per_sample / 8) * format_o->num_channels); return data; @@ -5,11 +5,9 @@ #include <stdio.h> -#define WAV_DATA_BASE_POS sizeof(wav_data_t) - typedef struct { u64 sample_count; - u8 *samples; + u8 * samples; } wav_data_t; // [Master RIFF chunk] @@ -44,6 +42,18 @@ typedef struct { } wav_fmt_chunk_t; #pragma pack(pop) - wav_data_t load_wav_file(smrt_arena_t *arena, FILE *wav_file, wav_master_chunk_t *master_o, wav_fmt_chunk_t *format_o); - b32 write_wav_file(FILE *wav_file, wav_fmt_chunk_t *fmt_chunk_i, wav_data_t data_i); -wav_fmt_chunk_t make_wav_fmt_chunk(u32 num_channels, u32 sample_rate, u16 bits_per_sample); +/// Load WAV data from wav_file. Data will be allocated on arena +wav_data_t load_wav_file(smrt_arena_t * arena , + FILE *wav_file , + wav_master_chunk_t *master_o , + wav_fmt_chunk_t *format_o); + +/// Write WAV headers and data to wav_file. +b32 write_wav_file(FILE * wav_file , + wav_fmt_chunk_t *fmt_chunk_i , + wav_data_t data_i); + +/// Generate WAV "fmt " chunk for unsigned 8-bit PCM data ready to be written to a file. +wav_fmt_chunk_t make_wav_fmt_chunk(u32 num_channels , + u32 sample_rate , + u16 bits_per_sample); |