Merge pull request #540 from asarium/bmpman/loading

Move texture loading out of graphics code

Author: The-E

code/bmpman/bmpman.cpp

@@ -913,6 +913,110 @@ int bm_is_valid(int handle) {
 	return (bm_bitmaps[handle % MAX_BITMAPS].handle == handle);
 }
 
+
+// Load an image and validate it while retrieving information for later use
+// Input:	type		= current BM_TYPE_*
+//			n			= location in bm_bitmaps[]
+//			filename	= name of the current file
+//			img_cfp		= already open CFILE handle, if available
+//
+// Output:	w			= bmp width
+//			h			= bmp height
+//			bpp			= bmp bits per pixel
+//			c_type		= output for an updated BM_TYPE_*
+//			mm_lvl		= number of mipmap levels for the image
+//			size		= size of the data contained in the image
+static int bm_load_info(BM_TYPE type, int n, const char *filename, CFILE *img_cfp, int *w, int *h, int *bpp, BM_TYPE *c_type, int *mm_lvl, int *size)
+{
+	int dds_ct;
+
+	if (type == BM_TYPE_DDS) {
+		int dds_error = dds_read_header(filename, img_cfp, w, h, bpp, &dds_ct, mm_lvl, size);
+
+		if (dds_error != DDS_ERROR_NONE) {
+			mprintf(("DDS ERROR: Couldn't open '%s' -- %s\n", filename, dds_error_string(dds_error)));
+			return -1;
+		}
+
+		switch (dds_ct) {
+		case DDS_DXT1:
+			*c_type = BM_TYPE_DXT1;
+			break;
+
+		case DDS_DXT3:
+			*c_type = BM_TYPE_DXT3;
+			break;
+
+		case DDS_DXT5:
+			*c_type = BM_TYPE_DXT5;
+			break;
+
+		case DDS_UNCOMPRESSED:
+			*c_type = BM_TYPE_DDS;
+			break;
+
+		case DDS_CUBEMAP_DXT1:
+			*c_type = BM_TYPE_CUBEMAP_DXT1;
+			break;
+
+		case DDS_CUBEMAP_DXT3:
+			*c_type = BM_TYPE_CUBEMAP_DXT3;
+			break;
+
+		case DDS_CUBEMAP_DXT5:
+			*c_type = BM_TYPE_CUBEMAP_DXT5;
+			break;
+
+		case DDS_CUBEMAP_UNCOMPRESSED:
+			*c_type = BM_TYPE_CUBEMAP_DDS;
+			break;
+
+		default:
+			Error(LOCATION, "Bad DDS file compression! Not using DXT1,3,5: %s", filename);
+			return -1;
+		}
+	}
+	// if its a tga file
+	else if (type == BM_TYPE_TGA) {
+		int tga_error = targa_read_header(filename, img_cfp, w, h, bpp, NULL);
+		if (tga_error != TARGA_ERROR_NONE) {
+			mprintf(("tga: Couldn't open '%s'\n", filename));
+			return -1;
+		}
+	}
+	// if its a png file
+	else if (type == BM_TYPE_PNG) {
+		int png_error = png_read_header(filename, img_cfp, w, h, bpp, NULL);
+		if (png_error != PNG_ERROR_NONE) {
+			mprintf(("png: Couldn't open '%s'\n", filename));
+			return -1;
+		}
+	}
+	// if its a jpg file
+	else if (type == BM_TYPE_JPG) {
+		int jpg_error = jpeg_read_header(filename, img_cfp, w, h, bpp, NULL);
+		if (jpg_error != JPEG_ERROR_NONE) {
+			mprintf(("jpg: Couldn't open '%s'\n", filename));
+			return -1;
+		}
+	}
+	// if its a pcx file
+	else if (type == BM_TYPE_PCX) {
+		int pcx_error = pcx_read_header(filename, img_cfp, w, h, bpp, NULL);
+		if (pcx_error != PCX_ERROR_NONE) {
+			mprintf(("pcx: Couldn't open '%s'\n", filename));
+			return -1;
+		}
+	}
+	else {
+		Assertion(false, "Unknown file type specified! This is probably a coding error.");
+
+		return -1;
+	}
+
+	return 0;
+}
+
 int bm_load(const char *real_filename) {
 	int i, free_slot = -1;
 	int w, h, bpp = 8;
@@ -985,7 +1089,7 @@ int bm_load(const char *real_filename) {
 		goto Done;
 	}
 
-	rc = gr_bm_load(type, free_slot, filename, img_cfp, &w, &h, &bpp, &c_type, &mm_lvl, &bm_size);
+	rc = bm_load_info(type, free_slot, filename, img_cfp, &w, &h, &bpp, &c_type, &mm_lvl, &bm_size);
 
 	if (rc != 0)
 		goto Done;
@@ -1111,6 +1215,109 @@ bool bm_load_and_parse_eff(const char *filename, int dir_type, int *nframes, int
 	return true;
 }
 
+
+/**
+* Lock an image files data into memory
+*/
+static int bm_load_image_data(const char *filename, int handle, int bitmapnum, ubyte bpp, ubyte flags, bool nodebug)
+{
+	BM_TYPE c_type = BM_TYPE_NONE;
+	ubyte true_bpp;
+
+	bitmap_entry *be = &bm_bitmaps[bitmapnum];
+	bitmap *bmp = &be->bm;
+
+	Assert(!Is_standalone);
+
+	if (bmp->true_bpp > bpp)
+		true_bpp = bmp->true_bpp;
+	else
+		true_bpp = bpp;
+
+	// don't do a bpp check here since it could be different in OGL - taylor
+	if (bmp->data == 0) {
+		Assert(be->ref_count == 1);
+
+		if (be->type != BM_TYPE_USER && !nodebug) {
+			if (bmp->data == 0)
+				nprintf(("BmpMan", "Loading %s for the first time.\n", be->filename));
+		}
+
+		if (!Bm_paging) {
+			if (be->type != BM_TYPE_USER && !nodebug)
+				nprintf(("Paging", "Loading %s (%dx%dx%d)\n", be->filename, bmp->w, bmp->h, true_bpp));
+		}
+
+		// select proper format
+		if (flags & BMP_AABITMAP)
+			BM_SELECT_ALPHA_TEX_FORMAT();
+		else if (flags & BMP_TEX_ANY)
+			BM_SELECT_TEX_FORMAT();
+		else
+			BM_SELECT_SCREEN_FORMAT();
+
+		// make sure we use the real graphic type for EFFs
+		if (be->type == BM_TYPE_EFF) {
+			c_type = be->info.ani.eff.type;
+		}
+		else {
+			c_type = be->type;
+		}
+
+		switch (c_type)
+		{
+		case BM_TYPE_PCX:
+			bm_lock_pcx(handle, bitmapnum, be, bmp, true_bpp, flags);
+			break;
+
+		case BM_TYPE_ANI:
+			bm_lock_ani(handle, bitmapnum, be, bmp, true_bpp, flags);
+			break;
+
+		case BM_TYPE_TGA:
+			bm_lock_tga(handle, bitmapnum, be, bmp, true_bpp, flags);
+			break;
+
+		case BM_TYPE_PNG:
+			//libpng handles compression with zlib
+			bm_lock_png(handle, bitmapnum, be, bmp, true_bpp, flags);
+			break;
+
+		case BM_TYPE_JPG:
+			bm_lock_jpg(handle, bitmapnum, be, bmp, true_bpp, flags);
+			break;
+
+		case BM_TYPE_DDS:
+		case BM_TYPE_DXT1:
+		case BM_TYPE_DXT3:
+		case BM_TYPE_DXT5:
+		case BM_TYPE_CUBEMAP_DDS:
+		case BM_TYPE_CUBEMAP_DXT1:
+		case BM_TYPE_CUBEMAP_DXT3:
+		case BM_TYPE_CUBEMAP_DXT5:
+			bm_lock_dds(handle, bitmapnum, be, bmp, true_bpp, flags);
+			break;
+
+		case BM_TYPE_USER:
+			bm_lock_user(handle, bitmapnum, be, bmp, true_bpp, flags);
+			break;
+
+		default:
+			Warning(LOCATION, "Unsupported type in bm_lock -- %d\n", c_type);
+			return -1;
+		}
+
+		// always go back to screen format
+		BM_SELECT_SCREEN_FORMAT();
+
+		// make sure we actually did something
+		if (!(bmp->data))
+			return -1;
+	}
+
+	return 0;
+}
+
 int bm_load_animation(const char *real_filename, int *nframes, int *fps, int *keyframe, int can_drop_frames, int dir_type) {
 	int	i, n;
 	anim	the_anim;
@@ -1279,7 +1486,7 @@ int bm_load_animation(const char *real_filename, int *nframes, int *fps, int *ke
 			sprintf(bm_bitmaps[n + i].info.ani.eff.filename, "%s_%.4d", clean_name, i);
 
 			// gr_bm_load() returns non-0 on failure
-			if (gr_bm_load(eff_type, n + i, bm_bitmaps[n + i].info.ani.eff.filename, NULL, &anim_width, &anim_height, &bpp, &c_type, &mm_lvl, &img_size)) {
+			if (bm_load_info(eff_type, n + i, bm_bitmaps[n + i].info.ani.eff.filename, NULL, &anim_width, &anim_height, &bpp, &c_type, &mm_lvl, &img_size)) {
 				// if we didn't get anything then bail out now
 				if (i == 0) {
 					Warning(LOCATION, "EFF: No frame images were found.  EFF, %s, is invalid.\n", filename);
@@ -1504,13 +1711,21 @@ bitmap * bm_lock(int handle, ubyte bpp, ubyte flags, bool nodebug) {
 #endif
 
 	// read the file data
-	if (gr_bm_lock(be->filename, handle, bitmapnum, bpp, flags, nodebug) == -1) {
+	if (bm_load_image_data(be->filename, handle, bitmapnum, bpp, flags, nodebug) == -1) {
 		// oops, this isn't good - reset and return NULL
 		bm_unlock( handle );
 		bm_unload( handle );
 
 		return NULL;
 	}
+	
+	if (!gr_bm_data(bitmapnum, bmp)) {
+		// graphics subsystem failed, reset and return NULL
+		bm_unlock( handle );
+		bm_unload( handle );
+
+		return NULL;
+	}
 
 	MONITOR_INC(NumBitmapPage, 1);
 	MONITOR_INC(SizeBitmapPage, bmp->w*bmp->h);

code/cmdline/cmdline.cpp

@@ -146,7 +146,6 @@ Flag exe_params[] =
 	{ "-fb_explosions",		"Enable Framebuffer Shockwaves",			true,	EASY_ALL_ON,		EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-fb_explosions", },
 	{ "-no_deferred",		"Disable Deferred Lighting",				true,	EASY_DEFAULT_MEM,	EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_deferred"},
 	{ "-enable_shadows",	"Enable Shadows",							true,	EASY_MEM_ALL_ON,	EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_shadows"},
-	{ "-img2dds",			"Compress non-compressed images",			true,	0,					EASY_DEFAULT,		"Game Speed",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-img2dds", },
 	{ "-no_vsync",			"Disable vertical sync",					true,	0,					EASY_DEFAULT,		"Game Speed",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_vsync", },
 	{ "-cache_bitmaps",		"Cache bitmaps between missions",			true,	0,					EASY_DEFAULT_MEM,	"Game Speed",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-cache_bitmaps", },
 
@@ -345,12 +344,10 @@ int Cmdline_no_deferred_lighting = 0;
 
 // Game Speed related
 cmdline_parm cache_bitmaps_arg("-cache_bitmaps", NULL, AT_NONE);	// Cmdline_cache_bitmaps
-cmdline_parm img2dds_arg("-img2dds", NULL, AT_NONE);			// Cmdline_img2dds
 cmdline_parm no_fpscap("-no_fps_capping", "Don't limit frames-per-second", AT_NONE);	// Cmdline_NoFPSCap
 cmdline_parm no_vsync_arg("-no_vsync", NULL, AT_NONE);		// Cmdline_no_vsync
 
 int Cmdline_cache_bitmaps = 0;	// caching of bitmaps between missions (faster loads, can hit swap on reload with <512 Meg RAM though) - taylor
-int Cmdline_img2dds = 0;
 int Cmdline_NoFPSCap = 0; // Disable FPS capping - kazan
 int Cmdline_no_vsync = 0;
 
@@ -1554,9 +1551,6 @@ bool SetCmdlineParams()
 		Cmdline_no_di_mouse = 1;
 	}
 
-	if ( img2dds_arg.found() )
-		Cmdline_img2dds = 1;
-
 	if ( glow_arg.found() )
 		Cmdline_glow = 0;
 

code/cmdline/cmdline.h

@@ -83,7 +83,6 @@ extern int Cmdline_no_deferred_lighting;
 
 // Game Speed related
 extern int Cmdline_cache_bitmaps;
-extern int Cmdline_img2dds;
 extern int Cmdline_NoFPSCap;
 extern int Cmdline_no_vsync;
 

code/graphics/2d.h

@@ -557,10 +557,9 @@ typedef struct screen {
 	// Here be the bitmap functions
 	void (*gf_bm_free_data)(int n, bool release);
 	void (*gf_bm_create)(int n);
-	int(*gf_bm_load)(BM_TYPE type, int n, const char *filename, CFILE *img_cfp, int *w, int *h, int *bpp, BM_TYPE *c_type, int *mm_lvl, int *size);
 	void (*gf_bm_init)(int n);
 	void (*gf_bm_page_in_start)();
-	int (*gf_bm_lock)(const char *filename, int handle, int bitmapnum, ubyte bpp, ubyte flags, bool nodebug);
+	bool (*gf_bm_data)(int n, bitmap* bm);
 
 	int (*gf_bm_make_render_target)(int n, int *width, int *height, ubyte *bpp, int *mm_lvl, int flags );
 	int (*gf_bm_set_render_target)(int n, int face);
@@ -891,12 +890,8 @@ __inline int gr_tcache_set(int bitmap_id, int bitmap_type, float *u_scale, float
 #define gr_bm_free_data				GR_CALL(*gr_screen.gf_bm_free_data)
 #define gr_bm_create				GR_CALL(*gr_screen.gf_bm_create)
 #define gr_bm_init					GR_CALL(*gr_screen.gf_bm_init)
-__inline int gr_bm_load(BM_TYPE type, int n, const char *filename, CFILE *img_cfp = NULL, int *w = 0, int *h = 0, int *bpp = 0, BM_TYPE *c_type = 0, int *mm_lvl = 0, int *size = 0)
-{
-	return (*gr_screen.gf_bm_load)(type, n, filename, img_cfp, w, h, bpp, c_type, mm_lvl, size);
-}
 #define gr_bm_page_in_start			GR_CALL(*gr_screen.gf_bm_page_in_start)
-#define gr_bm_lock					GR_CALL(*gr_screen.gf_bm_lock)          
+#define gr_bm_data					GR_CALL(*gr_screen.gf_bm_data)
 
 #define gr_bm_make_render_target					GR_CALL(*gr_screen.gf_bm_make_render_target)          
 

code/graphics/gropengl.cpp

@@ -1831,9 +1831,8 @@ void opengl_setup_function_pointers()
 	gr_screen.gf_bm_free_data			= gr_opengl_bm_free_data;
 	gr_screen.gf_bm_create				= gr_opengl_bm_create;
 	gr_screen.gf_bm_init				= gr_opengl_bm_init;
-	gr_screen.gf_bm_load				= gr_opengl_bm_load;
 	gr_screen.gf_bm_page_in_start		= gr_opengl_bm_page_in_start;
-	gr_screen.gf_bm_lock				= gr_opengl_bm_lock;
+	gr_screen.gf_bm_data				= gr_opengl_bm_data;
 	gr_screen.gf_bm_make_render_target	= gr_opengl_bm_make_render_target;
 	gr_screen.gf_bm_set_render_target	= gr_opengl_bm_set_render_target;