Compare commits
	
		
			1 commit
		
	
	
		
			master
			...
			ttm_fglrx_
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
							 | 
						dcf77bde78 | 
					 3 changed files with 8 additions and 0 deletions
				
			
		| 
						 | 
					@ -832,6 +832,11 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	bool fastBlit = !p->touchesTaintedArea(posRect) && txtAlpha == 1.0;
 | 
						bool fastBlit = !p->touchesTaintedArea(posRect) && txtAlpha == 1.0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// Hack for broken fglrx on SI cards: always use
 | 
				
			||||||
 | 
						// render pipeline to blit text
 | 
				
			||||||
 | 
						if (shState->config().forceBitmapBlit)
 | 
				
			||||||
 | 
							fastBlit = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (fastBlit)
 | 
						if (fastBlit)
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		if (squeeze == 1.0)
 | 
							if (squeeze == 1.0)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -46,6 +46,7 @@ Config::Config()
 | 
				
			||||||
      fixedFramerate(0),
 | 
					      fixedFramerate(0),
 | 
				
			||||||
      frameSkip(true),
 | 
					      frameSkip(true),
 | 
				
			||||||
      solidFonts(false),
 | 
					      solidFonts(false),
 | 
				
			||||||
 | 
					      forceBitmapBlit(false),
 | 
				
			||||||
      gameFolder("."),
 | 
					      gameFolder("."),
 | 
				
			||||||
      anyAltToggleFS(false),
 | 
					      anyAltToggleFS(false),
 | 
				
			||||||
      allowSymlinks(false),
 | 
					      allowSymlinks(false),
 | 
				
			||||||
| 
						 | 
					@ -67,6 +68,7 @@ void Config::read(int argc, char *argv[])
 | 
				
			||||||
	PO_DESC(fixedFramerate, int) \
 | 
						PO_DESC(fixedFramerate, int) \
 | 
				
			||||||
	PO_DESC(frameSkip, bool) \
 | 
						PO_DESC(frameSkip, bool) \
 | 
				
			||||||
	PO_DESC(solidFonts, bool) \
 | 
						PO_DESC(solidFonts, bool) \
 | 
				
			||||||
 | 
						PO_DESC(forceBitmapBlit, bool) \
 | 
				
			||||||
	PO_DESC(gameFolder, std::string) \
 | 
						PO_DESC(gameFolder, std::string) \
 | 
				
			||||||
	PO_DESC(anyAltToggleFS, bool) \
 | 
						PO_DESC(anyAltToggleFS, bool) \
 | 
				
			||||||
	PO_DESC(allowSymlinks, bool) \
 | 
						PO_DESC(allowSymlinks, bool) \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -43,6 +43,7 @@ struct Config
 | 
				
			||||||
	bool frameSkip;
 | 
						bool frameSkip;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	bool solidFonts;
 | 
						bool solidFonts;
 | 
				
			||||||
 | 
						bool forceBitmapBlit;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	std::string gameFolder;
 | 
						std::string gameFolder;
 | 
				
			||||||
	bool anyAltToggleFS;
 | 
						bool anyAltToggleFS;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue