Skip to content

Commit 8006640

Browse files
walbournwalbourn
committed
Started texenvmap tool
1 parent 73aa2f3 commit 8006640

20 files changed

+4177
-67
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ packages
2424
/DDSView/Shaders/*.pdb
2525
/DirectXTex/Shaders/Compiled/*.inc
2626
/DirectXTex/Shaders/Compiled/*.pdb
27+
/Texenvmap/Shaders/Compiled/*.inc
28+
/Texenvmap/Shaders/Compiled/*.pdb
2729
/ipch
2830
Debug
2931
Durango

‎CMakeLists.txt

+23
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,29 @@ if(BUILD_TOOLS AND BUILD_DX11 AND WIN32)
424424
target_link_libraries(texconv PRIVATE ${PROJECT_NAME} ole32.lib shell32.lib version.lib)
425425
source_group(texconv REGULAR_EXPRESSION Texconv/*.*)
426426
list(APPEND TOOL_EXES texconv)
427+
428+
if (NOT USE_PREBUILT_SHADERS)
429+
add_custom_command(
430+
OUTPUT "${COMPILED_SHADERS}/Texenvmap_VSBasic.inc"
431+
MAIN_DEPENDENCY "${PROJECT_SOURCE_DIR}/Texenvmap/Shaders/CompileShaders.cmd"
432+
DEPENDS "${PROJECT_SOURCE_DIR}/Texenvmap/Shaders/Texenvmap.fx"
433+
COMMENT "Generating HLSL shaders for texenvmap..."
434+
COMMAND set CompileShadersOutput=${COMPILED_SHADERS}
435+
COMMAND CompileShaders.cmd
436+
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/Texenvmap/Shaders"
437+
USES_TERMINAL)
438+
endif()
439+
440+
add_executable(texenvmap
441+
Texenvmap/texenvmap.cpp
442+
Texenvmap/texenvmap.rc
443+
Texenvmap/settings.manifest
444+
${COMPILED_SHADERS}/Texenvmap_VSBasic.inc)
445+
target_compile_features(texenvmap PRIVATE cxx_std_17)
446+
target_include_directories(texenvmap PRIVATE ${COMPILED_SHADERS})
447+
target_link_libraries(texenvmap ${PROJECT_NAME} ole32.lib version.lib)
448+
source_group(texenvmap REGULAR_EXPRESSION Texenvmap/*.*)
449+
list(APPEND TOOL_EXES texenvmap)
427450
endif()
428451

429452
if(BUILD_TOOLS AND WIN32)

‎DirectXTex_Desktop_2019.sln

+48-33
Original file line numberDiff line numberDiff line change
@@ -21,76 +21,90 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2121
.editorconfig = .editorconfig
2222
EndProjectSection
2323
EndProject
24+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texenvmap", "Texenvmap\Texenvmap_Desktop_2019.vcxproj", "{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}"
25+
EndProject
2426
Global
2527
GlobalSection(SolutionConfigurationPlatforms) = preSolution
26-
Debug|x86 = Debug|x86
2728
Debug|x64 = Debug|x64
28-
Profile|x86 = Profile|x86
29+
Debug|x86 = Debug|x86
2930
Profile|x64 = Profile|x64
30-
Release|x86 = Release|x86
31+
Profile|x86 = Profile|x86
3132
Release|x64 = Release|x64
33+
Release|x86 = Release|x86
3234
EndGlobalSection
3335
GlobalSection(ProjectConfigurationPlatforms) = postSolution
34-
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.ActiveCfg = Debug|Win32
35-
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.Build.0 = Debug|Win32
3636
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.ActiveCfg = Debug|x64
3737
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.Build.0 = Debug|x64
38-
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.ActiveCfg = Profile|Win32
39-
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.Build.0 = Profile|Win32
38+
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.ActiveCfg = Debug|Win32
39+
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.Build.0 = Debug|Win32
4040
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.ActiveCfg = Profile|x64
4141
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.Build.0 = Profile|x64
42-
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.ActiveCfg = Release|Win32
43-
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.Build.0 = Release|Win32
42+
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.ActiveCfg = Profile|Win32
43+
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.Build.0 = Profile|Win32
4444
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.ActiveCfg = Release|x64
4545
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.Build.0 = Release|x64
46-
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x86.ActiveCfg = Debug|Win32
47-
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x86.Build.0 = Debug|Win32
46+
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.ActiveCfg = Release|Win32
47+
{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.Build.0 = Release|Win32
4848
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x64.ActiveCfg = Debug|x64
4949
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x64.Build.0 = Debug|x64
50-
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x86.ActiveCfg = Profile|Win32
51-
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x86.Build.0 = Profile|Win32
50+
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x86.ActiveCfg = Debug|Win32
51+
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x86.Build.0 = Debug|Win32
5252
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x64.ActiveCfg = Profile|x64
5353
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x64.Build.0 = Profile|x64
54-
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x86.ActiveCfg = Release|Win32
55-
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x86.Build.0 = Release|Win32
54+
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x86.ActiveCfg = Profile|Win32
55+
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x86.Build.0 = Profile|Win32
5656
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x64.ActiveCfg = Release|x64
5757
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x64.Build.0 = Release|x64
58-
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x86.ActiveCfg = Debug|Win32
59-
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x86.Build.0 = Debug|Win32
58+
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x86.ActiveCfg = Release|Win32
59+
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x86.Build.0 = Release|Win32
6060
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x64.ActiveCfg = Debug|x64
6161
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x64.Build.0 = Debug|x64
62-
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x86.ActiveCfg = Profile|Win32
63-
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x86.Build.0 = Profile|Win32
62+
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x86.ActiveCfg = Debug|Win32
63+
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x86.Build.0 = Debug|Win32
6464
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x64.ActiveCfg = Profile|x64
6565
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x64.Build.0 = Profile|x64
66-
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x86.ActiveCfg = Release|Win32
67-
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x86.Build.0 = Release|Win32
66+
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x86.ActiveCfg = Profile|Win32
67+
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x86.Build.0 = Profile|Win32
6868
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x64.ActiveCfg = Release|x64
6969
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x64.Build.0 = Release|x64
70-
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x86.ActiveCfg = Debug|Win32
71-
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x86.Build.0 = Debug|Win32
70+
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x86.ActiveCfg = Release|Win32
71+
{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x86.Build.0 = Release|Win32
7272
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x64.ActiveCfg = Debug|x64
7373
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x64.Build.0 = Debug|x64
74-
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x86.ActiveCfg = Profile|Win32
75-
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x86.Build.0 = Profile|Win32
74+
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x86.ActiveCfg = Debug|Win32
75+
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x86.Build.0 = Debug|Win32
7676
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x64.ActiveCfg = Profile|x64
7777
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x64.Build.0 = Profile|x64
78-
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x86.ActiveCfg = Release|Win32
79-
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x86.Build.0 = Release|Win32
78+
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x86.ActiveCfg = Profile|Win32
79+
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x86.Build.0 = Profile|Win32
8080
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x64.ActiveCfg = Release|x64
8181
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x64.Build.0 = Release|x64
82-
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x86.ActiveCfg = Debug|Win32
83-
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x86.Build.0 = Debug|Win32
82+
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x86.ActiveCfg = Release|Win32
83+
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x86.Build.0 = Release|Win32
8484
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x64.ActiveCfg = Debug|x64
8585
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x64.Build.0 = Debug|x64
86-
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x86.ActiveCfg = Profile|Win32
87-
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x86.Build.0 = Profile|Win32
86+
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x86.ActiveCfg = Debug|Win32
87+
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x86.Build.0 = Debug|Win32
8888
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x64.ActiveCfg = Profile|x64
8989
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x64.Build.0 = Profile|x64
90-
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.ActiveCfg = Release|Win32
91-
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.Build.0 = Release|Win32
90+
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x86.ActiveCfg = Profile|Win32
91+
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x86.Build.0 = Profile|Win32
9292
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x64.ActiveCfg = Release|x64
9393
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x64.Build.0 = Release|x64
94+
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.ActiveCfg = Release|Win32
95+
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.Build.0 = Release|Win32
96+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x64.ActiveCfg = Debug|x64
97+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x64.Build.0 = Debug|x64
98+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x86.ActiveCfg = Debug|Win32
99+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x86.Build.0 = Debug|Win32
100+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x64.ActiveCfg = Profile|x64
101+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x64.Build.0 = Profile|x64
102+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x86.ActiveCfg = Profile|Win32
103+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x86.Build.0 = Profile|Win32
104+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x64.ActiveCfg = Release|x64
105+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x64.Build.0 = Release|x64
106+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x86.ActiveCfg = Release|Win32
107+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x86.Build.0 = Release|Win32
94108
EndGlobalSection
95109
GlobalSection(SolutionProperties) = preSolution
96110
HideSolutionNode = FALSE
@@ -100,6 +114,7 @@ Global
100114
{C3A65381-8FD3-4F69-B29E-654B4B0ED136} = {AEA1D9F7-EA95-4BF7-8E6D-0EA068077943}
101115
{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84} = {E14090F7-2FE9-47EE-A331-14ED71801FDE}
102116
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D} = {AEA1D9F7-EA95-4BF7-8E6D-0EA068077943}
117+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C} = {AEA1D9F7-EA95-4BF7-8E6D-0EA068077943}
103118
EndGlobalSection
104119
GlobalSection(ExtensibilityGlobals) = postSolution
105120
SolutionGuid = {CFB3C228-4C26-4746-8E0C-71C310403E8C}

‎DirectXTex_Desktop_2019_Win10.sln

+21
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texdiag", "Texdiag\texdiag_
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{D5A15D28-50AF-4CFA-81F5-3968975BB78C}"
1919
EndProject
20+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texenvmap", "Texenvmap\Texenvmap_Desktop_2019_Win10.vcxproj", "{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}"
21+
EndProject
2022
Global
2123
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2224
Debug|ARM64 = Debug|ARM64
@@ -102,6 +104,24 @@ Global
102104
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x64.Build.0 = Release|x64
103105
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.ActiveCfg = Release|Win32
104106
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.Build.0 = Release|Win32
107+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|ARM64.ActiveCfg = Debug|ARM64
108+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|ARM64.Build.0 = Debug|ARM64
109+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x64.ActiveCfg = Debug|x64
110+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x64.Build.0 = Debug|x64
111+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x86.ActiveCfg = Debug|Win32
112+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Debug|x86.Build.0 = Debug|Win32
113+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|ARM64.ActiveCfg = Profile|ARM64
114+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|ARM64.Build.0 = Profile|ARM64
115+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x64.ActiveCfg = Profile|x64
116+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x64.Build.0 = Profile|x64
117+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x86.ActiveCfg = Profile|Win32
118+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Profile|x86.Build.0 = Profile|Win32
119+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|ARM64.ActiveCfg = Release|ARM64
120+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|ARM64.Build.0 = Release|ARM64
121+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x64.ActiveCfg = Release|x64
122+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x64.Build.0 = Release|x64
123+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x86.ActiveCfg = Release|Win32
124+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C}.Release|x86.Build.0 = Release|Win32
105125
EndGlobalSection
106126
GlobalSection(SolutionProperties) = preSolution
107127
HideSolutionNode = FALSE
@@ -110,6 +130,7 @@ Global
110130
{8F18CBD7-4116-4956-BCD8-20D688A4CBD1} = {D5A15D28-50AF-4CFA-81F5-3968975BB78C}
111131
{C3A65381-8FD3-4F69-B29E-654B4B0ED136} = {D5A15D28-50AF-4CFA-81F5-3968975BB78C}
112132
{8E31A619-F4F8-413F-A973-4EE37B1AAA5D} = {D5A15D28-50AF-4CFA-81F5-3968975BB78C}
133+
{618E1A32-0334-4DEB-B1D0-F0A0AFC1DE5C} = {D5A15D28-50AF-4CFA-81F5-3968975BB78C}
113134
EndGlobalSection
114135
GlobalSection(ExtensibilityGlobals) = postSolution
115136
SolutionGuid = {22D52797-6BAE-4409-AE3B-513587E92758}

0 commit comments

Comments
 (0)