Skip to content

Commit ab6ae28

Browse files
RinnegatamanteRinnegatamante
committed
Using less common symbol names for mem operations.
1 parent 2b4409b commit ab6ae28

File tree

6 files changed

+36
-38
lines changed

6 files changed

+36
-38
lines changed

‎source/framebuffers.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ void glDeleteFramebuffers(GLsizei n, GLuint *framebuffers) {
9696
fb->target = NULL;
9797
}
9898
if (fb->depth_buffer_addr) {
99-
mempool_free(fb->depth_buffer_addr, fb->depth_buffer_mem_type);
100-
mempool_free(fb->stencil_buffer_addr, fb->stencil_buffer_mem_type);
99+
vgl_mem_free(fb->depth_buffer_addr, fb->depth_buffer_mem_type);
100+
vgl_mem_free(fb->stencil_buffer_addr, fb->stencil_buffer_mem_type);
101101
fb->depth_buffer_addr = NULL;
102102
fb->stencil_buffer_addr = NULL;
103103
}

‎source/gxm.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ void initGxmContext(void) {
181181

182182
void termGxmContext(void) {
183183
// Deallocating ring buffers
184-
mempool_free(vdm_ring_buffer_addr, VGL_MEM_VRAM);
185-
mempool_free(vertex_ring_buffer_addr, VGL_MEM_VRAM);
186-
mempool_free(fragment_ring_buffer_addr, VGL_MEM_VRAM);
184+
vgl_mem_free(vdm_ring_buffer_addr, VGL_MEM_VRAM);
185+
vgl_mem_free(vertex_ring_buffer_addr, VGL_MEM_VRAM);
186+
vgl_mem_free(fragment_ring_buffer_addr, VGL_MEM_VRAM);
187187
gpu_fragment_usse_free_mapped(fragment_usse_ring_buffer_addr);
188188

189189
// Destroying sceGxm context
@@ -272,7 +272,7 @@ void termDisplayColorSurfaces(void) {
272272
int i;
273273
for (i = 0; i < DISPLAY_BUFFER_COUNT; i++) {
274274
if (!system_app_mode)
275-
mempool_free(gxm_color_surfaces_addr[i], VGL_MEM_VRAM);
275+
vgl_mem_free(gxm_color_surfaces_addr[i], VGL_MEM_VRAM);
276276
sceGxmSyncObjectDestroy(gxm_sync_objects[i]);
277277
}
278278
}
@@ -311,8 +311,8 @@ void initDepthStencilSurfaces(void) {
311311

312312
void termDepthStencilSurfaces(void) {
313313
// Deallocating depth and stencil surfaces memblocks
314-
mempool_free(gxm_depth_surface_addr, VGL_MEM_VRAM);
315-
mempool_free(gxm_stencil_surface_addr, VGL_MEM_VRAM);
314+
vgl_mem_free(gxm_depth_surface_addr, VGL_MEM_VRAM);
315+
vgl_mem_free(gxm_stencil_surface_addr, VGL_MEM_VRAM);
316316
}
317317

318318
void startShaderPatcher(void) {
@@ -366,7 +366,7 @@ void stopShaderPatcher(void) {
366366
sceGxmShaderPatcherDestroy(gxm_shader_patcher);
367367

368368
// Freeing shader patcher buffers
369-
mempool_free(gxm_shader_patcher_buffer_addr, VGL_MEM_VRAM);
369+
vgl_mem_free(gxm_shader_patcher_buffer_addr, VGL_MEM_VRAM);
370370
gpu_vertex_usse_free_mapped(gxm_shader_patcher_vertex_usse_addr);
371371
gpu_fragment_usse_free_mapped(gxm_shader_patcher_fragment_usse_addr);
372372
}

‎source/utils/gpu_utils.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,18 @@ void swizzle_compressed_texture(uint8_t *dst, uint8_t *src, int w, int h, int is
105105

106106
void *gpu_alloc_mapped(size_t size, vglMemType *type) {
107107
// Allocating requested memblock
108-
void *res = mempool_alloc(size, *type);
108+
void *res = vgl_mem_alloc(size, *type);
109109

110110
// Requested memory type finished, using other one
111111
if (res == NULL) {
112112
*type = *type == VGL_MEM_VRAM ? VGL_MEM_RAM : VGL_MEM_VRAM;
113-
res = mempool_alloc(size, *type);
113+
res = vgl_mem_alloc(size, *type);
114114
}
115115

116116
// Even the other one failed, using our last resort
117117
if (res == NULL) {
118118
*type = VGL_MEM_SLOW;
119-
res = mempool_alloc(size, *type);
119+
res = vgl_mem_alloc(size, *type);
120120
}
121121

122122
if (res == NULL && use_extra_mem) {
@@ -144,7 +144,7 @@ void gpu_vertex_usse_free_mapped(void *addr) {
144144
sceGxmUnmapVertexUsseMemory(addr);
145145

146146
// Deallocating memblock
147-
mempool_free(addr, vert_usse_type);
147+
vgl_mem_free(addr, vert_usse_type);
148148
}
149149

150150
void *gpu_fragment_usse_alloc_mapped(size_t size, unsigned int *usse_offset) {
@@ -164,7 +164,7 @@ void gpu_fragment_usse_free_mapped(void *addr) {
164164
sceGxmUnmapFragmentUsseMemory(addr);
165165

166166
// Deallocating memblock
167-
mempool_free(addr, frag_usse_type);
167+
vgl_mem_free(addr, frag_usse_type);
168168
}
169169

170170
void *gpu_pool_malloc(unsigned int size) {
@@ -267,7 +267,7 @@ palette *gpu_alloc_palette(const void *data, uint32_t w, uint32_t bpe) {
267267
void gpu_free_texture(texture *tex) {
268268
// Deallocating texture
269269
if (tex->data != NULL)
270-
mempool_free(tex->data, tex->mtype);
270+
vgl_mem_free(tex->data, tex->mtype);
271271

272272
// Invalidating texture object
273273
tex->valid = 0;
@@ -537,6 +537,6 @@ void gpu_free_palette(palette *pal) {
537537
// Deallocating palette memblock and object
538538
if (pal == NULL)
539539
return;
540-
mempool_free(pal->data, pal->type);
540+
vgl_mem_free(pal->data, pal->type);
541541
free(pal);
542542
}

‎source/utils/mem_utils.c

+4-6
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ void mem_term(void) {
268268
}
269269
}
270270

271-
int mem_init(size_t size_ram, size_t size_cdram, size_t size_phycont) {
271+
void vgl_mem_init(size_t size_ram, size_t size_cdram, size_t size_phycont) {
272272
if (mempool_addr[0] != NULL)
273273
mem_term();
274274

@@ -297,25 +297,23 @@ int mem_init(size_t size_ram, size_t size_cdram, size_t size_phycont) {
297297
heap_extend(VGL_MEM_RAM, mempool_addr[1], mempool_size[1]);
298298
if (size_phycont)
299299
heap_extend(VGL_MEM_SLOW, mempool_addr[2], mempool_size[2]);
300-
301-
return 1;
302300
}
303301

304-
void mempool_free(void *ptr, vglMemType type) {
302+
void vgl_mem_free(void *ptr, vglMemType type) {
305303
if (type == VGL_MEM_EXTERNAL)
306304
free(ptr);
307305
else
308306
heap_free(ptr); // type is already stored in heap for alloc'd blocks
309307
}
310308

311-
void *mempool_alloc(size_t size, vglMemType type) {
309+
void *vgl_mem_alloc(size_t size, vglMemType type) {
312310
void *res = NULL;
313311
if (size <= tm_free[type])
314312
res = heap_alloc(type, size, MEM_ALIGNMENT);
315313
return res;
316314
}
317315

318316
// Returns currently free space on mempool
319-
size_t mempool_get_free_space(vglMemType type) {
317+
size_t vgl_mem_get_free_space(vglMemType type) {
320318
return tm_free[type];
321319
}

‎source/utils/mem_utils.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
#ifndef _MEM_UTILS_H_
2525
#define _MEM_UTILS_H_
2626

27-
int mem_init(size_t size_ram, size_t size_cdram, size_t size_phycont); // Initialize mempools
28-
void mem_term(void); // Terminate both CDRAM and RAM mempools
29-
size_t mempool_get_free_space(vglMemType type); // Return free space in bytes for a mempool
30-
void *mempool_alloc(size_t size, vglMemType type); // Allocate a memory block on a mempool
31-
void mempool_free(void *ptr, vglMemType type); // Free a memory block on a mempool
27+
void vgl_mem_init(size_t size_ram, size_t size_cdram, size_t size_phycont); // Initialize internal mempools
28+
void vgl_mem_term(void); // Terminate internal mempools
29+
size_t vgl_mem_get_free_space(vglMemType type); // Return free space in bytes for a mempool
30+
void *vgl_mem_alloc(size_t size, vglMemType type); // Allocate a memory block on a mempool
31+
void vgl_mem_free(void *ptr, vglMemType type); // Free a memory block on a mempool
3232

3333
#endif

‎source/vitaGL.c

+11-11
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ void vglInitWithCustomSizes(uint32_t gpu_pool_size, int width, int height, int r
310310
// Initializing sceGxm
311311
initGxm();
312312

313-
// Initializing memory heap for CDRAM and RAM memory
314-
mem_init(ram_pool_size, cdram_pool_size, phycont_pool_size);
313+
// Initializing memory heaps for CDRAM and RAM memory (both standard and physically contiguous)
314+
vgl_mem_init(ram_pool_size, cdram_pool_size, phycont_pool_size);
315315

316316
// Initializing sceGxm context
317317
initGxmContext();
@@ -737,10 +737,10 @@ void vglEnd(void) {
737737
waitRenderingDone();
738738

739739
// Deallocating default vertices buffers
740-
mempool_free(clear_vertices, VGL_MEM_RAM);
741-
mempool_free(depth_vertices, VGL_MEM_RAM);
742-
mempool_free(depth_clear_indices, VGL_MEM_RAM);
743-
mempool_free(scissor_test_vertices, VGL_MEM_RAM);
740+
vgl_mem_free(clear_vertices, VGL_MEM_RAM);
741+
vgl_mem_free(depth_vertices, VGL_MEM_RAM);
742+
vgl_mem_free(depth_clear_indices, VGL_MEM_RAM);
743+
vgl_mem_free(scissor_test_vertices, VGL_MEM_RAM);
744744

745745
// Releasing shader programs from sceGxmShaderPatcher
746746
sceGxmShaderPatcherReleaseFragmentProgram(gxm_shader_patcher, scissor_test_fragment_program);
@@ -837,7 +837,7 @@ void glDeleteBuffers(GLsizei n, const GLuint *gl_buffers) {
837837
uint8_t idx = gl_buffers[j] - BUFFERS_ADDR;
838838
buffers[idx] = gl_buffers[j];
839839
if (gpu_buffers[idx].ptr != NULL) {
840-
mempool_free(gpu_buffers[idx].ptr, VGL_MEM_VRAM);
840+
vgl_mem_free(gpu_buffers[idx].ptr, VGL_MEM_VRAM);
841841
gpu_buffers[idx].ptr = NULL;
842842
gpu_buffers[idx].size = 0;
843843
}
@@ -871,7 +871,7 @@ void glBufferData(GLenum target, GLsizei size, const GLvoid *data, GLenum usage)
871871

872872
// Free buffer if already existing.
873873
if (gpu_buffers[idx].ptr != NULL)
874-
mempool_free(gpu_buffers[idx].ptr, type);
874+
vgl_mem_free(gpu_buffers[idx].ptr, type);
875875

876876
gpu_buffers[idx].ptr = gpu_alloc_mapped(size, &type);
877877
gpu_buffers[idx].size = size;
@@ -2223,17 +2223,17 @@ void vglDrawObjects(GLenum mode, GLsizei count, GLboolean implicit_wvp) {
22232223
size_t vglMemFree(vglMemType type) {
22242224
if (type >= VGL_MEM_TYPE_COUNT)
22252225
return 0;
2226-
return mempool_get_free_space(type);
2226+
return vgl_mem_get_free_space(type);
22272227
}
22282228

22292229
void *vglAlloc(uint32_t size, vglMemType type) {
22302230
if (type >= VGL_MEM_TYPE_COUNT)
22312231
return NULL;
2232-
return mempool_alloc(size, type);
2232+
return vgl_mem_alloc(size, type);
22332233
}
22342234

22352235
void vglFree(void *addr) {
2236-
mempool_free(addr, VGL_MEM_RAM); // Type is discarded so we just pass a random one
2236+
vgl_mem_free(addr, VGL_MEM_RAM); // Type is discarded so we just pass a random one
22372237
}
22382238

22392239
void vglUseExtraMem(GLboolean use) {

0 commit comments

Comments
 (0)