mirror of https://github.com/PCSX2/pcsx2.git
Made resources recompile when a shader is modified, though I'm not happy with the solution.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2717 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
3657bebe9e
commit
bda5b06e37
|
@ -34,14 +34,15 @@ END
|
||||||
|
|
||||||
2 TEXTINCLUDE
|
2 TEXTINCLUDE
|
||||||
BEGIN
|
BEGIN
|
||||||
"#include ""afxres.h""\r\n"
|
"#include ""afxres.h""\r\0"
|
||||||
"\0"
|
|
||||||
END
|
END
|
||||||
|
|
||||||
3 TEXTINCLUDE
|
3 TEXTINCLUDE
|
||||||
BEGIN
|
BEGIN
|
||||||
"\r\n"
|
"#include ""res/tfx.fx""\r\n"
|
||||||
"\0"
|
"#include ""res/convert.fx""\r\n"
|
||||||
|
"#include ""res/interlace.fx""\r\n"
|
||||||
|
"#include ""res/merge.fx""\r\0"
|
||||||
END
|
END
|
||||||
|
|
||||||
#endif // APSTUDIO_INVOKED
|
#endif // APSTUDIO_INVOKED
|
||||||
|
@ -301,7 +302,10 @@ END
|
||||||
//
|
//
|
||||||
// Generated from the TEXTINCLUDE 3 resource.
|
// Generated from the TEXTINCLUDE 3 resource.
|
||||||
//
|
//
|
||||||
|
#include "res/tfx.fx"
|
||||||
|
#include "res/convert.fx"
|
||||||
|
#include "res/interlace.fx"
|
||||||
|
#include "res/merge.fx"
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
#endif // not APSTUDIO_INVOKED
|
#endif // not APSTUDIO_INVOKED
|
||||||
|
|
|
@ -2231,10 +2231,6 @@
|
||||||
RelativePath=".\GSdx.rc"
|
RelativePath=".\GSdx.rc"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath=".\res\GSdx.rc2"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath=".\res\logo10.bmp"
|
RelativePath=".\res\logo10.bmp"
|
||||||
>
|
>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#ifdef SHADER_MODEL // make safe to include in resource file to enforce dependency
|
||||||
#if SHADER_MODEL >= 0x400
|
#if SHADER_MODEL >= 0x400
|
||||||
|
|
||||||
struct VS_INPUT
|
struct VS_INPUT
|
||||||
|
@ -237,4 +238,5 @@ PS_OUTPUT ps_main6(PS_INPUT input) // diagonal
|
||||||
return output;
|
return output;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#ifdef SHADER_MODEL // make safe to include in resource file to enforce dependency
|
||||||
#if SHADER_MODEL >= 0x400
|
#if SHADER_MODEL >= 0x400
|
||||||
|
|
||||||
Texture2D Texture;
|
Texture2D Texture;
|
||||||
|
@ -81,3 +82,4 @@ float4 ps_main3(float2 tex : TEXCOORD0) : COLOR
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#ifdef SHADER_MODEL // make safe to include in resource file to enforce dependency
|
||||||
#if SHADER_MODEL >= 0x400
|
#if SHADER_MODEL >= 0x400
|
||||||
|
|
||||||
Texture2D Texture;
|
Texture2D Texture;
|
||||||
|
@ -55,4 +56,5 @@ float4 ps_main1(PS_INPUT input) : COLOR
|
||||||
return c.bgra;
|
return c.bgra;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#ifdef SHADER_MODEL // make safe to include in resource file to enforce dependency
|
||||||
#define FMT_32 0
|
#define FMT_32 0
|
||||||
#define FMT_24 1
|
#define FMT_24 1
|
||||||
#define FMT_16 2
|
#define FMT_16 2
|
||||||
|
@ -726,4 +727,5 @@ float4 ps_main(PS_INPUT input) : COLOR
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue