Textures Manager

engine/client/cl_game.c

@@ -29,6 +29,7 @@ GNU General Public License for more details.
 #include "vgui_draw.h"
 #include "sound.h"		// SND_STOP_LOOPING
 #include "platform/platform.h"
+#include "resman/resman.h"
 
 #define MAX_LINELENGTH	80
 #define MAX_TEXTCHANNELS	8		// must be power of two (GoldSrc uses 4 channels)

engine/client/cl_gameui.c

@@ -20,6 +20,7 @@ GNU General Public License for more details.
 #include "input.h"
 #include "server.h" // !!svgame.hInstance
 #include "vid_common.h"
+#include "resman/texture.h"
 
 static void 	UI_UpdateUserinfo( void );
 
@@ -545,7 +546,7 @@ static HIMAGE GAME_EXPORT pfnPIC_Load( const char *szPicName, const byte *image_
 	SetBits( flags, TF_IMAGE );
 
 	Image_SetForceFlags( IL_LOAD_DECAL ); // allow decal images for menu
-	tx = ref.dllFuncs.GL_LoadTexture( szPicName, image_buf, image_size, flags );
+	tx = RM_LoadTexture( szPicName, image_buf, image_size, flags );
 	Image_ClearForceFlags();
 
 	return tx;
@@ -1091,7 +1092,7 @@ static void GAME_EXPORT pfnStartBackgroundTrack( const char *introTrack, const c
 
 static void GAME_EXPORT GL_ProcessTexture( int texnum, float gamma, int topColor, int bottomColor )
 {
-	ref.dllFuncs.GL_ProcessTexture( texnum, gamma, topColor, bottomColor );
+	ref.dllFuncs.R_ProcessTexture( texnum, gamma, topColor, bottomColor );
 }
 
 

engine/client/cl_main.c

@@ -3063,6 +3063,8 @@ void CL_Init( void )
 
 	CL_InitLocal();
 
+	RM_Init();  // init resource manager
+
 	VID_Init();	// init video
 	S_Init();	// init sound
 

engine/client/cl_remap.c

@@ -110,7 +110,7 @@ void CL_DuplicateTexture( cl_entity_t *entity, model_t *model, mstudiotexture_t
 
 	// save off the real texture index
 	index = ptexture->index;
-	name = ref.dllFuncs.GL_TextureName( index );
+	name = RM_TextureName( index );
 	Q_snprintf( texname, sizeof( texname ), "#%i_%s", entity->curstate.number, name + 1 );
 
 	// search for pixels
@@ -128,7 +128,7 @@ void CL_DuplicateTexture( cl_entity_t *entity, model_t *model, mstudiotexture_t
 	memcpy( paletteBackup, pal, 768 );
 
 	raw = CL_CreateRawTextureFromPixels( tx, &size, topcolor, bottomcolor );
-	ptexture->index = ref.dllFuncs.GL_LoadTexture( texname, raw, size, TF_FORCE_COLOR ); // do copy
+	ptexture->index = RM_LoadTexture( texname, raw, size, TF_FORCE_COLOR ); // do copy
 
 	// restore original palette
 	memcpy( pal, paletteBackup, 768 );
@@ -153,15 +153,15 @@ void CL_UpdateStudioTexture( cl_entity_t *entity, mstudiotexture_t *ptexture, in
 	byte		*raw, *pal;
 
 	// save off the real texture index
-	origtexname = ref.dllFuncs.GL_TextureName( ptexture->index );
+	origtexname = RM_TextureName( ptexture->index );
 
 	// build name of original texture
 	Q_strncpy( mdlname, entity->model->name, sizeof( mdlname ));
 	COM_FileBase( ptexture->name, name );
 	COM_StripExtension( mdlname );
 
 	Q_snprintf( texname, sizeof( texname ), "#%s/%s.mdl", mdlname, name );
-	index = ref.dllFuncs.GL_FindTexture( texname );
+	index = RM_LoadTexture( texname );
 	if( !index ) return; // couldn't find texture
 
 	// search for pixels
@@ -231,7 +231,7 @@ void CL_UpdateAliasTexture( cl_entity_t *entity, unsigned short *texture, int sk
 	}
 
 	// and now we can remap with internal routines
-	ref.dllFuncs.GL_ProcessTexture( *texture, -1.0f, topcolor, bottomcolor );
+	ref.dllFuncs.R_ProcessTexture( *texture, -1.0f, topcolor, bottomcolor );
 }
 
 /*
@@ -402,11 +402,11 @@ void CL_FreeRemapInfo( remap_info_t *info )
 		if( info->ptexture != NULL )
 		{
 			if( FBitSet( info->ptexture[i].flags, STUDIO_NF_COLORMAP ))
-				ref.dllFuncs.GL_FreeTexture( info->ptexture[i].index );
+				RM_FreeTexture( info->ptexture[i].index );
 		}
 
 		if( info->textures[i] != 0 )
-			ref.dllFuncs.GL_FreeTexture( info->textures[i] );
+			RM_FreeTexture( info->textures[i] );
 	}
 
 	Mem_Free( info ); // release struct

engine/client/cl_render.c

@@ -17,6 +17,7 @@ GNU General Public License for more details.
 #include "client.h"
 #include "library.h"
 #include "platform/platform.h"
+#include "resman/resman.h"
 
 int R_FatPVS( const vec3_t org, float radius, byte *visbuffer, qboolean merge, qboolean fullvis )
 {
@@ -285,14 +286,14 @@ static void R_FillRenderAPIFromRef( render_api_t *to, const ref_interface_t *fro
 	to->GetFrameTime             = from->GetFrameTime;
 	to->R_SetCurrentEntity       = from->R_SetCurrentEntity;
 	to->R_SetCurrentModel        = from->R_SetCurrentModel;
-	to->GL_FindTexture           = from->GL_FindTexture;
-	to->GL_TextureName           = from->GL_TextureName;
-	to->GL_TextureData           = from->GL_TextureData;
-	to->GL_LoadTexture           = from->GL_LoadTexture;
-	to->GL_CreateTexture         = from->GL_CreateTexture;
-	to->GL_LoadTextureArray      = from->GL_LoadTextureArray;
-	to->GL_CreateTextureArray    = from->GL_CreateTextureArray;
-	to->GL_FreeTexture           = from->GL_FreeTexture;
+	to->GL_FindTexture           = &RM_FindTexture;
+	to->GL_TextureName           = &RM_TextureName;
+	to->GL_TextureData           = &RM_TextureData;
+	to->GL_LoadTexture           = &RM_LoadTexture;
+	to->GL_CreateTexture         = &RM_CreateTexture;
+	to->GL_LoadTextureArray      = &RM_LoadTextureArray;
+	to->GL_CreateTextureArray    = &RM_CreateTextureArray;
+	to->GL_FreeTexture           = &RM_FreeTexture;
 	to->DrawSingleDecal          = from->DrawSingleDecal;
 	to->R_DecalSetupVerts        = from->R_DecalSetupVerts;
 	to->R_EntityRemoveDecals     = from->R_EntityRemoveDecals;

engine/client/cl_scrn.c

@@ -376,7 +376,7 @@ void SCR_DrawPlaque( void )
 {
 	if(( cl_allow_levelshots->value && !cls.changelevel ) || cl.background )
 	{
-		int levelshot = ref.dllFuncs.GL_LoadTexture( cl_levelshot_name->string, NULL, 0, TF_IMAGE );
+		int levelshot = RM_LoadTexture( cl_levelshot_name->string, NULL, 0, TF_IMAGE );
 		ref.dllFuncs.GL_SetRenderMode( kRenderNormal );
 		ref.dllFuncs.R_DrawStretchPic( 0, 0, refState.width, refState.height, 0, 0, 1, 1, levelshot );
 		if( !cl.background ) CL_DrawHUD( CL_LOADING );
@@ -588,7 +588,7 @@ qboolean SCR_LoadFixedWidthFont( const char *fontname )
 	if( !FS_FileExists( fontname, false ))
 		return false;
 
-	cls.creditsFont.hFontTexture = ref.dllFuncs.GL_LoadTexture( fontname, NULL, 0, TF_IMAGE|TF_KEEP_SOURCE );
+	cls.creditsFont.hFontTexture = RM_LoadTexture( fontname, NULL, 0, TF_IMAGE|TF_KEEP_SOURCE );
 	R_GetTextureParms( &fontWidth, NULL, cls.creditsFont.hFontTexture );
 	cls.creditsFont.charHeight = clgame.scrInfo.iCharHeight = fontWidth / 16;
 	cls.creditsFont.type = FONT_FIXED;
@@ -620,7 +620,7 @@ qboolean SCR_LoadVariableWidthFont( const char *fontname )
 	if( !FS_FileExists( fontname, false ))
 		return false;
 
-	cls.creditsFont.hFontTexture = ref.dllFuncs.GL_LoadTexture( fontname, NULL, 0, TF_IMAGE );
+	cls.creditsFont.hFontTexture = RM_LoadTexture( fontname, NULL, 0, TF_IMAGE );
 	R_GetTextureParms( &fontWidth, NULL, cls.creditsFont.hFontTexture );
 
 	// half-life font with variable chars witdh
@@ -729,24 +729,26 @@ void SCR_RegisterTextures( void )
 	// register gfx.wad images
 
 	if( FS_FileExists( "gfx/paused.lmp", false ))
-		cls.pauseIcon = ref.dllFuncs.GL_LoadTexture( "gfx/paused.lmp", NULL, 0, TF_IMAGE );
+		cls.pauseIcon = RM_LoadTexture( "gfx/paused.lmp", NULL, 0, TF_IMAGE );
 	else if( FS_FileExists( "gfx/pause.lmp", false ))
-		cls.pauseIcon = ref.dllFuncs.GL_LoadTexture( "gfx/pause.lmp", NULL, 0, TF_IMAGE );
+		cls.pauseIcon = RM_LoadTexture( "gfx/pause.lmp", NULL, 0, TF_IMAGE );
 
 	if( FS_FileExists( "gfx/lambda.lmp", false ))
 	{
 		if( cl_allow_levelshots->value )
-			cls.loadingBar = ref.dllFuncs.GL_LoadTexture( "gfx/lambda.lmp", NULL, 0, TF_IMAGE|TF_LUMINANCE );
-		else cls.loadingBar = ref.dllFuncs.GL_LoadTexture( "gfx/lambda.lmp", NULL, 0, TF_IMAGE );
+			cls.loadingBar = RM_LoadTexture( "gfx/lambda.lmp", NULL, 0, TF_IMAGE | TF_LUMINANCE );
+		else
+			cls.loadingBar = RM_LoadTexture( "gfx/lambda.lmp", NULL, 0, TF_IMAGE );
 	}
 	else if( FS_FileExists( "gfx/loading.lmp", false ))
 	{
 		if( cl_allow_levelshots->value )
-			cls.loadingBar = ref.dllFuncs.GL_LoadTexture( "gfx/loading.lmp", NULL, 0, TF_IMAGE|TF_LUMINANCE );
-		else cls.loadingBar = ref.dllFuncs.GL_LoadTexture( "gfx/loading.lmp", NULL, 0, TF_IMAGE );
+			cls.loadingBar = RM_LoadTexture( "gfx/loading.lmp", NULL, 0, TF_IMAGE | TF_LUMINANCE );
+		else
+			cls.loadingBar = RM_LoadTexture( "gfx/loading.lmp", NULL, 0, TF_IMAGE );
 	}
 
-	cls.tileImage = ref.dllFuncs.GL_LoadTexture( "gfx/backtile.lmp", NULL, 0, TF_NOMIPMAP );
+	cls.tileImage = RM_LoadTexture( "gfx/backtile.lmp", NULL, 0, TF_NOMIPMAP );
 }
 
 /*

engine/client/cl_tent.c

@@ -2969,7 +2969,7 @@ int GAME_EXPORT CL_DecalIndex( int id )
 	if( cl.decal_index[id] == 0 )
 	{
 		Image_SetForceFlags( IL_LOAD_DECAL );
-		cl.decal_index[id] = ref.dllFuncs.GL_LoadTexture( host.draw_decals[id], NULL, 0, TF_DECAL );
+		cl.decal_index[id] = RM_LoadTexture( host.draw_decals[id], NULL, 0, TF_DECAL );
 		Image_ClearForceFlags();
 	}
 

engine/client/cl_view.c

@@ -489,7 +489,7 @@ void V_PostRender( void )
 		SV_DrawOrthoTriangles();
 		CL_DrawDemoRecording();
 		CL_DrawHUD( CL_CHANGELEVEL );
-		ref.dllFuncs.R_ShowTextures();
+		//ref.dllFuncs.R_ShowTextures();
 		R_ShowTree();
 		Con_DrawConsole();
 		UI_UpdateMenu( host.realtime );

engine/client/console.c

@@ -21,6 +21,7 @@ GNU General Public License for more details.
 #include "qfont.h"
 #include "wadfile.h"
 #include "input.h"
+#include "resman/resman.h"
 
 convar_t	*con_notifytime;
 convar_t	*scr_conspeed;
@@ -569,7 +570,7 @@ static qboolean Con_LoadFixedWidthFont( const char *fontname, cl_font_t *font )
 		return false;
 
 	// keep source to print directly into conback image
-	font->hFontTexture = ref.dllFuncs.GL_LoadTexture( fontname, NULL, 0, TF_FONT|TF_KEEP_SOURCE );
+	font->hFontTexture = RM_LoadTexture( fontname, NULL, 0, TF_FONT|TF_KEEP_SOURCE );
 	R_GetTextureParms( &fontWidth, NULL, font->hFontTexture );
 
 	if( font->hFontTexture && fontWidth != 0 )
@@ -605,7 +606,7 @@ static qboolean Con_LoadVariableWidthFont( const char *fontname, cl_font_t *font
 	if( !FS_FileExists( fontname, false ))
 		return false;
 
-	font->hFontTexture = ref.dllFuncs.GL_LoadTexture( fontname, NULL, 0, TF_FONT|TF_NEAREST );
+	font->hFontTexture = RM_LoadTexture( fontname, NULL, 0, TF_FONT|TF_NEAREST );
 	R_GetTextureParms( &fontWidth, NULL, font->hFontTexture );
 
 	// setup consolefont
@@ -2477,28 +2478,28 @@ void Con_VidInit( void )
 	{
 		// trying to load truecolor image first
 		if( FS_FileExists( "gfx/shell/conback.bmp", false ) || FS_FileExists( "gfx/shell/conback.tga", false ))
-			con.background = ref.dllFuncs.GL_LoadTexture( "gfx/shell/conback", NULL, 0, TF_IMAGE );
+			con.background = RM_LoadTexture( "gfx/shell/conback", NULL, 0, TF_IMAGE );
 
 		if( !con.background )
 		{
 			if( FS_FileExists( "cached/conback640", false ))
-				con.background = ref.dllFuncs.GL_LoadTexture( "cached/conback640", NULL, 0, TF_IMAGE );
+				con.background = RM_LoadTexture( "cached/conback640", NULL, 0, TF_IMAGE );
 			else if( FS_FileExists( "cached/conback", false ))
-				con.background = ref.dllFuncs.GL_LoadTexture( "cached/conback", NULL, 0, TF_IMAGE );
+				con.background = RM_LoadTexture( "cached/conback", NULL, 0, TF_IMAGE );
 		}
 	}
 	else
 	{
 		// trying to load truecolor image first
 		if( FS_FileExists( "gfx/shell/loading.bmp", false ) || FS_FileExists( "gfx/shell/loading.tga", false ))
-			con.background = ref.dllFuncs.GL_LoadTexture( "gfx/shell/loading", NULL, 0, TF_IMAGE );
+			con.background = RM_LoadTexture( "gfx/shell/loading", NULL, 0, TF_IMAGE );
 
 		if( !con.background )
 		{
 			if( FS_FileExists( "cached/loading640", false ))
-				con.background = ref.dllFuncs.GL_LoadTexture( "cached/loading640", NULL, 0, TF_IMAGE );
+				con.background = RM_LoadTexture( "cached/loading640", NULL, 0, TF_IMAGE );
 			else if( FS_FileExists( "cached/loading", false ))
-				con.background = ref.dllFuncs.GL_LoadTexture( "cached/loading", NULL, 0, TF_IMAGE );
+				con.background = RM_LoadTexture( "cached/loading", NULL, 0, TF_IMAGE );
 		}
 	}
 
@@ -2533,13 +2534,13 @@ void Con_VidInit( void )
 				y = len;
 				for( x = 0; x < y; x++ )
 					Con_DrawCharToConback( ver[x], buf, dest + (x << 3));
-				con.background = ref.dllFuncs.GL_LoadTexture( "#gfx/conback.lmp", (byte *)cb, length, TF_IMAGE );
+				con.background = RM_LoadTexture( "#gfx/conback.lmp", (byte *)cb, length, TF_IMAGE );
 			}
 			if( cb ) Mem_Free( cb );
 		}
 
 		if( !con.background ) // trying the load unmodified conback
-			con.background = ref.dllFuncs.GL_LoadTexture( "gfx/conback.lmp", NULL, 0, TF_IMAGE );
+			con.background = RM_LoadTexture( "gfx/conback.lmp", NULL, 0, TF_IMAGE );
 	}
 
 	// missed console image will be replaced as gray background like X-Ray or Crysis

engine/client/in_touch.c

@@ -18,6 +18,7 @@ GNU General Public License for more details.
 #include "math.h"
 #include "vgui_draw.h"
 #include "mobility_int.h"
+#include "resman/resman.h"
 
 typedef enum
 {
@@ -1138,7 +1139,7 @@ static void Touch_InitConfig( void )
 	else Touch_LoadDefaults_f( );
 
 	Touch_InitEditor();
-	touch.joytexture = ref.dllFuncs.GL_LoadTexture( touch_joy_texture->string, NULL, 0, TF_NOMIPMAP );
+	touch.joytexture = RM_LoadTexture( touch_joy_texture->string, NULL, 0, TF_NOMIPMAP );
 	touch.whitetexture = R_GetBuiltinTexture( REF_WHITE_TEXTURE );
 	touch.configchanged = false;
 	touch.config_loaded = true;
@@ -1319,7 +1320,7 @@ static void Touch_DrawButtons( touchbuttonlist_t *list )
 			{
 				if( button->texture == -1 )
 				{
-					button->texture = ref.dllFuncs.GL_LoadTexture( button->texturefile, NULL, 0, TF_NOMIPMAP );
+					button->texture = RM_LoadTexture( button->texturefile, NULL, 0, TF_NOMIPMAP );
 				}
 
 				if( FBitSet( B(flags), TOUCH_FL_DRAW_ADDITIVE ))
@@ -1454,7 +1455,7 @@ void Touch_Draw( void )
 		if( FBitSet( touch_joy_texture->flags, FCVAR_CHANGED ) )
 		{
 			ClearBits( touch_joy_texture->flags, FCVAR_CHANGED );
-			touch.joytexture = ref.dllFuncs.GL_LoadTexture( touch_joy_texture->string, NULL, 0, TF_NOMIPMAP );
+			touch.joytexture = RM_LoadTexture( touch_joy_texture->string, NULL, 0, TF_NOMIPMAP );
 		}
 		if( touch.move_button->type == touch_move )
 		{

engine/client/ref_common.c

@@ -4,6 +4,7 @@
 #include "cl_tent.h"
 #include "platform/platform.h"
 #include "vid_common.h"
+#include "resman/resman.h"
 
 struct ref_state_s ref;
 ref_globals_t refState;
@@ -17,12 +18,6 @@ convar_t *gl_msaa_samples;
 convar_t *gl_clear;
 convar_t *r_refdll;
 
-void R_GetTextureParms( int *w, int *h, int texnum )
-{
-	if( w ) *w = REF_GET_PARM( PARM_TEX_WIDTH, texnum );
-	if( h ) *h = REF_GET_PARM( PARM_TEX_HEIGHT, texnum );
-}
-
 /*
 ================
 GL_FreeImage
@@ -37,8 +32,8 @@ void GAME_EXPORT GL_FreeImage( const char *name )
 	if( !ref.initialized )
 		return;
 
-	if(( texnum = ref.dllFuncs.GL_FindTexture( name )) != 0 )
-		 ref.dllFuncs.GL_FreeTexture( texnum );
+	if(( texnum = RM_FindTexture( name )) != 0 )
+		RM_FreeTexture( texnum );
 }
 
 void R_UpdateRefState( void )
@@ -338,6 +333,11 @@ static ref_api_t gEngfuncs =
 	FS_FileExists,
 	FS_AllowDirectPaths,
 
+	RM_LoadTexture,
+	RM_LoadTextureFromBuffer,
+	RM_FindTexture,
+	RM_FreeTexture,
+
 	R_Init_Video_,
 	R_Free_Video,
 
@@ -710,6 +710,8 @@ qboolean R_Init( void )
 				break;
 		}
 	}
+
+	RM_SetRender(&ref.dllFuncs);
 
 	if( !success )
 	{

engine/client/ref_common.h

@@ -36,11 +36,12 @@ extern struct ref_state_s ref;
 extern ref_globals_t refState;
 
 // handy API wrappers
-void R_GetTextureParms( int *w, int *h, int texnum );
 #define REF_GET_PARM( parm, arg ) ref.dllFuncs.RefGetParm( (parm), (arg) )
-#define GL_LoadTextureInternal( name, pic, flags ) ref.dllFuncs.GL_LoadTextureFromBuffer( (name), (pic), (flags), false )
-#define GL_UpdateTextureInternal( name, pic, flags ) ref.dllFuncs.GL_LoadTextureFromBuffer( (name), (pic), (flags), true )
-#define R_GetBuiltinTexture( name ) ref.dllFuncs.GL_LoadTexture( (name), 0, 0, 0 )
+#define GL_LoadTextureInternal( name, pic, flags ) RM_LoadTextureFromBuffer( (name), (pic), (flags), false )
+#define GL_UpdateTextureInternal( name, pic, flags ) RM_LoadTextureFromBuffer( (name), (pic), (flags), true )
+
+#define R_GetTextureParms( WP, HP, T )  RM_GetTextureParams( WP, HP, T )
+#define R_GetBuiltinTexture( NAME )     RM_LoadTexture( NAME, 0, 0, 0 )
 
 void GL_RenderFrame( const struct ref_viewpass_s *rvp );