diff options
| author | Jason Maskell <Jason Maskell> | 2016-07-25 12:13:14 +0700 |
|---|---|---|
| committer | Jason Maskell <Jason Maskell> | 2016-07-25 12:13:14 +0700 |
| commit | 9fc34880f8e0674cb61a8dd479c64280d056cca2 (patch) | |
| tree | 417b6f4b8163b32d96bfec784ff3f4bcb2f0bfb6 /compiler | |
| parent | Renamed Logger.h to GFSDK_Logger.h since it's a shared header. (diff) | |
| download | waveworks_archive-9fc34880f8e0674cb61a8dd479c64280d056cca2.tar.xz waveworks_archive-9fc34880f8e0674cb61a8dd479c64280d056cca2.zip | |
Had some compilation issues without previously generated code, fixed now.
Disabled OpenGL in the D3D11 build, for now. This is an ugly hack and needs to be fixed.
Separated FindFXC into its own finder so that we can fail when it's not found.
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/cmake/NvWaveWorks.cmake | 35 | ||||
| -rw-r--r-- | compiler/cmake/sample_d3d11.cmake | 1 | ||||
| -rw-r--r-- | compiler/cmake/test_d3d11.cmake | 1 |
3 files changed, 21 insertions, 16 deletions
diff --git a/compiler/cmake/NvWaveWorks.cmake b/compiler/cmake/NvWaveWorks.cmake index 9ac0d91..e8c7b56 100644 --- a/compiler/cmake/NvWaveWorks.cmake +++ b/compiler/cmake/NvWaveWorks.cmake @@ -3,6 +3,7 @@ # FIND_PACKAGE(CUDA REQUIRED) +FIND_PACKAGE(FXC REQUIRED) SET(WW_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src) @@ -132,17 +133,6 @@ SET(DISTRO_INCLUDE_FILES SET(HLSL_FILES - ${SHADER_SRC_DIR}/CalcGradient.fx - ${SHADER_SRC_DIR}/CalcGradient_SM3.fx - ${SHADER_SRC_DIR}/CalcGradient_SM4.fx - - ${SHADER_SRC_DIR}/FoamGeneration.fx - ${SHADER_SRC_DIR}/FoamGeneration_SM3.fx - ${SHADER_SRC_DIR}/FoamGeneration_SM4.fx - - ${SHADER_SRC_DIR}/Quadtree_SM4_sig.fx - ${SHADER_SRC_DIR}/Quadtree_SM5_sig.fx - ${WW_SOURCE_DIR}/FFT_Simulation_DirectCompute_shader.hlsl ) @@ -151,6 +141,14 @@ SET(CUDA_FILES ) SET(FX_FILES + ${SHADER_SRC_DIR}/CalcGradient.fx + ${SHADER_SRC_DIR}/CalcGradient_SM3.fx + ${SHADER_SRC_DIR}/CalcGradient_SM4.fx + + ${SHADER_SRC_DIR}/FoamGeneration.fx + ${SHADER_SRC_DIR}/FoamGeneration_SM3.fx + ${SHADER_SRC_DIR}/FoamGeneration_SM4.fx + ${SHADER_SRC_DIR}/Quadtree_SM4_sig.fx ${SHADER_SRC_DIR}/Quadtree_SM5_sig.fx ${SHADER_SRC_DIR}/FoamGeneration_SM4.fx @@ -169,6 +167,10 @@ SET(GENERATED_HLSL_FILES ${GEN_SRC_DIR}/ComputeH0_cs_5_0.h ${GEN_SRC_DIR}/ComputeRows_cs_5_0.h ${GEN_SRC_DIR}/ComputeColumns_cs_5_0.h + ${GEN_SRC_DIR}/CalcGradient_ps_4_0.h + ${GEN_SRC_DIR}/CalcGradient_vs_4_0.h + ${GEN_SRC_DIR}/CalcGradient_ps_3_0.h + ${GEN_SRC_DIR}/CalcGradient_vs_3_0.h ) @@ -181,6 +183,12 @@ INCLUDE(cmake/CompileFXToH.cmake) # Compile the .fx files to .h files so they can be loaded easily. ADD_CUSTOM_TARGET(fx ALL) +CompileFXToH(${SHADER_SRC_DIR}/CalcGradient_SM4.fx ${GEN_SRC_DIR}/CalcGradient_ps_4_0.h fx ${SHADER_SRC_DIR} ${DISTRO_INCLUDE_DIR} ps /Tps_4_0) +CompileFXToH(${SHADER_SRC_DIR}/CalcGradient_SM4.fx ${GEN_SRC_DIR}/CalcGradient_vs_4_0.h fx ${SHADER_SRC_DIR} ${DISTRO_INCLUDE_DIR} vs /Tvs_4_0) + +CompileFXToH(${SHADER_SRC_DIR}/CalcGradient_SM3.fx ${GEN_SRC_DIR}/CalcGradient_ps_3_0.h fx ${SHADER_SRC_DIR} ${DISTRO_INCLUDE_DIR} ps /Tps_3_0) +CompileFXToH(${SHADER_SRC_DIR}/CalcGradient_SM3.fx ${GEN_SRC_DIR}/CalcGradient_vs_3_0.h fx ${SHADER_SRC_DIR} ${DISTRO_INCLUDE_DIR} vs /Tvs_3_0) + CompileFXToH(${SHADER_SRC_DIR}/Quadtree_SM4_sig.fx ${GEN_SRC_DIR}/Quadtree_SM4_sig.h fx ${SHADER_SRC_DIR} ${DISTRO_INCLUDE_DIR} GFSDK_WAVEWORKS_VERTEX_INPUT_Sig /Tvs_4_0) CompileFXToH(${SHADER_SRC_DIR}/Quadtree_SM5_sig.fx ${GEN_SRC_DIR}/Quadtree_SM5_sig.h fx ${SHADER_SRC_DIR} ${DISTRO_INCLUDE_DIR} GFSDK_WAVEWORKS_VERTEX_INPUT_Sig /Tvs_5_0) @@ -192,11 +200,6 @@ CompileFXToH(${SHADER_SRC_DIR}/FoamGeneration_SM4.fx ${GEN_SRC_DIR}/FoamGenerati CompileFXToH(${SHADER_SRC_DIR}/FoamGeneration_SM3.fx ${GEN_SRC_DIR}/FoamGeneration_ps_3_0.h fx ${SHADER_SRC_DIR} ${DISTRO_INCLUDE_DIR} ps /Tps_3_0) CompileFXToH(${SHADER_SRC_DIR}/FoamGeneration_SM3.fx ${GEN_SRC_DIR}/FoamGeneration_vs_3_0.h fx ${SHADER_SRC_DIR} ${DISTRO_INCLUDE_DIR} vs /Tvs_3_0) -CompileFXToH(${SHADER_SRC_DIR}/CalcGradient_SM4.fx ${GEN_SRC_DIR}/CalcGradient_ps_4_0.h fx ${SHADER_SRC_DIR} ${GEN_SRC_DIR} ps /Tps_4_0) -CompileFXToH(${SHADER_SRC_DIR}/CalcGradient_SM4.fx ${GEN_SRC_DIR}/CalcGradient_vs_4_0.h fx ${SHADER_SRC_DIR} ${GEN_SRC_DIR} vs /Tvs_4_0) - -CompileFXToH(${SHADER_SRC_DIR}/CalcGradient_SM3.fx ${GEN_SRC_DIR}/CalcGradient_ps_3_0.h fx ${SHADER_SRC_DIR} ${GEN_SRC_DIR} ps /Tps_3_0) -CompileFXToH(${SHADER_SRC_DIR}/CalcGradient_SM3.fx ${GEN_SRC_DIR}/CalcGradient_vs_3_0.h fx ${SHADER_SRC_DIR} ${GEN_SRC_DIR} vs /Tvs_3_0) CompileFXToH(${WW_SOURCE_DIR}/FFT_Simulation_DirectCompute_shader.hlsl ${GEN_SRC_DIR}/ComputeH0_cs_5_0.h fx ${SHADER_SRC_DIR} ${GEN_SRC_DIR} ComputeH0 /Tcs_5_0 /Vng_ComputeH0) CompileFXToH(${WW_SOURCE_DIR}/FFT_Simulation_DirectCompute_shader.hlsl ${GEN_SRC_DIR}/ComputeRows_cs_5_0.h fx ${SHADER_SRC_DIR} ${GEN_SRC_DIR} ComputeRows /Tcs_5_0 /Vng_ComputeRows) diff --git a/compiler/cmake/sample_d3d11.cmake b/compiler/cmake/sample_d3d11.cmake index dac6b24..96ab6a4 100644 --- a/compiler/cmake/sample_d3d11.cmake +++ b/compiler/cmake/sample_d3d11.cmake @@ -7,6 +7,7 @@ SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT}) FIND_PACKAGE(DXUT REQUIRED) FIND_PACKAGE(FX11 REQUIRED) FIND_PACKAGE(DirectXTK REQUIRED) +FIND_PACKAGE(FXC REQUIRED) SET(SAMP_SOURCE_DIR ${PROJECT_SOURCE_DIR}/sample/d3d11) SET(COMMON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/common) diff --git a/compiler/cmake/test_d3d11.cmake b/compiler/cmake/test_d3d11.cmake index bbc7ca7..a51a126 100644 --- a/compiler/cmake/test_d3d11.cmake +++ b/compiler/cmake/test_d3d11.cmake @@ -7,6 +7,7 @@ SET(GW_DEPS_ROOT $ENV{GW_DEPS_ROOT}) FIND_PACKAGE(DXUT REQUIRED) FIND_PACKAGE(FX11 REQUIRED) FIND_PACKAGE(DirectXTK REQUIRED) +FIND_PACKAGE(FXC REQUIRED) MESSAGE("FX11 ${FX11_SDK_PATH}") |