Revert "Merge remote-tracking branch 'mercury/patch-openmp' into develop"

This reverts commit 026057ed, reversing
changes made to 0cf955ec.

gframe/drawing.cpp

@@ -1262,12 +1262,7 @@ void Game::DrawDeckBd() {
 		driver->draw2DRectangle(Resize(805, 160, 1020, 630), 0x400000ff, 0x400000ff, 0x40000000, 0x40000000);
 		driver->draw2DRectangleOutline(Resize(804, 159, 1020, 630));
 	}
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
-	constexpr int MAX_RESULT = 9;
-#else
-	constexpr int MAX_RESULT = 7;
-#endif
-	for(int i = 0; i < MAX_RESULT && i + scrFilter->getPos() < (int)deckBuilder.results.size(); ++i) {
+	for(int i = 0; i < 9 && i + scrFilter->getPos() < (int)deckBuilder.results.size(); ++i) {
 		code_pointer ptr = deckBuilder.results[i + scrFilter->getPos()];
 		if(i >= 7)
 		{

gframe/image_manager.cpp

 #include "image_manager.h"
 #include "game.h"
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
 #include <thread>
-#endif
-#ifdef _OPENMP
-#include <omp.h>
-#endif
 
 namespace ygo {
 
@@ -22,10 +17,8 @@ bool ImageManager::Initial() {
 	tUnknownFit = nullptr;
 	tUnknownThumb = nullptr;
 	tBigPicture = nullptr;
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
 	tLoading = nullptr;
 	tThumbLoadingThreadRunning = false;
-#endif
 	tAct = driver->getTexture("textures/act.png");
 	tAttack = driver->getTexture("textures/attack.png");
 	tChain = driver->getTexture("textures/chain.png");
@@ -66,11 +59,7 @@ void ImageManager::ClearTexture() {
 			driver->removeTexture(tit->second);
 	}
 	for(auto tit = tThumb.begin(); tit != tThumb.end(); ++tit) {
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
 		if(tit->second && tit->second != tLoading)
-#else
-		if(tit->second)
-#endif
 			driver->removeTexture(tit->second);
 	}
 	if(tBigPicture != nullptr) {
@@ -80,14 +69,12 @@ void ImageManager::ClearTexture() {
 	tMap[0].clear();
 	tMap[1].clear();
 	tThumb.clear();
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
 	tThumbLoadingMutex.lock();
 	tThumbLoading.clear();
 	while(!tThumbLoadingCodes.empty())
 		tThumbLoadingCodes.pop();
 	tThumbLoadingThreadRunning = false;
 	tThumbLoadingMutex.unlock();
-#endif
 	tFields.clear();
 }
 void ImageManager::RemoveTexture(int code) {
@@ -123,13 +110,11 @@ void ImageManager::ResizeTexture() {
 	driver->removeTexture(tUnknown);
 	driver->removeTexture(tUnknownFit);
 	driver->removeTexture(tUnknownThumb);
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
 	driver->removeTexture(tLoading);
-	tLoading = GetTextureFromFile("textures/cover.jpg", imgWidthThumb, imgHeightThumb);
-#endif
 	tUnknown = GetTextureFromFile("textures/unknown.jpg", CARD_IMG_WIDTH, CARD_IMG_HEIGHT);
 	tUnknownFit = GetTextureFromFile("textures/unknown.jpg", imgWidthFit, imgHeightFit);
 	tUnknownThumb = GetTextureFromFile("textures/unknown.jpg", imgWidthThumb, imgHeightThumb);
+	tLoading = GetTextureFromFile("textures/cover.jpg", imgWidthThumb, imgHeightThumb);
 	driver->removeTexture(tBackGround);
 	tBackGround = GetTextureFromFile("textures/bg.jpg", bgWidth, bgHeight);
 	driver->removeTexture(tBackGround_menu);
@@ -143,27 +128,25 @@ void ImageManager::ResizeTexture() {
 }
 // function by Warr1024, from https://github.com/minetest/minetest/issues/2419 , modified
 void imageScaleNNAA(irr::video::IImage *src, irr::video::IImage *dest) {
-	const irr::core::dimension2d<irr::u32> srcDim = src->getDimension();
-	const irr::core::dimension2d<irr::u32> destDim = dest->getDimension();
-
-	// Cache scale ratios.
-	const double rx = (double)srcDim.Width / destDim.Width;
-	const double ry = (double)srcDim.Height / destDim.Height;
-
-#pragma omp parallel
-{
 	double sx, sy, minsx, maxsx, minsy, maxsy, area, ra, ga, ba, aa, pw, ph, pa;
-	irr::video::SColor pxl, npxl;
+	irr::u32 dy, dx;
+	irr::video::SColor pxl;
+
+	// Cache rectsngle boundaries.
+	double sw = src->getDimension().Width * 1.0;
+	double sh = src->getDimension().Height * 1.0;
 
 	// Walk each destination image pixel.
-#pragma omp for schedule(dynamic)
-	for(irr::s32 dy = 0; dy < destDim.Height; dy++) {
-		for(irr::s32 dx = 0; dx < destDim.Width; dx++) {
+	// Note: loop y around x for better cache locality.
+	irr::core::dimension2d<irr::u32> dim = dest->getDimension();
+	for(dy = 0; dy < dim.Height; dy++)
+		for(dx = 0; dx < dim.Width; dx++) {
+
 			// Calculate floating-point source rectangle bounds.
-			minsx = dx * rx;
-			maxsx = minsx + rx;
-			minsy = dy * ry;
-			maxsy = minsy + ry;
+			minsx = dx * sw / dim.Width;
+			maxsx = minsx + sw / dim.Width;
+			minsy = dy * sh / dim.Height;
+			maxsy = minsy + sh / dim.Height;
 
 			// Total area, and integral of r, g, b values over that area,
 			// initialized to zero, to be summed up in next loops.
@@ -174,8 +157,9 @@ void imageScaleNNAA(irr::video::IImage *src, irr::video::IImage *dest) {
 			aa = 0;
 
 			// Loop over the integral pixel positions described by those bounds.
-			for(sy = floor(minsy); sy < maxsy; sy++) {
+			for(sy = floor(minsy); sy < maxsy; sy++)
 				for(sx = floor(minsx); sx < maxsx; sx++) {
+
 					// Calculate width, height, then area of dest pixel
 					// that's covered by this source pixel.
 					pw = 1;
@@ -199,20 +183,21 @@ void imageScaleNNAA(irr::video::IImage *src, irr::video::IImage *dest) {
 					ba += pa * pxl.getBlue();
 					aa += pa * pxl.getAlpha();
 				}
-			}
+
 			// Set the destination image pixel to the average color.
 			if(area > 0) {
-				npxl.set((irr::u32)(aa / area + 0.5),
-						 (irr::u32)(ra / area + 0.5),
-						 (irr::u32)(ga / area + 0.5),
-						 (irr::u32)(ba / area + 0.5));
+				pxl.setRed(ra / area + 0.5);
+				pxl.setGreen(ga / area + 0.5);
+				pxl.setBlue(ba / area + 0.5);
+				pxl.setAlpha(aa / area + 0.5);
 			} else {
-				npxl.set(0);
+				pxl.setRed(0);
+				pxl.setGreen(0);
+				pxl.setBlue(0);
+				pxl.setAlpha(0);
 			}
-			dest->setPixel(dx, dy, npxl);
+			dest->setPixel(dx, dy, pxl);
 		}
-	}
-} // end of parallel region
 }
 irr::video::ITexture* ImageManager::GetTextureFromFile(const char* file, irr::s32 width, irr::s32 height) {
 	if(mainGame->gameConf.use_image_scale) {
@@ -298,7 +283,6 @@ irr::video::ITexture* ImageManager::GetBigPicture(int code, float zoom) {
 	tBigPicture = texture;
 	return texture;
 }
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
 int ImageManager::LoadThumbThread() {
 	while(true) {
 		imageManager.tThumbLoadingMutex.lock();
@@ -354,34 +338,9 @@ int ImageManager::LoadThumbThread() {
 	imageManager.tThumbLoadingMutex.unlock();
 	return 0;
 }
-#endif // YGOPRO_USE_THUMB_LOAD_THERAD
 irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
 	if(code == 0)
 		return tUnknownThumb;
-#ifndef YGOPRO_USE_THUMB_LOAD_THERAD
-	auto tit = tThumb.find(code);
-	if(tit == tThumb.end()) {
-		char file[256];
-		std::snprintf(file, sizeof file, "expansions/pics/thumbnail/%d.jpg", code);
-		int width = CARD_THUMB_WIDTH * mainGame->xScale;
-		int height = CARD_THUMB_HEIGHT * mainGame->yScale;
-		irr::video::ITexture* img = GetTextureFromFile(file, width, height);
-		if(img == NULL) {
-			std::snprintf(file, sizeof file, "pics/thumbnail/%d.jpg", code);
-			img = GetTextureFromFile(file, width, height);
-		}
-		if(img == NULL && mainGame->gameConf.use_image_scale) {
-			std::snprintf(file, sizeof file, "expansions/pics/%d.jpg", code);
-			img = GetTextureFromFile(file, width, height);
-			if(img == NULL) {
-				std::snprintf(file, sizeof file, "pics/%d.jpg", code);
-				img = GetTextureFromFile(file, width, height);
-			}
-		}
-		tThumb[code] = img;
-		return (img == NULL) ? tUnknownThumb : img;
-	}
-#else // YGOPRO_USE_THUMB_LOAD_THERAD
 	imageManager.tThumbLoadingMutex.lock();
 	auto lit = tThumbLoading.find(code);
 	if(lit != tThumbLoading.end()) {
@@ -409,7 +368,6 @@ irr::video::ITexture* ImageManager::GetTextureThumb(int code) {
 		imageManager.tThumbLoadingMutex.unlock();
 		return tLoading;
 	}
-#endif // YGOPRO_USE_THUMB_LOAD_THERAD
 	if(tit->second)
 		return tit->second;
 	else

gframe/image_manager.h

 #ifndef IMAGEMANAGER_H
 #define IMAGEMANAGER_H
 
-#ifndef _OPENMP
-#define YGOPRO_USE_THUMB_LOAD_THERAD
-#endif
-
 #include "config.h"
 #include "data_manager.h"
 #include <unordered_map>
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
 #include <queue>
 #include <mutex>
-#endif
 
 namespace ygo {
 
@@ -27,19 +21,15 @@ public:
 	irr::video::ITexture* GetBigPicture(int code, float zoom);
 	irr::video::ITexture* GetTextureThumb(int code);
 	irr::video::ITexture* GetTextureField(int code);
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
 	static int LoadThumbThread();
-#endif
 
 	std::unordered_map<int, irr::video::ITexture*> tMap[2];
 	std::unordered_map<int, irr::video::ITexture*> tThumb;
 	std::unordered_map<int, irr::video::ITexture*> tFields;
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
 	std::unordered_map<int, irr::video::IImage*> tThumbLoading;
 	std::queue<int> tThumbLoadingCodes;
 	std::mutex tThumbLoadingMutex;
 	bool tThumbLoadingThreadRunning;
-#endif
 	irr::IrrlichtDevice* device;
 	irr::video::IVideoDriver* driver;
 	irr::video::ITexture* tCover[4];
@@ -47,9 +37,7 @@ public:
 	irr::video::ITexture* tUnknownFit;
 	irr::video::ITexture* tUnknownThumb;
 	irr::video::ITexture* tBigPicture;
-#ifdef YGOPRO_USE_THUMB_LOAD_THERAD
 	irr::video::ITexture* tLoading;
-#endif
 	irr::video::ITexture* tAct;
 	irr::video::ITexture* tAttack;
 	irr::video::ITexture* tNegated;

gframe/premake5.lua

@@ -5,7 +5,6 @@ project "YGOPro"
     kind "WindowedApp"
     cppdialect "C++14"
     rtti "Off"
-    openmp "On"
 
     files { "*.cpp", "*.h" }
     includedirs { "../ocgcore" }
@@ -84,7 +83,6 @@ project "YGOPro"
     filter "not system:windows"
         links { "event_pthreads", "dl", "pthread" }
     filter "system:macosx"
-        openmp "Off"
         links { "z" }
         defines { "GL_SILENCE_DEPRECATION" }
         if MAC_ARM then
@@ -96,7 +94,6 @@ project "YGOPro"
         end
     filter "system:linux"
         links { "GL", "X11", "Xxf86vm" }
-        linkoptions { "-fopenmp" }
         if USE_AUDIO and AUDIO_LIB == "irrklang" then
             links { "IrrKlang" }
             linkoptions{ IRRKLANG_LINK_RPATH }