Перенос проекта Shaders в корневую папку.

Aleksoid1978 · Dec 30, 2019 · 38a3d46 · 38a3d46
1 parent 7e98d95
commit 38a3d46
Show file tree

Hide file tree

Showing 41 changed files with 6 additions and 6 deletions.
diff --git a/MpcVideoRenderer.sln b/MpcVideoRenderer.sln
@@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Include", "Include", "{C7CA
 		Include\Version.h = Include\Version.h
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shaders", "Source\Shaders\Shaders.vcxproj", "{3D9A1837-4ECC-45CA-9260-F57AD36C6B5F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shaders", "Shaders\Shaders.vcxproj", "{3D9A1837-4ECC-45CA-9260-F57AD36C6B5F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Source/Shaders/Shaders.vcxproj → Shaders/Shaders.vcxproj b/Source/Shaders/Shaders.vcxproj → Shaders/Shaders.vcxproj
@@ -164,7 +164,7 @@
     <RootNamespace>Shaders</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="..\..\platform.props" />
+  <Import Project="..\platform.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>

diff --git a/Source/Shaders/Shaders.vcxproj.filters → Shaders/Shaders.vcxproj.filters b/Source/Shaders/Shaders.vcxproj.filters → Shaders/Shaders.vcxproj.filters
diff --git a/Source/Shaders/compile_shaders.cmd → Shaders/compile_shaders.cmd b/Source/Shaders/compile_shaders.cmd → Shaders/compile_shaders.cmd
@@ -42,7 +42,7 @@ EXIT /B
 
 :fxc_OK
 
-SET workdir=..\..\_bin\shaders
+SET workdir=..\_bin\shaders
 IF NOT EXIST "%workdir%\" MKDIR "%workdir%"
 
 CALL :SubColorText "0A" "=== Compiling D3D9 shaders ===" & ECHO.

diff --git a/.../convert/colorspace_gamut_conversion.hlsl → .../convert/colorspace_gamut_conversion.hlsl b/.../convert/colorspace_gamut_conversion.hlsl → .../convert/colorspace_gamut_conversion.hlsl
diff --git a/Source/Shaders/convert/correct_hlg.hlsl → Shaders/convert/correct_hlg.hlsl b/Source/Shaders/convert/correct_hlg.hlsl → Shaders/convert/correct_hlg.hlsl
diff --git a/Source/Shaders/convert/correct_st2084.hlsl → Shaders/convert/correct_st2084.hlsl b/Source/Shaders/convert/correct_st2084.hlsl → Shaders/convert/correct_st2084.hlsl
diff --git a/Source/Shaders/convert/hdr_tone_mapping.hlsl → Shaders/convert/hdr_tone_mapping.hlsl b/Source/Shaders/convert/hdr_tone_mapping.hlsl → Shaders/convert/hdr_tone_mapping.hlsl
diff --git a/...ce/Shaders/d3d11/ps_convert_biplanar.hlsl → Shaders/d3d11/ps_convert_biplanar.hlsl b/...ce/Shaders/d3d11/ps_convert_biplanar.hlsl → Shaders/d3d11/ps_convert_biplanar.hlsl
diff --git a/Source/Shaders/d3d11/ps_convert_color.hlsl → Shaders/d3d11/ps_convert_color.hlsl b/Source/Shaders/d3d11/ps_convert_color.hlsl → Shaders/d3d11/ps_convert_color.hlsl
diff --git a/Source/Shaders/d3d11/ps_convert_planar.hlsl → Shaders/d3d11/ps_convert_planar.hlsl b/Source/Shaders/d3d11/ps_convert_planar.hlsl → Shaders/d3d11/ps_convert_planar.hlsl
diff --git a/Source/Shaders/d3d11/ps_convolution.hlsl → Shaders/d3d11/ps_convolution.hlsl b/Source/Shaders/d3d11/ps_convolution.hlsl → Shaders/d3d11/ps_convolution.hlsl
diff --git a/Source/Shaders/d3d11/ps_correction_hlg.hlsl → Shaders/d3d11/ps_correction_hlg.hlsl b/Source/Shaders/d3d11/ps_correction_hlg.hlsl → Shaders/d3d11/ps_correction_hlg.hlsl
diff --git a/...e/Shaders/d3d11/ps_correction_st2084.hlsl → Shaders/d3d11/ps_correction_st2084.hlsl b/...e/Shaders/d3d11/ps_correction_st2084.hlsl → Shaders/d3d11/ps_correction_st2084.hlsl
diff --git a/...ce/Shaders/d3d11/ps_correction_ycgco.hlsl → Shaders/d3d11/ps_correction_ycgco.hlsl b/...ce/Shaders/d3d11/ps_correction_ycgco.hlsl → Shaders/d3d11/ps_correction_ycgco.hlsl
diff --git a/Source/Shaders/d3d11/ps_font.hlsl → Shaders/d3d11/ps_font.hlsl b/Source/Shaders/d3d11/ps_font.hlsl → Shaders/d3d11/ps_font.hlsl
diff --git a/Source/Shaders/d3d11/ps_geometry.hlsl → Shaders/d3d11/ps_geometry.hlsl b/Source/Shaders/d3d11/ps_geometry.hlsl → Shaders/d3d11/ps_geometry.hlsl
diff --git a/...ders/d3d11/ps_interpolation_lanczos2.hlsl → Shaders/d3d11/ps_interpolation_lanczos2.hlsl b/...ders/d3d11/ps_interpolation_lanczos2.hlsl → Shaders/d3d11/ps_interpolation_lanczos2.hlsl
diff --git a/...ders/d3d11/ps_interpolation_lanczos3.hlsl → Shaders/d3d11/ps_interpolation_lanczos3.hlsl b/...ders/d3d11/ps_interpolation_lanczos3.hlsl → Shaders/d3d11/ps_interpolation_lanczos3.hlsl
diff --git a/...aders/d3d11/ps_interpolation_spline4.hlsl → Shaders/d3d11/ps_interpolation_spline4.hlsl b/...aders/d3d11/ps_interpolation_spline4.hlsl → Shaders/d3d11/ps_interpolation_spline4.hlsl
diff --git a/Source/Shaders/d3d11/ps_simple.hlsl → Shaders/d3d11/ps_simple.hlsl b/Source/Shaders/d3d11/ps_simple.hlsl → Shaders/d3d11/ps_simple.hlsl
diff --git a/Source/Shaders/d3d11/vs_geometry.hlsl → Shaders/d3d11/vs_geometry.hlsl b/Source/Shaders/d3d11/vs_geometry.hlsl → Shaders/d3d11/vs_geometry.hlsl
diff --git a/Source/Shaders/d3d11/vs_simple.hlsl → Shaders/d3d11/vs_simple.hlsl b/Source/Shaders/d3d11/vs_simple.hlsl → Shaders/d3d11/vs_simple.hlsl
diff --git a/Source/Shaders/d3d9/convert_biplanar.hlsl → Shaders/d3d9/convert_biplanar.hlsl b/Source/Shaders/d3d9/convert_biplanar.hlsl → Shaders/d3d9/convert_biplanar.hlsl
diff --git a/Source/Shaders/d3d9/convert_color.hlsl → Shaders/d3d9/convert_color.hlsl b/Source/Shaders/d3d9/convert_color.hlsl → Shaders/d3d9/convert_color.hlsl
diff --git a/Source/Shaders/d3d9/convert_planar.hlsl → Shaders/d3d9/convert_planar.hlsl b/Source/Shaders/d3d9/convert_planar.hlsl → Shaders/d3d9/convert_planar.hlsl
diff --git a/Source/Shaders/d3d9/convolution.hlsl → Shaders/d3d9/convolution.hlsl b/Source/Shaders/d3d9/convolution.hlsl → Shaders/d3d9/convolution.hlsl
diff --git a/Source/Shaders/d3d9/correction_hlg.hlsl → Shaders/d3d9/correction_hlg.hlsl b/Source/Shaders/d3d9/correction_hlg.hlsl → Shaders/d3d9/correction_hlg.hlsl
diff --git a/Source/Shaders/d3d9/correction_st2084.hlsl → Shaders/d3d9/correction_st2084.hlsl b/Source/Shaders/d3d9/correction_st2084.hlsl → Shaders/d3d9/correction_st2084.hlsl
diff --git a/Source/Shaders/d3d9/correction_ycgco.hlsl → Shaders/d3d9/correction_ycgco.hlsl b/Source/Shaders/d3d9/correction_ycgco.hlsl → Shaders/d3d9/correction_ycgco.hlsl
diff --git a/.../Shaders/d3d9/interpolation_lanczos2.hlsl → Shaders/d3d9/interpolation_lanczos2.hlsl b/.../Shaders/d3d9/interpolation_lanczos2.hlsl → Shaders/d3d9/interpolation_lanczos2.hlsl
diff --git a/.../Shaders/d3d9/interpolation_lanczos3.hlsl → Shaders/d3d9/interpolation_lanczos3.hlsl b/.../Shaders/d3d9/interpolation_lanczos3.hlsl → Shaders/d3d9/interpolation_lanczos3.hlsl
diff --git a/...e/Shaders/d3d9/interpolation_spline4.hlsl → Shaders/d3d9/interpolation_spline4.hlsl b/...e/Shaders/d3d9/interpolation_spline4.hlsl → Shaders/d3d9/interpolation_spline4.hlsl
diff --git a/Source/Shaders/examples/ps_mpv.hlsl → Shaders/examples/ps_mpv.hlsl b/Source/Shaders/examples/ps_mpv.hlsl → Shaders/examples/ps_mpv.hlsl
diff --git a/.../examples/ps_resize_onepass_bilinear.hlsl → .../examples/ps_resize_onepass_bilinear.hlsl b/.../examples/ps_resize_onepass_bilinear.hlsl → .../examples/ps_resize_onepass_bilinear.hlsl
diff --git a/.../examples/ps_resize_onepass_catmull4.hlsl → .../examples/ps_resize_onepass_catmull4.hlsl b/.../examples/ps_resize_onepass_catmull4.hlsl → .../examples/ps_resize_onepass_catmull4.hlsl
diff --git a/Source/Shaders/examples/ps_vlc.hlsl → Shaders/examples/ps_vlc.hlsl b/Source/Shaders/examples/ps_vlc.hlsl → Shaders/examples/ps_vlc.hlsl
diff --git a/Source/Shaders/examples/vs_mpv.hlsl → Shaders/examples/vs_mpv.hlsl b/Source/Shaders/examples/vs_mpv.hlsl → Shaders/examples/vs_mpv.hlsl
diff --git a/Source/Shaders/examples/vs_vlc.hlsl → Shaders/examples/vs_vlc.hlsl b/Source/Shaders/examples/vs_vlc.hlsl → Shaders/examples/vs_vlc.hlsl
diff --git a/...e/Shaders/resize/convolution_filters.hlsl → Shaders/resize/convolution_filters.hlsl b/...e/Shaders/resize/convolution_filters.hlsl → Shaders/resize/convolution_filters.hlsl
diff --git a/Source/res/MpcVideoRenderer.rc2 b/Source/res/MpcVideoRenderer.rc2
@@ -20,8 +20,8 @@
 // FILE
 //
 
-IDF_HLSL_HDR_TONE_MAPPING       FILE                    "Shaders\\convert\\hdr_tone_mapping.hlsl"
-IDF_HLSL_COLORSPACE_GAMUT_CONV  FILE                    "Shaders\\convert\\colorspace_gamut_conversion.hlsl"
+IDF_HLSL_HDR_TONE_MAPPING       FILE                    "..\\Shaders\\convert\\hdr_tone_mapping.hlsl"
+IDF_HLSL_COLORSPACE_GAMUT_CONV  FILE                    "..\\Shaders\\convert\\colorspace_gamut_conversion.hlsl"
 
 IDF_SHADER_CONVERT_COLOR        FILE                    "..\\_bin\\shaders\\convert_color.cso"
 IDF_SHADER_CONVERT_YUY2         FILE                    "..\\_bin\\shaders\\convert_yuy2.cso"
@@ -111,7 +111,7 @@ BEGIN
             VALUE "FileDescription", "MPC Video Renderer"
             VALUE "FileVersion", MPCVR_VERSION_STR
             VALUE "InternalName", "MpcVideoRenderer"
-            VALUE "LegalCopyright", "Copyright � 2018-2019"
+            VALUE "LegalCopyright", "Copyright  2018-2019"
 #ifdef _WIN64
 
             VALUE "OriginalFilename", "MpcVideoRenderer64.ax"