diff options
| author | Jason Maskell <[email protected]> | 2016-05-12 10:58:15 +0200 |
|---|---|---|
| committer | Jason Maskell <[email protected]> | 2016-05-12 10:58:15 +0200 |
| commit | 72b21c69e32c73abf3a18b0e962746e64faebba4 (patch) | |
| tree | cd22b1b298bc865c3ae6037e8eb89a64a94203ea /src/shader | |
| parent | Merge branch 'master' of https://github.com/NVIDIAGameWorks/WaveWorks (diff) | |
| download | waveworks_archive-72b21c69e32c73abf3a18b0e962746e64faebba4.tar.xz waveworks_archive-72b21c69e32c73abf3a18b0e962746e64faebba4.zip | |
Restructuring starts. Got some initial CMake problems sorted. Need to extend.
Diffstat (limited to 'src/shader')
| -rw-r--r-- | src/shader/Quadtree.fxh | 2 | ||||
| -rw-r--r-- | src/shader/Quadtree_SM4_sig.fx | 4 | ||||
| -rw-r--r-- | src/shader/Quadtree_SM5_sig.fx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/shader/Quadtree.fxh b/src/shader/Quadtree.fxh index b06e437..996bdcb 100644 --- a/src/shader/Quadtree.fxh +++ b/src/shader/Quadtree.fxh @@ -27,7 +27,7 @@ * strictly prohibited. */ -#include "GFSDK_WaveWorks_Common.fxh" +#include "Common.fxh" /* * diff --git a/src/shader/Quadtree_SM4_sig.fx b/src/shader/Quadtree_SM4_sig.fx index b1b0884..07961b6 100644 --- a/src/shader/Quadtree_SM4_sig.fx +++ b/src/shader/Quadtree_SM4_sig.fx @@ -31,9 +31,9 @@ #define GFSDK_WAVEWORKS_BEGIN_GEOM_VS_CBUFFER(Label) cbuffer Label { #define GFSDK_WAVEWORKS_END_GEOM_VS_CBUFFER }; -#include "GFSDK_WaveWorks_Quadtree.fxh" +#include "Quadtree.fxh" float4 GFSDK_WAVEWORKS_VERTEX_INPUT_Sig(GFSDK_WAVEWORKS_VERTEX_INPUT In) : SV_Position { - return In.nv_waveworks_quad7; + return In.nvsf_vPos; } diff --git a/src/shader/Quadtree_SM5_sig.fx b/src/shader/Quadtree_SM5_sig.fx index 89a2e51..bea1c80 100644 --- a/src/shader/Quadtree_SM5_sig.fx +++ b/src/shader/Quadtree_SM5_sig.fx @@ -37,9 +37,9 @@ #define GFSDK_WAVEWORKS_BEGIN_GEOM_HS_CBUFFER(Label) cbuffer Label { #define GFSDK_WAVEWORKS_END_GEOM_HS_CBUFFER }; -#include "GFSDK_WaveWorks_Quadtree.fxh" +#include "Quadtree.fxh" float4 GFSDK_WAVEWORKS_VERTEX_INPUT_Sig(GFSDK_WAVEWORKS_VERTEX_INPUT In) : SV_Position { - return In.nv_waveworks_quad7; + return In.nvsf_vPos; } |