integrating recent changes from fermi-test into fermi

(i'll use "fermi" for more disruptive changes to the pipeline model such
as updating the MSHRs and getting rid of the warp tracker, ripping out DWF, etc...)

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7805]

1 files changed, 0 insertions, 43 deletions

diff --git a/benchmarks/CUDA/RAY/EasyBMP_VariousBMPutilities.h b/benchmarks/CUDA/RAY/EasyBMP_VariousBMPutilities.h
deleted file mode 100644
index 349dda6..0000000
--- a/benchmarks/CUDA/RAY/EasyBMP_VariousBMPutilities.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*************************************************
-*                                                *
-*  EasyBMP Cross-Platform Windows Bitmap Library * 
-*                                                *
-*  Author: Paul Macklin                          *
-*   email: [email protected]       *
-* support: http://easybmp.sourceforge.net        *
-*                                                *
-*          file: EasyBMP_VariousBMPutilities.h   *
-*    date added: 05-02-2005                      *
-* date modified: 12-01-2006                      *
-*       version: 1.06                            *
-*                                                *
-*   License: BSD (revised/modified)              *
-* Copyright: 2005-6 by the EasyBMP Project       * 
-*                                                *
-* description: Various utilities.                *
-*                                                *
-*************************************************/
-
-#ifndef _EasyBMP_VariousBMPutilities_h_
-#define _EasyBMP_VariousBMPutilities_h_
-
-BMFH GetBMFH( const char* szFileNameIn );
-BMIH GetBMIH( const char* szFileNameIn );
-void DisplayBitmapInfo( const char* szFileNameIn );
-int GetBitmapColorDepth( const char* szFileNameIn );
-void PixelToPixelCopy( BMP& From, int FromX, int FromY,  
-                       BMP& To, int ToX, int ToY);
-void PixelToPixelCopyTransparent( BMP& From, int FromX, int FromY,  
-                                  BMP& To, int ToX, int ToY,
-                                  RGBApixel& Transparent );
-void RangedPixelToPixelCopy( BMP& From, int FromL , int FromR, int FromB, int FromT, 
-                             BMP& To, int ToX, int ToY );
-void RangedPixelToPixelCopyTransparent( 
-     BMP& From, int FromL , int FromR, int FromB, int FromT, 
-     BMP& To, int ToX, int ToY ,
-     RGBApixel& Transparent );
-bool CreateGrayscaleColorTable( BMP& InputImage );
-
-bool Rescale( BMP& InputImage , char mode, int NewDimension );
-
-#endif