various experimental texture stuff

GeDoSaTo.vcxproj

@@ -117,7 +117,7 @@
       <TargetMachine>MachineX86</TargetMachine>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
-      <AdditionalDependencies>d3d11.lib;d3dx11.lib;D3DCompiler.lib;Effects11.lib;legacy_stdio_definitions.lib;nvapi.lib;Xinput.lib;libMinHook.x86.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;d3d11.lib;d3dx11.lib;D3DCompiler.lib;Effects11.lib;legacy_stdio_definitions.lib;nvapi.lib;Xinput.lib;libMinHook.x86.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;psapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -162,7 +162,7 @@
     </ClCompile>
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalDependencies>d3d11.lib;d3dx11.lib;D3DCompiler.lib;Effects11.lib;legacy_stdio_definitions.lib;nvapi64.lib;Xinput.lib;libMinHook.x64.lib;winmm.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;d3d11.lib;d3dx11.lib;D3DCompiler.lib;Effects11.lib;legacy_stdio_definitions.lib;nvapi64.lib;Xinput.lib;libMinHook.x64.lib;winmm.lib;psapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
       <MinimumRequiredVersion>
       </MinimumRequiredVersion>
@@ -296,6 +296,7 @@
     <ClCompile Include="source\dxgi\dxgidevice3.cpp" />
     <ClCompile Include="source\dxgi\dxgifactory2.cpp" />
     <ClCompile Include="source\dxgi\dxgifactory3.cpp" />
+    <ClCompile Include="source\ogl\opengl_detouring.cpp" />
     <ClCompile Include="source\perf_monitor.cpp" />
     <ClCompile Include="source\plugins\dw8.cpp" />
     <ClCompile Include="source\plugins\ff13.cpp" />

defs/hooks.def

@@ -73,6 +73,9 @@ HOOK(timeGetTime, "Winmm.dll")
 
 HOOK(SteamFriends, "steam_api.dll")
 
+HOOK(glTexImage2D, "OPENGL32.dll")
+HOOK(glPixelMapfv, "OPENGL32.dll")
+
 //HOOK(GetProcAddress, "Kernel32.dll")
 
 #undef HOOK

include/d3d9/d3d9tex.h

@@ -10,6 +10,8 @@ const extern GUID IID_GedosatoTexture;
 interface hkIDirect3DTexture9 : public IDirect3DTexture9 {
 	IDirect3DTexture9 *m_pWrapped;
 	bool dirty = false;
+	D3DLOCKED_RECT* lockedRect = nullptr;
+	RECT rect;
 
 public:
 	hkIDirect3DTexture9(IDirect3DTexture9 **ppIDirect3DTexture9);

include/renderstate_manager_dx9.h

@@ -109,6 +109,7 @@ class RSManagerDX9 : public RSManager {
 	HRESULT redirectGetDepthStencilSurface(IDirect3DSurface9 ** ppZStencilSurface);
 	void redirectSetCursorPosition(int X, int Y, DWORD Flags);
 
+	HRESULT redirectSetTexture(DWORD Stage, IDirect3DBaseTexture9 *pTexture);
 	HRESULT redirectSetPixelShader(IDirect3DPixelShader9* pShader);
 	HRESULT redirectSetVertexShader(IDirect3DVertexShader9* pvShader);
 	HRESULT redirectSetRenderState(D3DRENDERSTATETYPE State, DWORD Value);

pack/config/whitelist.txt

@@ -76,6 +76,7 @@ ffxiv*                       || Final Fantasy XIV Launcher or Configurator
 FirefallClient               || Firefall
 FoxGame-Win32-Shipping       || Blacklight: Retribution
 fr-041_debris                || "Debris" by Farbrausch
+Grim Dawn                    || Grim Dawn
 grimrock                     || Legend of Grimrock
 grimrock2                    || Legend of Grimrock 2
 GSGameExe_DX9                || Giana Sisters: Twisted Dreams

source/d3d9/d3d9dev.cpp

@@ -660,23 +660,7 @@ HRESULT APIENTRY hkIDirect3DDevice9::SetStreamSourceFreq(UINT StreamNumber,UINT
 HRESULT APIENTRY hkIDirect3DDevice9::SetTexture(DWORD Stage, IDirect3DBaseTexture9 *pTexture) {
 	RSManager::setLatest(rsMan);
 	SDLOG(6, "setTexture %d, %p\n", Stage, pTexture);
-	if(pTexture != NULL && Settings::get().getEnableAlternativeTextureDumping()) {
-		void *unused;
-		if(pTexture->QueryInterface(IID_GedosatoTexture, &unused) == S_OK) {
-			pTexture = reinterpret_cast<hkIDirect3DTexture9*>(pTexture)->m_pWrapped;
-			SDLOG(6, " - wrapper for %p\n", pTexture);
-		}
-	}
-	if(Settings::get().getLogLevel() > 10 && pTexture) {
-		IDirect3DTexture9 *tex;
-		if(pTexture->QueryInterface(IID_IDirect3DTexture9, (void**)&tex) == S_OK) {
-			D3DSURFACE_DESC desc;
-			tex->GetLevelDesc(0, &desc);
-			SDLOG(10, " -- size: %dx%d RT? %s\n", desc.Width, desc.Height, (desc.Usage & D3DUSAGE_RENDERTARGET) ? "true" : "false");
-			tex->Release();
-		}
-	}
-	return m_pD3Ddev->SetTexture(Stage, pTexture);
+	return rsMan->redirectSetTexture(Stage, pTexture);
 }
 
 HRESULT APIENTRY hkIDirect3DDevice9::SetTextureStageState(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) {

source/d3d9/d3d9tex.cpp

@@ -4,6 +4,10 @@
 #include "d3d9/d3d9tex.h"
 
 #include "settings.h"
+#include "utils/win_utils.h"
+#include "utils/d3d9_utils.h"
+#include "utils/imgproc_utils.h"
+#include "renderstate_manager_dx9.h"
 
 
 IDirect3DTexture9* hkIDirect3DTexture9::getTextureToUse() {
@@ -123,14 +127,117 @@ HRESULT APIENTRY hkIDirect3DTexture9::GetSurfaceLevel(UINT Level, IDirect3DSurfa
 	return m_pWrapped->GetSurfaceLevel(Level, ppSurfaceLevel);
 }
 
+
+namespace {
+	void convertToARGB8(const void* in, void* out, int width, int height, int inPitch, D3DFORMAT fmt) {
+		if(fmt == D3DFORMAT::D3DFMT_A8R8G8B8) {
+			for(int y = 0; y < height; ++y) {
+				for(int x = 0; x < width; ++x) {
+					((uint32_t*)out)[0 + x + y*width] = ((uint32_t*)in)[0 + x + y*inPitch/4];
+				}
+			}
+		}
+		//else if(fmt == D3DFORMAT::D3DFMT_A8R8G8B8) {
+		//	for(int y = 0; y < height; ++y) {
+		//		for(int x = 0; x < width; ++x) {
+		//			((BYTE*)out)[0 + x * 4 + y*width * 4] = ((BYTE*)in)[0 + x * 4 + y*inPitch];
+		//			((BYTE*)out)[1 + x * 4 + y*width * 4] = ((BYTE*)in)[3 + x * 4 + y*inPitch];
+		//			((BYTE*)out)[2 + x * 4 + y*width * 4] = ((BYTE*)in)[2 + x * 4 + y*inPitch];
+		//			((BYTE*)out)[3 + x * 4 + y*width * 4] = ((BYTE*)in)[1 + x * 4 + y*inPitch];
+		//		}
+		//	}
+		//}
+		else {
+			SDLOG(-1, "ERROR: texture scaling conversion - unsupported format: %s", D3DFormatToString(fmt));
+		}
+	}
+	void convertFromARGB8(const void* in, void* out, int width, int height, int outPitch, D3DFORMAT fmt) {
+		if(fmt == D3DFORMAT::D3DFMT_A8R8G8B8) {
+			for(int y = 0; y < height; ++y) {
+				for(int x = 0; x < width; ++x) {
+					((uint32_t*)out)[0 + x + y*outPitch/4] = ((uint32_t*)in)[0 + x + y*width];
+				}
+			}
+		}
+		//else if(fmt == D3DFORMAT::D3DFMT_A8R8G8B8) {
+		//	for(int y = 0; y < height; ++y) {
+		//		for(int x = 0; x < width; ++x) {
+		//			((BYTE*)out)[0 + x * 4 + y*outPitch] = ((BYTE*)in)[0 + x * 4 + y*width * 4];
+		//			((BYTE*)out)[1 + x * 4 + y*outPitch] = ((BYTE*)in)[3 + x * 4 + y*width * 4];
+		//			((BYTE*)out)[2 + x * 4 + y*outPitch] = ((BYTE*)in)[2 + x * 4 + y*width * 4];
+		//			((BYTE*)out)[3 + x * 4 + y*outPitch] = ((BYTE*)in)[1 + x * 4 + y*width * 4];
+		//		}
+		//	}
+		//}
+		else {
+			SDLOG(-1, "ERROR: texture scaling inverse conversion - unsupported format: %s", D3DFormatToString(fmt));
+		}
+	}
+}
+
 HRESULT APIENTRY hkIDirect3DTexture9::LockRect(UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) {
 	SDLOG(20, "hkIDirect3DTexture9::LockRect\n");
-	dirty = true;
-	return m_pWrapped->LockRect(Level, pLockedRect, pRect, Flags);
+
+	D3DSURFACE_DESC desc;
+	GetLevelDesc(Level, &desc);
+	if(pRect != nullptr) {
+		rect = *pRect;
+		int width = rect.right - rect.left;
+		int height = rect.bottom - rect.top;
+		rect.left *= Settings::get().getTextureScalingFactor();
+		rect.right = rect.left + width;
+		rect.top *= Settings::get().getTextureScalingFactor();
+		rect.bottom = rect.top + height;
+	} else {
+		rect.left = 0;
+		rect.top = 0;
+		rect.right = desc.Width / Settings::get().getTextureScalingFactor();
+		rect.bottom = desc.Height / Settings::get().getTextureScalingFactor();
+	}
+	auto ret = m_pWrapped->LockRect(Level, pLockedRect, &rect, Flags);
+	if(SUCCEEDED(ret)) {
+		dirty = true;
+		lockedRect = pLockedRect;
+		SDLOG(-1, " -> locked rect %s on texture size %4dx%4d\n", RectToString(&rect), desc.Width, desc.Height);
+	}
+	return ret;
 }
 
 HRESULT APIENTRY hkIDirect3DTexture9::UnlockRect(UINT Level) {
 	SDLOG(20, "hkIDirect3DTexture9::UnlockRect\n");
+	if(lockedRect != nullptr) {
+		SDLOG(-1, " -> unlocking, scaling\n");
+		D3DSURFACE_DESC desc;
+		GetLevelDesc(Level, &desc);
+		SDLOG(-1, " (tex format: %s)\n", D3DSurfaceDescToString(desc));
+		int width = rect.right - rect.left;
+		int height = rect.bottom - rect.top;
+		size_t bytesize = width*height*4;
+		SDLOG(-1, " -> allocating %d\n", bytesize);
+		BYTE* data = new BYTE[bytesize];
+		uint32_t* uintData = (uint32_t*)data;
+		SDLOG(-1, " -> allocated\n");
+		convertToARGB8(lockedRect->pBits, uintData, width, height, lockedRect->Pitch, desc.Format);
+		SDLOG(-1, " -> copied\n");
+		//stbi_write_png(format(R"(C:\tmp\dump\%p_unscaled.png)",m_pWrapped).c_str(), width, height, 4, data, width*4);
+		auto ret = m_pWrapped->UnlockRect(Level);
+		SDLOG(-1, " -> scaling\n");
+		GlobalTexScaler::get().Scale(uintData, width, height, Settings::get().getTextureScalingFactor());
+		D3DLOCKED_RECT relocked;
+		rect.right = rect.left + width;
+		rect.bottom = rect.top + height;
+		if(SUCCEEDED(m_pWrapped->LockRect(Level, &relocked, &rect, 0))) {
+			SDLOG(-1, " -> relocked rect %s pitch %d\n", RectToString(&rect), relocked.Pitch);
+			convertFromARGB8(uintData, relocked.pBits, width, height, relocked.Pitch, desc.Format);
+			SDLOG(-1, " -> copied back\n");
+			//stbi_write_png(format(R"(C:\tmp\dump\%p_scaled.png)", m_pWrapped).c_str(), width, height, 4, uintData, width * 4);
+			m_pWrapped->UnlockRect(Level);
+		}
+		SDLOG(-1, " -> cleaning data\n");
+		delete [] data;
+		lockedRect = nullptr;
+		return ret;
+	}
 	return m_pWrapped->UnlockRect(Level);
 }
 

source/detouring.cpp

@@ -27,6 +27,8 @@
 
 #include "steam/steamfriends.h"
 
+#include <gl/GL.h>
+
 #define GENERATE_INTERCEPT_HEADER(__name, __rettype, __convention, ...) \
 typedef __rettype (__convention * __name##_FNType)(__VA_ARGS__); \
 __name##_FNType True##__name, __name##Pointer; \
@@ -742,6 +744,11 @@ GENERATE_INTERCEPT_HEADER(SteamFriends, ISteamFriends*, WINAPI) {
 	return TrueSteamFriends();
 }
 
+// OpenGL ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+GENERATE_INTERCEPT_HEADER(glTexImage2D, void, WINAPI, GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * data);
+GENERATE_INTERCEPT_HEADER(glPixelMapfv, void, WINAPI, GLenum map, GLsizei mapsize, const GLfloat * values);
+
 // GetProcAddress ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 GENERATE_INTERCEPT_HEADER(GetProcAddress, FARPROC, WINAPI, _In_ HMODULE hModule, _In_ LPCSTR lpProcName) {

source/renderstate_manager_dx9.cpp

@@ -4,6 +4,7 @@
 
 #include "d3d9/d3d9dev_ex.h"
 #include "d3d9/d3d9swap.h"
+#include "d3d9/d3d9tex.h"
 #include "utils/d3d9_utils.h"
 #include "key_actions.h"
 #include "detouring.h"
@@ -828,6 +829,29 @@ void RSManagerDX9::redirectSetCursorPosition(int X, int Y, DWORD Flags) {
 	d3ddev->SetCursorPosition(X, Y, Flags);
 }
 
+HRESULT RSManagerDX9::redirectSetTexture(DWORD Stage, IDirect3DBaseTexture9 *pTexture) {
+	if(pTexture != NULL && (Settings::get().getEnableAlternativeTextureDumping() || Settings::get().getTextureScalingFactor() > 1)) {
+		void *unused;
+		if(pTexture->QueryInterface(IID_GedosatoTexture, &unused) == S_OK) {
+			pTexture = reinterpret_cast<hkIDirect3DTexture9*>(pTexture)->m_pWrapped;
+			SDLOG(6, " - wrapper for %p\n", pTexture);
+		}
+	}
+	if(Settings::get().getLogLevel() > 10 && pTexture) {
+		IDirect3DTexture9 *tex;
+		if(pTexture->QueryInterface(IID_IDirect3DTexture9, (void**)&tex) == S_OK) {
+			D3DSURFACE_DESC desc;
+			tex->GetLevelDesc(0, &desc);
+			SDLOG(10, " -- size: %dx%d RT? %s\n", desc.Width, desc.Height, (desc.Usage & D3DUSAGE_RENDERTARGET) ? "true" : "false");
+			if(dumpingFrame) {
+				dumpTexture(format("framedump_settexture%03u_stage%d_texture_%p", renderTargetSwitches++, Stage, pTexture).c_str(), tex);
+			}
+			tex->Release();
+		}
+	}
+	return d3ddev->SetTexture(Stage, pTexture);
+}
+
 HRESULT RSManagerDX9::redirectSetPixelShader(IDirect3DPixelShader9* pShader) {
 	if(dumpingFrame) {
 		IDirect3DSurface9* rt;
@@ -875,6 +899,13 @@ HRESULT RSManagerDX9::redirectSetPixelShaderConstantF(UINT StartRegister, CONST
 }
 
 HRESULT RSManagerDX9::redirectCreateTexture(UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9** ppTexture, HANDLE* pSharedHandle) {
+	if((Settings::get().getEnableAlternativeTextureDumping() || Settings::get().getTextureScalingFactor()>1) && !(Usage & D3DUSAGE_RENDERTARGET) && Width > 1 && Height > 1) {
+		HRESULT hr = plugin->redirectCreateTexture(Width*Settings::get().getTextureScalingFactor(), Height*Settings::get().getTextureScalingFactor(), Levels, Usage, Format, Pool, ppTexture, pSharedHandle);
+		if(SUCCEEDED(hr)) {
+			new hkIDirect3DTexture9(ppTexture);
+		}
+		return hr;
+	}
 	return plugin->redirectCreateTexture(Width, Height, Levels, Usage, Format, Pool, ppTexture, pSharedHandle);
 }
 

source/utils/imgproc_utils.cpp

@@ -489,13 +489,6 @@ bool TextureScaler::IsEmptyOrFlat(u32* data, int pixels) {
 }
 
 void TextureScaler::Scale(u32* &data, int &width, int &height, int factor) {
-	// prevent processing empty or flat textures (this happens a lot in some games)
-	// doesn't hurt the standard case, will be very quick for textures with actual texture
-	if(IsEmptyOrFlat(data, width*height)) {
-		SDLOG(20, "TextureScaler: early exit -- empty/flat texture");
-		return;
-	}
-
 	#ifdef SCALING_MEASURE_TIME
 	double t_start = real_time_now();
 	#endif
@@ -515,21 +508,25 @@ void TextureScaler::Scale(u32* &data, int &width, int &height, int factor) {
 	}
 
 	// scale 
-	switch(Settings::get().getTextureScalingMode()) {
-	case XBRZ:
-		ScaleXBRZ(factor, inputBuf, outputBuf, width, height);
-		break;
-	case HYBRID:
-		ScaleHybrid(factor, inputBuf, outputBuf, width, height);
-		break;
-	case BICUBIC:
-		ScaleBicubicMitchell(factor, inputBuf, outputBuf, width, height);
-		break;
-	case HYBRID_BICUBIC:
-		ScaleHybrid(factor, inputBuf, outputBuf, width, height, true);
-		break;
-	default:
-		SDLOG(-1, "Unknown scaling type: %d", Settings::get().getTextureScalingMode());
+	if(factor == 1) {
+		memcpy(outputBuf, inputBuf, 4*width*height);
+	} else {
+		switch(Settings::get().getTextureScalingMode()) {
+		case XBRZ:
+			ScaleXBRZ(factor, inputBuf, outputBuf, width, height);
+			break;
+		case HYBRID:
+			ScaleHybrid(factor, inputBuf, outputBuf, width, height);
+			break;
+		case BICUBIC:
+			ScaleBicubicMitchell(factor, inputBuf, outputBuf, width, height);
+			break;
+		case HYBRID_BICUBIC:
+			ScaleHybrid(factor, inputBuf, outputBuf, width, height, true);
+			break;
+		default:
+			SDLOG(-1, "Unknown scaling type: %d", Settings::get().getTextureScalingMode());
+		}
 	}
 
 	// update values accordingly

source/utils/win_utils.cpp

@@ -161,7 +161,7 @@ const char* GetDeviceCapsParamToString(int index) {
 
 string RectToString(const RECT* rect) {
 	if(!rect) return string("NULL_RECT");
-	return format("RECT[%4ld/%4ld/%4ld/%4ld]", rect->left, rect->top, rect->right, rect->bottom);
+	return format("RECT[%4ld..%4ld/%4ld..%4ld]", rect->left, rect->right, rect->top, rect->bottom);
 }
 
 DWORD RunSilent(const char* command) {

source/version.cpp

@@ -6,9 +6,9 @@ const char* VER_NAME = "How Could Hell Be Any Worse";
 
 const unsigned VER_MAJOR = 0;
 const unsigned VER_MINOR = 21;
-const unsigned VER_BUILD = 2160;
+const unsigned VER_BUILD = 2255;
 
-const char* VER_STRING = "version 0.21.2160 built on 2016/02/15 20:19:50";
+const char* VER_STRING = "version 0.21.2255 built on 2016/02/28 20:21:17";
 
 #ifdef _DEBUG
 const char* MODE_STRING = "DEBUG";