Started texenvmap tool

microsoft · Sep 17, 2024 · 8006640 · 8006640
1 parent 73aa2f3
commit 8006640
Show file tree

Hide file tree

Showing 20 changed files with 4,177 additions and 67 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,8 @@ packages
 /DDSView/Shaders/*.pdb
 /DirectXTex/Shaders/Compiled/*.inc
 /DirectXTex/Shaders/Compiled/*.pdb
+/Texenvmap/Shaders/Compiled/*.inc
+/Texenvmap/Shaders/Compiled/*.pdb
 /ipch
 Debug
 Durango

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -424,6 +424,29 @@ if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
   target_link_libraries(texconv PRIVATE ${PROJECT_NAME} ole32.lib shell32.lib version.lib)
   source_group(texconv REGULAR_EXPRESSION Texconv/*.*)
   list(APPEND TOOL_EXES texconv)
+
+  if (NOT USE_PREBUILT_SHADERS)
+    add_custom_command(
+        OUTPUT "${COMPILED_SHADERS}/Texenvmap_VSBasic.inc"
+        MAIN_DEPENDENCY "${PROJECT_SOURCE_DIR}/Texenvmap/Shaders/CompileShaders.cmd"
+        DEPENDS "${PROJECT_SOURCE_DIR}/Texenvmap/Shaders/Texenvmap.fx"
+        COMMENT "Generating HLSL shaders for texenvmap..."
+        COMMAND set CompileShadersOutput=${COMPILED_SHADERS}
+        COMMAND CompileShaders.cmd
+        WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/Texenvmap/Shaders"
+        USES_TERMINAL)
+  endif()
+
+  add_executable(texenvmap
+    Texenvmap/texenvmap.cpp
+    Texenvmap/texenvmap.rc
+    Texenvmap/settings.manifest
+    ${COMPILED_SHADERS}/Texenvmap_VSBasic.inc)
+  target_compile_features(texenvmap PRIVATE cxx_std_17)
+  target_include_directories(texenvmap PRIVATE ${COMPILED_SHADERS})
+  target_link_libraries(texenvmap ${PROJECT_NAME} ole32.lib version.lib)
+  source_group(texenvmap REGULAR_EXPRESSION Texenvmap/*.*)
+  list(APPEND TOOL_EXES texenvmap)
 endif()
 
 if(BUILD_TOOLS AND WIN32)

diff --git a/DirectXTex_Desktop_2019.sln b/DirectXTex_Desktop_2019.sln
@@ -21,76 +21,90 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texenvmap", "Texenvmap\Texenvmap_Desktop_2019.vcxproj", "{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
 		Debug|x64 = Debug|x64
-		Profile|x86 = Profile|x86
+		Debug|x86 = Debug|x86
 		Profile|x64 = Profile|x64
-		Release|x86 = Release|x86
+		Profile|x86 = Profile|x86
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.ActiveCfg = Debug|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.Build.0 = Debug|Win32
 		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.ActiveCfg = Debug|x64
 		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.Build.0 = Debug|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.ActiveCfg = Profile|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.Build.0 = Profile|Win32
+		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.ActiveCfg = Debug|Win32
+		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.Build.0 = Debug|Win32
 		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.ActiveCfg = Profile|x64
 		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.Build.0 = Profile|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.ActiveCfg = Release|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.Build.0 = Release|Win32
+		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.ActiveCfg = Profile|Win32
+		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.Build.0 = Profile|Win32
 		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.ActiveCfg = Release|x64
 		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.Build.0 = Release|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x86.ActiveCfg = Debug|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x86.Build.0 = Debug|Win32
+		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.ActiveCfg = Release|Win32
+		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.Build.0 = Release|Win32
 		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x64.ActiveCfg = Debug|x64
 		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x64.Build.0 = Debug|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x86.ActiveCfg = Profile|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x86.Build.0 = Profile|Win32
+		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x86.ActiveCfg = Debug|Win32
+		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x86.Build.0 = Debug|Win32
 		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x64.ActiveCfg = Profile|x64
 		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x64.Build.0 = Profile|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x86.ActiveCfg = Release|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x86.Build.0 = Release|Win32
+		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x86.ActiveCfg = Profile|Win32
+		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x86.Build.0 = Profile|Win32
 		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x64.ActiveCfg = Release|x64
 		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x64.Build.0 = Release|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x86.ActiveCfg = Debug|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x86.Build.0 = Debug|Win32
+		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x86.ActiveCfg = Release|Win32
+		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x86.Build.0 = Release|Win32
 		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x64.ActiveCfg = Debug|x64
 		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x64.Build.0 = Debug|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x86.ActiveCfg = Profile|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x86.Build.0 = Profile|Win32
+		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x86.ActiveCfg = Debug|Win32
+		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x86.Build.0 = Debug|Win32
 		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x64.ActiveCfg = Profile|x64
 		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x64.Build.0 = Profile|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x86.ActiveCfg = Release|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x86.Build.0 = Release|Win32
+		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x86.ActiveCfg = Profile|Win32
+		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x86.Build.0 = Profile|Win32
 		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x64.ActiveCfg = Release|x64
 		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x64.Build.0 = Release|x64
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x86.ActiveCfg = Debug|Win32
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x86.Build.0 = Debug|Win32
+		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x86.ActiveCfg = Release|Win32
+		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x86.Build.0 = Release|Win32
 		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x64.ActiveCfg = Debug|x64
 		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x64.Build.0 = Debug|x64
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x86.ActiveCfg = Profile|Win32
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x86.Build.0 = Profile|Win32
+		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x86.ActiveCfg = Debug|Win32
+		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x86.Build.0 = Debug|Win32
 		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x64.ActiveCfg = Profile|x64
 		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x64.Build.0 = Profile|x64
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x86.ActiveCfg = Release|Win32
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x86.Build.0 = Release|Win32
+		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x86.ActiveCfg = Profile|Win32
+		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x86.Build.0 = Profile|Win32
 		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x64.ActiveCfg = Release|x64
 		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x64.Build.0 = Release|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x86.ActiveCfg = Debug|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x86.Build.0 = Debug|Win32
+		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x86.ActiveCfg = Release|Win32
+		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x86.Build.0 = Release|Win32
 		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x64.ActiveCfg = Debug|x64
 		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x64.Build.0 = Debug|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x86.ActiveCfg = Profile|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x86.Build.0 = Profile|Win32
+		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x86.ActiveCfg = Debug|Win32
+		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x86.Build.0 = Debug|Win32
 		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x64.ActiveCfg = Profile|x64
 		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x64.Build.0 = Profile|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.ActiveCfg = Release|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.Build.0 = Release|Win32
+		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x86.ActiveCfg = Profile|Win32
+		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x86.Build.0 = Profile|Win32
 		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x64.ActiveCfg = Release|x64
 		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x64.Build.0 = Release|x64
+		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.ActiveCfg = Release|Win32
+		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.Build.0 = Release|Win32
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x64.ActiveCfg = Debug|x64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x64.Build.0 = Debug|x64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x86.ActiveCfg = Debug|Win32
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x86.Build.0 = Debug|Win32
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x64.ActiveCfg = Profile|x64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x64.Build.0 = Profile|x64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x86.ActiveCfg = Profile|Win32
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x86.Build.0 = Profile|Win32
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x64.ActiveCfg = Release|x64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x64.Build.0 = Release|x64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x86.ActiveCfg = Release|Win32
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -100,6 +114,7 @@ Global
 		{C3A65381-8FD3-4F69-B29E-654B4B0ED136} = {AEA1D9F7-EA95-4BF7-8E6D-0EA068077943}
 		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84} = {E14090F7-2FE9-47EE-A331-14ED71801FDE}
 		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D} = {AEA1D9F7-EA95-4BF7-8E6D-0EA068077943}
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C} = {AEA1D9F7-EA95-4BF7-8E6D-0EA068077943}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CFB3C228-4C26-4746-8E0C-71C310403E8C}

diff --git a/DirectXTex_Desktop_2019_Win10.sln b/DirectXTex_Desktop_2019_Win10.sln
@@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texdiag", "Texdiag\texdiag_
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{D5A15D28-50AF-4CFA-81F5-3968975BB78C}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texenvmap", "Texenvmap\Texenvmap_Desktop_2019_Win10.vcxproj", "{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -102,6 +104,24 @@ Global
 		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x64.Build.0 = Release|x64
 		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.ActiveCfg = Release|Win32
 		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.Build.0 = Release|Win32
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x64.ActiveCfg = Debug|x64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x64.Build.0 = Debug|x64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x86.ActiveCfg = Debug|Win32
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x86.Build.0 = Debug|Win32
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|ARM64.ActiveCfg = Profile|ARM64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|ARM64.Build.0 = Profile|ARM64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x64.ActiveCfg = Profile|x64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x64.Build.0 = Profile|x64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x86.ActiveCfg = Profile|Win32
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x86.Build.0 = Profile|Win32
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|ARM64.Build.0 = Release|ARM64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x64.ActiveCfg = Release|x64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x64.Build.0 = Release|x64
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x86.ActiveCfg = Release|Win32
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -110,6 +130,7 @@ Global
 		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1} = {D5A15D28-50AF-4CFA-81F5-3968975BB78C}
 		{C3A65381-8FD3-4F69-B29E-654B4B0ED136} = {D5A15D28-50AF-4CFA-81F5-3968975BB78C}
 		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D} = {D5A15D28-50AF-4CFA-81F5-3968975BB78C}
+		{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C} = {D5A15D28-50AF-4CFA-81F5-3968975BB78C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {22D52797-6BAE-4409-AE3B-513587E92758}