Skip to content

feat: add mod mem to ref gl #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
pollend wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

feat: add mod mem to ref gl #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ad020ff
feat: add mod mem to ref gl
pollend Feb 26, 2024
ef06cec
tweak import logic
pollend Feb 26, 2024
d7f6215
feat: implement mempool changes for ref_gl
pollend Feb 27, 2024
144fbd4
feat: tweak malloc aligned
pollend Feb 27, 2024
1144710
feat: add calloc and add validation logic
pollend Feb 28, 2024
eb16f2a
feat: migrate more of ref_gl to mem api and add STRESS_TEST
pollend Feb 28, 2024
70063bf
feat: tweak Q_LinkToPool
pollend Feb 28, 2024
5d0f198
feat: remove old allocator
pollend Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions source/client/cl_vid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "cin.h"
#include "ftlib.h"
#include "xpm.h"
#include "../qcommon/mod_mem.h"

cvar_t *vid_ref;
cvar_t *vid_width, *vid_height;
Expand Down Expand Up @@ -316,7 +317,11 @@ static bool VID_LoadRefresh( const char *name )
GetRefAPI_t GetRefAPI_f;

VID_UnloadRefresh();

vid_ref_mempool = Q_CreatePool( NULL, "Refresh" );
struct mem_import_s memImport = DECLARE_MEM_STRUCT(vid_ref_mempool);

import.memImport = &memImport;
import.fsImport = &default_fs_imports_s;
import.Com_Error = &Com_Error;
import.Com_Printf = &Com_Printf;
Expand Down Expand Up @@ -353,14 +358,6 @@ static bool VID_LoadRefresh( const char *name )
import.CIN_Reset = &CIN_Reset;
import.CIN_Close = &CIN_Close;

import.Mem_AllocPool = &VID_RefModule_MemAllocPool;
import.Mem_FreePool = &VID_RefModule_MemFreePool;
import.Mem_EmptyPool = &VID_RefModule_MemEmptyPool;
import.Mem_AllocExt = &VID_RefModule_MemAllocExt;
import.Mem_Free = &VID_RefModule_MemFree;
import.Mem_Realloc = &_Mem_Realloc;
import.Mem_PoolTotalSize = &Mem_PoolTotalSize;

import.Thread_Create = QThread_Create;
import.Thread_Join = QThread_Join;
import.Thread_Yield = QThread_Yield;
Expand Down Expand Up @@ -393,22 +390,30 @@ static bool VID_LoadRefresh( const char *name )
// load succeeded
int api_version;
ref_export_t *rep;


rep = GetRefAPI_f( &import );
re = *rep;
vid_ref_mempool = Mem_AllocPool( NULL, "Refresh" );
api_version = re.API();

if( api_version != REF_API_VERSION ) {
// wrong version
Com_Printf( "Wrong version: %i, not %i.\n", api_version, REF_API_VERSION );
VID_UnloadRefresh();
if(vid_ref_mempool) {
Q_FreePool(vid_ref_mempool);
vid_ref_mempool = NULL;
}
return false;
}
}
else
{
Com_Printf( "Not found %s.\n", va( LIB_DIRECTORY "/" LIB_PREFIX "%s_" ARCH LIB_SUFFIX, name ) );
if(vid_ref_mempool) {
Q_FreePool(vid_ref_mempool);
vid_ref_mempool = NULL;
}
return false;
}

Expand Down
Loading