From: tomaz tomaz@d7cf8633-e32d-0410-b094-e92efae38249 <>
Date: Thu, 16 Sep 2010 22:20:24 +0000 (+0000)
Subject: UNMERGE
X-Git-Tag: xonotic-v0.1.0preview~211
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=59c76fe58bf0c93c581359c963ca3a747a0427b1;p=xonotic%2Fdarkplaces.git

UNMERGE
Added debug shaderflags used by the shader compiler which is needed to debug the shaders in pix
Also added saving of vertstring and fragstring to disk and D3DXCompileShaderFromFileA to load them, this helps when debugging shaders in pix ( all commented out )

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10466 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::unmerge=24d6306967a695130789ada49e6a7f0e58f4fbad
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 683a1655..67f45bb6 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -4753,24 +4753,18 @@ static void R_HLSL_CacheShader(r_hlsl_permutation_t *p, const char *cachename, c
 		};
 		dllhandle_t d3dx9_dll = NULL;
 		HRESULT (WINAPI *qD3DXCompileShader)(LPCSTR pSrcData, UINT SrcDataLen, CONST D3DXMACRO* pDefines, LPD3DXINCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, DWORD Flags, LPD3DXBUFFER* ppShader, LPD3DXBUFFER* ppErrorMsgs, LPD3DXCONSTANTTABLE* ppConstantTable);
-//		HRESULT (WINAPI *qD3DXCompileShaderFromFileA)(LPCSTR pSrcFile, CONST D3DXMACRO* pDefines, LPD3DXINCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, DWORD Flags, LPD3DXBUFFER* ppShader, LPD3DXBUFFER* ppErrorMsgs, LPD3DXCONSTANTTABLE* ppConstantTable);
 		dllfunction_t d3dx9_dllfuncs[] =
 		{
 			{"D3DXCompileShader",			(void **) &qD3DXCompileShader},
-//			{"D3DXCompileShaderFromFileA",	(void **) &qD3DXCompileShaderFromFileA},
 			{NULL, NULL}
 		};
 		if (Sys_LoadLibrary(dllnames_d3dx9, &d3dx9_dll, d3dx9_dllfuncs))
 		{
-			DWORD shaderflags = 0;
-//			shaderflags = D3DXSHADER_DEBUG | D3DXSHADER_SKIPOPTIMIZATION;
 			vsbin = (DWORD *)Mem_Realloc(tempmempool, vsbin, 0);
 			psbin = (DWORD *)Mem_Realloc(tempmempool, psbin, 0);
 			if (vertstring && vertstring[0])
 			{
-//				FS_WriteFile(va("%s_vs.fx", cachename), vertstring, strlen(vertstring));
-//				vsresult = qD3DXCompileShaderFromFileA(va("%s/%s_vs.fx", fs_gamedir, cachename), NULL, NULL, "main", vsversion, shaderflags, &vsbuffer, &vslog, &vsconstanttable);
-				vsresult = qD3DXCompileShader(vertstring, strlen(vertstring), NULL, NULL, "main", vsversion, shaderflags, &vsbuffer, &vslog, &vsconstanttable);
+				vsresult = qD3DXCompileShader(vertstring, strlen(vertstring), NULL, NULL, "main", vsversion, 0, &vsbuffer, &vslog, &vsconstanttable);
 				if (vsbuffer)
 				{
 					vsbinsize = vsbuffer->GetBufferSize();
@@ -4787,9 +4781,7 @@ static void R_HLSL_CacheShader(r_hlsl_permutation_t *p, const char *cachename, c
 			}
 			if (fragstring && fragstring[0])
 			{
-//				FS_WriteFile(va("%s_ps.fx", cachename), fragstring, strlen(fragstring));
-//				psresult = qD3DXCompileShaderFromFileA(va("%s/%s_ps.fx", fs_gamedir, cachename), NULL, NULL, "main", psversion, shaderflags, &psbuffer, &pslog, &psconstanttable);
-				psresult = qD3DXCompileShader(fragstring, strlen(fragstring), NULL, NULL, "main", psversion, shaderflags, &psbuffer, &pslog, &psconstanttable);
+				psresult = qD3DXCompileShader(fragstring, strlen(fragstring), NULL, NULL, "main", psversion, 0, &psbuffer, &pslog, &psconstanttable);
 				if (psbuffer)
 				{
 					psbinsize = psbuffer->GetBufferSize();