Merge pull request #543 from asarium/cleanup/graphics

Clean up the renderer interface

Author: The-E

code/freespace2/freespace.cpp

@@ -3897,97 +3897,6 @@ void john_debug_stuff(vec3d *eye_pos, matrix *eye_orient)
 }
 #endif
 
-// following function for dumping frames for purposes of building trailers.
-#ifndef NDEBUG
-
-// function to toggle state of dumping every frame into PCX when playing the game
-DCF(dump_frames, "Toggles On/off frame dumping at 15 hz")
-{
-	if ( Debug_dump_frames == 0 )	{
-		// Turn it on
-		Debug_dump_frames = 15;
-		Debug_dump_trigger = 0;
-		gr_dump_frame_start( Debug_dump_frame_num, DUMP_BUFFER_NUM_FRAMES );
-		dc_printf( "Frame dumping at 15 hz is now ON\n" );
-	} else {
-		// Turn it off
-		Debug_dump_frames = 0;
-		Debug_dump_trigger = 0;
-		gr_dump_frame_stop();
-		dc_printf( "Frame dumping is now OFF\n" );
-	}
-}
-
-DCF(dump_frames_trigger, "Starts/stop frame dumping at 15 hz")
-{
-	if ( Debug_dump_frames == 0 )	{
-		// Turn it on
-		Debug_dump_frames = 15;
-		Debug_dump_trigger = 1;
-		gr_dump_frame_start( Debug_dump_frame_num, DUMP_BUFFER_NUM_FRAMES );
-		dc_printf( "Frame dumping at 15 hz is now ON\n" );
-	} else {
-		// Turn it off
-		Debug_dump_frames = 0;
-		Debug_dump_trigger = 0;
-		gr_dump_frame_stop();
-		dc_printf( "Frame dumping is now OFF\n" );
-	}
-}
-
-DCF(dump_frames30, "Starts/stop frame dumping at 30 hz")
-{
-	if ( Debug_dump_frames == 0 )	{
-		// Turn it on
-		Debug_dump_frames = 30;
-		Debug_dump_trigger = 0;
-		gr_dump_frame_start( Debug_dump_frame_num, DUMP_BUFFER_NUM_FRAMES );
-		dc_printf( "Frame dumping at 30 hz is now ON\n" );
-	} else {
-		// Turn it off
-		Debug_dump_frames = 0;
-		Debug_dump_trigger = 0;
-		gr_dump_frame_stop();
-		dc_printf( "Frame dumping is now OFF\n" );
-	}
-}
-
-DCF(dump_frames30_trigger, "Starts/stop frame dumping at 30 hz")
-{
-	if ( Debug_dump_frames == 0 )	{
-		// Turn it on
-		Debug_dump_frames = 30;
-		Debug_dump_trigger = 1;
-		gr_dump_frame_start( Debug_dump_frame_num, DUMP_BUFFER_NUM_FRAMES );
-		dc_printf( "Triggered frame dumping at 30 hz is now ON\n" );
-	} else {
-		// Turn it off
-		Debug_dump_frames = 0;
-		Debug_dump_trigger = 0;
-		gr_dump_frame_stop();
-		dc_printf( "Triggered frame dumping is now OFF\n" );
-	}
-}
-
-void game_maybe_dump_frame()
-{
-	if ( !Debug_dump_frames ){
-		return;
-	}
-
-	if( Debug_dump_trigger && !keyd_pressed[KEY_Q] ){
-		return;
-	}
-
-	game_stop_time();
-
-	gr_dump_frame();
-	Debug_dump_frame_num++;
-
-	game_start_time();
-}
-#endif
-
 extern int Player_dead_state;
 
 //	Flip the page and time how long it took.
@@ -4620,9 +4529,6 @@ void game_frame(bool paused)
 				DEBUG_GET_TIME( flip_time2 )
 			}
 
-#ifndef NDEBUG
-			game_maybe_dump_frame();			// used to dump pcx files for building trailers
-#endif		
 		} else {
 			game_show_standalone_framerate();
 		}

code/graphics/2d.cpp

@@ -849,7 +849,6 @@ static bool gr_init_sub(int mode, int width, int height, int depth, float center
 	gr_screen.bits_per_pixel = depth;
 	gr_screen.bytes_per_pixel= depth / 8;
 	gr_screen.rendering_to_texture = -1;
-	gr_screen.recording_state_block = false;
 	gr_screen.envmap_render_target = -1;
 	gr_screen.mode = mode;
 	gr_screen.res = res;

code/graphics/2d.h

@@ -405,23 +405,12 @@ typedef struct screen {
 
 	int envmap_render_target;
 
-	bool recording_state_block;
-	int current_state_block;
-
-	void (*gf_start_state_block)();
-	int (*gf_end_state_block)();
-	void (*gf_set_state_block)(int);
-
 	//switch onscreen, offscreen
 	void (*gf_flip)();
 
 	// Sets the current palette
 	void (*gf_set_palette)(const ubyte *new_pal, int restrict_alphacolor);
-
-	// Fade the screen in/out
-	void (*gf_fade_in)(int instantaneous);
-	void (*gf_fade_out)(int instantaneous);
-
+	
 	// Flash the screen
 	void (*gf_flash)( int r, int g, int b );
 	void (*gf_flash_alpha)(int r, int g, int b, int a);
@@ -511,17 +500,7 @@ typedef struct screen {
 
 	// Frees up a saved screen.
 	void (*gf_free_screen)(int id);
-
-	// CODE FOR DUMPING FRAMES TO A FILE
-	// Begin frame dumping
-	void (*gf_dump_frame_start)( int first_frame_number, int nframes_between_dumps );
-
-	// Dump the current frame to file
-	void (*gf_dump_frame)();
-
-	// Dump the current frame to file
-	void (*gf_dump_frame_stop)();
-
+	
 	// Sets the gamma
 	void (*gf_set_gamma)(float gamma);
 
@@ -583,11 +562,7 @@ typedef struct screen {
 
 	int (*gf_create_stream_buffer)();
 	void (*gf_render_stream_buffer)(int buffer_handle, int offset, int n_verts, int flags);
-
-	int	 (*gf_make_flat_buffer)(poly_list*);
-	int	 (*gf_make_line_buffer)(line_list*);
 
-
 	//the projection matrix; fov, aspect ratio, near, far
  	void (*gf_set_proj_matrix)(float, float, float, float);
   	void (*gf_end_proj_matrix)();
@@ -634,7 +609,6 @@ typedef struct screen {
 	void (*gf_end_clip_plane)();
 
 	void (*gf_zbias)(int zbias);
-	void (*gf_setup_background_fog)(bool);
 
 	void (*gf_set_fill_mode)(int);
 	void (*gf_set_texture_panning)(float u, float v, bool enable);
@@ -836,8 +810,6 @@ __inline void gr_gradient(int x1, int y1, int x2, int y2, int resize_mode = GR_R
 	(*gr_screen.gf_gradient)(x1, y1, x2, y2, resize_mode);
 }
 
-#define gr_fade_in			GR_CALL(gr_screen.gf_fade_in)
-#define gr_fade_out			GR_CALL(gr_screen.gf_fade_out)
 #define gr_flash			GR_CALL(gr_screen.gf_flash)
 #define gr_flash_alpha		GR_CALL(gr_screen.gf_flash_alpha)
 
@@ -854,10 +826,6 @@ __inline void gr_gradient(int x1, int y1, int x2, int y2, int resize_mode = GR_R
 #define gr_restore_screen	GR_CALL(gr_screen.gf_restore_screen)
 #define gr_free_screen		GR_CALL(gr_screen.gf_free_screen)
 
-#define gr_dump_frame_start	GR_CALL(gr_screen.gf_dump_frame_start)
-#define gr_dump_frame_stop		GR_CALL(gr_screen.gf_dump_frame_stop)
-#define gr_dump_frame			GR_CALL(gr_screen.gf_dump_frame)
-
 #define gr_set_gamma			GR_CALL(gr_screen.gf_set_gamma)
 
 #define gr_get_region		GR_CALL(gr_screen.gf_get_region)
@@ -921,9 +889,6 @@ __inline void gr_render_buffer(int start, const vertex_buffer *bufferp, int texi
 #define gr_render_stream_buffer_end		GR_CALL(*gr_screen.gf_render_stream_buffer_end)
 
 #define gr_set_buffer					GR_CALL(*gr_screen.gf_set_buffer)      
-      
-#define gr_make_flat_buffer				GR_CALL(*gr_screen.gf_make_flat_buffer)            
-#define gr_make_line_buffer				GR_CALL(*gr_screen.gf_make_line_buffer)            
 
 #define gr_set_proj_matrix					GR_CALL(*gr_screen.gf_set_proj_matrix)            
 #define gr_end_proj_matrix					GR_CALL(*gr_screen.gf_end_proj_matrix)            
@@ -968,12 +933,6 @@ __inline void gr_render_buffer(int start, const vertex_buffer *bufferp, int texi
 #define	gr_set_fill_mode				GR_CALL(*gr_screen.gf_set_fill_mode)
 #define	gr_set_texture_panning			GR_CALL(*gr_screen.gf_set_texture_panning)
 
-#define	gr_start_state_block			GR_CAL(*gr_screen.gf_start_state_block)
-#define	gr_end_state_block				GR_CALL(*gr_screen.gf_end_state_block)
-#define	gr_set_state_block				GR_CALL(*gr_screen.gf_set_state_block)
-
-#define gr_setup_background_fog			GR_CALL(*gr_screen.gf_setup_background_fog)
-
 #define gr_draw_line_list				GR_CALL(*gr_screen.gf_draw_line_list)
 
 #define gr_set_line_width				GR_CALL(*gr_screen.gf_set_line_width)

code/graphics/gropengl.cpp

@@ -76,13 +76,6 @@ static ushort *GL_original_gamma_ramp = NULL;
 int Use_VBOs = 0;
 int Use_PBOs = 0;
 
-static int GL_dump_frames = 0;
-static ubyte *GL_dump_buffer = NULL;
-static int GL_dump_frame_number = 0;
-static int GL_dump_frame_count = 0;
-static int GL_dump_frame_count_max = 0;
-static int GL_dump_frame_size = 0;
-
 static ubyte *GL_saved_screen = NULL;
 static ubyte *GL_saved_mouse_data = NULL;
 static int GL_saved_screen_id = -1;
@@ -1153,96 +1146,6 @@ void gr_opengl_free_screen(int bmp_id)
 	GL_saved_screen_id = -1;
 }
 
-static void opengl_flush_frame_dump()
-{
-	char filename[MAX_FILENAME_LEN];
-
-	Assert( GL_dump_buffer != NULL);
-
-	for (int i = 0; i < GL_dump_frame_count; i++) {
-		sprintf(filename, NOX("frm%04d.tga"), GL_dump_frame_number );
-		GL_dump_frame_number++;
-
-		CFILE *f = cfopen(filename, "wb", CFILE_NORMAL, CF_TYPE_DATA);
-
-		// Write the TGA header
-		cfwrite_ubyte( 0, f );	//	IDLength;
-		cfwrite_ubyte( 0, f );	//	ColorMapType;
-		cfwrite_ubyte( 2, f );	//	ImageType;		// 2 = 24bpp, uncompressed, 10=24bpp rle compressed
-		cfwrite_ushort( 0, f );	// CMapStart;
-		cfwrite_ushort( 0, f );	//	CMapLength;
-		cfwrite_ubyte( 0, f );	// CMapDepth;
-		cfwrite_ushort( 0, f );	//	XOffset;
-		cfwrite_ushort( 0, f );	//	YOffset;
-		cfwrite_ushort( (ushort)gr_screen.max_w, f );	//	Width;
-		cfwrite_ushort( (ushort)gr_screen.max_h, f );	//	Height;
-		cfwrite_ubyte( 24, f );	//PixelDepth;
-		cfwrite_ubyte( 0, f );	//ImageDesc;
-
-		glReadBuffer(GL_FRONT);
-		glReadPixels(0, 0, gr_screen.max_w, gr_screen.max_h, GL_BGR_EXT, GL_UNSIGNED_BYTE, GL_dump_buffer);
-
-		// save the data out
-		cfwrite( GL_dump_buffer, GL_dump_frame_size, 1, f );
-
-		cfclose(f);
-
-	}
-
-	GL_dump_frame_count = 0;
-}
-
-void gr_opengl_dump_frame_start(int first_frame, int frames_between_dumps)
-{
-	if ( GL_dump_frames )	{
-		Int3();		//  We're already dumping frames.  See John.
-		return;
-	}
-
-	GL_dump_frames = 1;
-	GL_dump_frame_number = first_frame;
-	GL_dump_frame_count = 0;
-	GL_dump_frame_count_max = frames_between_dumps; // only works if it's 1
-	GL_dump_frame_size = gr_screen.max_w * gr_screen.max_h * 3;
-
-	if ( !GL_dump_buffer ) {
-		int size = GL_dump_frame_count_max * GL_dump_frame_size;
-
-		GL_dump_buffer = (ubyte *)vm_malloc(size);
-
-		if ( !GL_dump_buffer )	{
-			Error(LOCATION, "Unable to malloc %d bytes for dump buffer", size );
-		}
-	}
-}
-
-void gr_opengl_dump_frame_stop()
-{
-	if ( !GL_dump_frames )	{
-		Int3();		//  We're not dumping frames.  See John.
-		return;
-	}
-
-	// dump any remaining frames
-	opengl_flush_frame_dump();
-
-	GL_dump_frames = 0;
-
-	if ( GL_dump_buffer )	{
-		vm_free(GL_dump_buffer);
-		GL_dump_buffer = NULL;
-	}
-}
-
-void gr_opengl_dump_frame()
-{
-	GL_dump_frame_count++;
-
-	if ( GL_dump_frame_count == GL_dump_frame_count_max ) {
-		opengl_flush_frame_dump();
-	}
-}
-
 //fill mode, solid/wire frame
 void gr_opengl_set_fill_mode(int mode)
 {
@@ -1327,13 +1230,6 @@ void gr_opengl_translate_texture_matrix(int unit, const vec3d *shift)
 //	tex_shift=vmd_zero_vector;
 }
 
-void gr_opengl_setup_background_fog(bool set)
-{
-	if (Cmdline_nohtl) {
-		return;
-	}
-}
-
 void gr_opengl_set_line_width(float width)
 {
 	glLineWidth(width);
@@ -1798,8 +1694,6 @@ void opengl_setup_function_pointers()
 	gr_screen.gf_set_palette		= gr_opengl_set_palette;
 	gr_screen.gf_print_screen		= gr_opengl_print_screen;
 
-	gr_screen.gf_fade_in			= gr_opengl_fade_in;
-	gr_screen.gf_fade_out			= gr_opengl_fade_out;
 	gr_screen.gf_flash				= gr_opengl_flash;
 	gr_screen.gf_flash_alpha		= gr_opengl_flash_alpha;
 
@@ -1816,10 +1710,6 @@ void opengl_setup_function_pointers()
 	gr_screen.gf_restore_screen		= gr_opengl_restore_screen;
 	gr_screen.gf_free_screen		= gr_opengl_free_screen;
 
-	gr_screen.gf_dump_frame_start	= gr_opengl_dump_frame_start;
-	gr_screen.gf_dump_frame_stop	= gr_opengl_dump_frame_stop;
-	gr_screen.gf_dump_frame			= gr_opengl_dump_frame;
-
 	gr_screen.gf_set_gamma			= gr_opengl_set_gamma;
 
 	gr_screen.gf_fog_set			= gr_opengl_fog_set;
@@ -1913,12 +1803,6 @@ void opengl_setup_function_pointers()
 	gr_screen.gf_center_alpha		= gr_opengl_center_alpha;
 	gr_screen.gf_set_thrust_scale	= gr_opengl_set_thrust_scale;
 
-	gr_screen.gf_setup_background_fog	= gr_opengl_setup_background_fog;
-
-	gr_screen.gf_start_state_block	= gr_opengl_start_state_block;
-	gr_screen.gf_end_state_block	= gr_opengl_end_state_block;
-	gr_screen.gf_set_state_block	= gr_opengl_set_state_block;
-
 	gr_screen.gf_draw_line_list		= gr_opengl_draw_line_list;
 
 	gr_screen.gf_set_line_width		= gr_opengl_set_line_width;

code/graphics/gropengldraw.cpp

@@ -2036,17 +2036,6 @@ void gr_opengl_flash_alpha(int r, int g, int b, int a)
 	opengl_draw_coloured_quad((GLint)x1, (GLint)y1, (GLint)x2, (GLint)y2);
 }
 
-
-void gr_opengl_fade_in(int instantaneous)
-{
-	// Empty - DDOI
-}
-
-void gr_opengl_fade_out(int instantaneous)
-{
-	// Empty - DDOI
-}
-
 void opengl_bitmap_ex_internal(int x, int y, int w, int h, int sx, int sy, int resize_mode)
 {
 	if ( (w < 1) || (h < 1) ) {