diff options
| author | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
| commit | 450aa6f7df9e67dd256b86f94e65eaf707032aad (patch) | |
| tree | 04aa207d84ddc8ca246d2573aaaf756b3ce8a0b5 /LibOVR/Src/CAPI/D3D1X/Shaders/genVertexShaderHeader.bat | |
| parent | 3c7b8a17e907f4ef2afd9f77db566a3f6179cbe4 (diff) | |
| parent | 4207f9c279e832e3afcb3f5fc6cd8d84cb4cfe4c (diff) | |
Merge branch 'vanilla_0.5.0.1' into jogamp_0.5.0.1
Conflicts:
LibOVR/Include/OVR_CAPI_0_5_0.h
LibOVR/Src/CAPI/CAPI_HMDState.cpp
LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h
LibOVR/Src/Kernel/OVR_System.cpp
LibOVR/Src/OVR_CAPI.cpp
LibOVR/Src/OVR_Profile.cpp
LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
LibOVRKernel/Src/Kernel/OVR_Types.h
Diffstat (limited to 'LibOVR/Src/CAPI/D3D1X/Shaders/genVertexShaderHeader.bat')
| -rw-r--r-- | LibOVR/Src/CAPI/D3D1X/Shaders/genVertexShaderHeader.bat | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/LibOVR/Src/CAPI/D3D1X/Shaders/genVertexShaderHeader.bat b/LibOVR/Src/CAPI/D3D1X/Shaders/genVertexShaderHeader.bat index 7085775..aa264d9 100644 --- a/LibOVR/Src/CAPI/D3D1X/Shaders/genVertexShaderHeader.bat +++ b/LibOVR/Src/CAPI/D3D1X/Shaders/genVertexShaderHeader.bat @@ -3,13 +3,16 @@ pushd %~dp0 echo Compiling shader and packing into header: %~2
setlocal
-set PATH=%PATH%;"%DXSDK_DIR%Utilities\bin\x86\"
-fxc.exe /nologo /E main /T vs_4_0 /Fo "%1" %2
+fxc.exe /nologo /E main /T vs_4_1 /Fo "%1" %2
bin2header.exe "%1"
echo Generating shader reflection data for %1
ShaderReflector "%1" "%1_refl.h"
+echo /* Concatenating shader reflector output:*/ >> "%1.h"
+type "%1_refl.h" >> "%1.h"
+del "%1_refl.h"
+
del "%1"
endlocal
popd
|