Skip to content

Commit c76e0a4

Browse files
ld-kerleyld-kerley
committed
Creating MaterialXGenHW module to separate the HW shading language specific components out from the common shader generation system
1 parent 5818e06 commit c76e0a4

File tree

103 files changed

+1046
-802
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1046
-802
lines changed

‎CMakeLists.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ if(MSVC)
287287
add_compile_options(/WX)
288288
endif()
289289
else()
290-
add_compile_options(-Wall -Wno-missing-braces)
290+
add_compile_options(-Wall -Wno-missing-braces -Wunused-parameter)
291291
if(MATERIALX_WARNINGS_AS_ERRORS)
292292
add_compile_options(-Werror)
293293
endif()
@@ -450,6 +450,10 @@ add_subdirectory(source/MaterialXFormat)
450450
# Add shader generation subdirectories
451451
add_subdirectory(source/MaterialXGenShader)
452452
if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_OSL OR MATERIALX_BUILD_GEN_MDL OR MATERIALX_BUILD_GEN_MSL)
453+
if(MATERIALX_BUILD_GEN_GLSL OR MATERIALX_BUILD_GEN_MSL)
454+
add_subdirectory(source/MaterialXGenHw)
455+
endif()
456+
453457
if (MATERIALX_BUILD_GEN_GLSL)
454458
add_definitions(-DMATERIALX_BUILD_GEN_GLSL)
455459
add_subdirectory(source/MaterialXGenGlsl)

‎source/JsMaterialX/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ target_link_libraries(JsMaterialXGenShader
141141
PUBLIC MaterialXCore
142142
PUBLIC MaterialXFormat
143143
PUBLIC MaterialXGenShader
144+
PUBLIC MaterialXGenHw
144145
PUBLIC MaterialXGenGlsl
145146
PRIVATE ${CMAKE_DL_LIBS})
146147

‎source/JsMaterialX/JsMaterialXGenShader/JsHwShaderGenerator.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
// SPDX-License-Identifier: Apache-2.0
44
//
55

6-
#include <MaterialXGenShader/HwShaderGenerator.h>
6+
#include <MaterialXGenHw/HwShaderGenerator.h>
7+
#include <MaterialXGenShader/GenContext.h>
78

89
#include <emscripten/bind.h>
910

‎source/MaterialXGenGlsl/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ mx_add_library(MaterialXGenGlsl
77
HEADER_FILES
88
${materialx_headers}
99
MTLX_MODULES
10-
MaterialXGenShader
10+
MaterialXGenHw
1111
MaterialXCore
1212
EXPORT_DEFINE
1313
MATERIALX_GENGLSL_EXPORTS)

‎source/MaterialXGenGlsl/EsslShaderGenerator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <MaterialXGenGlsl/EsslShaderGenerator.h>
77
#include <MaterialXGenGlsl/EsslSyntax.h>
88

9-
#include <MaterialXGenShader/Nodes/HwImageNode.h>
9+
#include <MaterialXGenHw/HwConstants.h>
1010

1111
MATERIALX_NAMESPACE_BEGIN
1212

‎source/MaterialXGenGlsl/GlslResourceBindingContext.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
#include <MaterialXGenGlsl/GlslResourceBindingContext.h>
77

8+
#include <MaterialXGenShader/GenContext.h>
9+
810
MATERIALX_NAMESPACE_BEGIN
911

1012
//

‎source/MaterialXGenGlsl/GlslResourceBindingContext.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <MaterialXGenGlsl/Export.h>
1313

14-
#include <MaterialXGenShader/HwShaderGenerator.h>
14+
#include <MaterialXGenHw/HwResourceBindingContext.h>
1515

1616
MATERIALX_NAMESPACE_BEGIN
1717

‎source/MaterialXGenGlsl/GlslShaderGenerator.cpp‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,27 @@
66
#include <MaterialXGenGlsl/GlslShaderGenerator.h>
77

88
#include <MaterialXGenGlsl/GlslSyntax.h>
9+
#include <MaterialXGenHw/HwLightShaders.h>
910

1011
#include <MaterialXGenShader/Nodes/MaterialNode.h>
11-
#include <MaterialXGenShader/Nodes/HwImageNode.h>
12-
#include <MaterialXGenShader/Nodes/HwGeomColorNode.h>
13-
#include <MaterialXGenShader/Nodes/HwGeomPropValueNode.h>
14-
#include <MaterialXGenShader/Nodes/HwTexCoordNode.h>
15-
#include <MaterialXGenShader/Nodes/HwTransformNode.h>
16-
#include <MaterialXGenShader/Nodes/HwPositionNode.h>
17-
#include <MaterialXGenShader/Nodes/HwNormalNode.h>
18-
#include <MaterialXGenShader/Nodes/HwTangentNode.h>
19-
#include <MaterialXGenShader/Nodes/HwBitangentNode.h>
20-
#include <MaterialXGenShader/Nodes/HwFrameNode.h>
21-
#include <MaterialXGenShader/Nodes/HwTimeNode.h>
22-
#include <MaterialXGenShader/Nodes/HwViewDirectionNode.h>
23-
#include <MaterialXGenShader/Nodes/HwLightCompoundNode.h>
24-
#include <MaterialXGenShader/Nodes/HwLightNode.h>
25-
#include <MaterialXGenShader/Nodes/HwLightSamplerNode.h>
26-
#include <MaterialXGenShader/Nodes/HwLightShaderNode.h>
27-
#include <MaterialXGenShader/Nodes/HwNumLightsNode.h>
28-
#include <MaterialXGenShader/Nodes/HwSurfaceNode.h>
12+
#include <MaterialXGenHw/Nodes/HwImageNode.h>
13+
#include <MaterialXGenHw/Nodes/HwGeomColorNode.h>
14+
#include <MaterialXGenHw/Nodes/HwGeomPropValueNode.h>
15+
#include <MaterialXGenHw/Nodes/HwTexCoordNode.h>
16+
#include <MaterialXGenHw/Nodes/HwTransformNode.h>
17+
#include <MaterialXGenHw/Nodes/HwPositionNode.h>
18+
#include <MaterialXGenHw/Nodes/HwNormalNode.h>
19+
#include <MaterialXGenHw/Nodes/HwTangentNode.h>
20+
#include <MaterialXGenHw/Nodes/HwBitangentNode.h>
21+
#include <MaterialXGenHw/Nodes/HwFrameNode.h>
22+
#include <MaterialXGenHw/Nodes/HwTimeNode.h>
23+
#include <MaterialXGenHw/Nodes/HwViewDirectionNode.h>
24+
#include <MaterialXGenHw/Nodes/HwLightCompoundNode.h>
25+
#include <MaterialXGenHw/Nodes/HwLightNode.h>
26+
#include <MaterialXGenHw/Nodes/HwLightSamplerNode.h>
27+
#include <MaterialXGenHw/Nodes/HwLightShaderNode.h>
28+
#include <MaterialXGenHw/Nodes/HwNumLightsNode.h>
29+
#include <MaterialXGenHw/Nodes/HwSurfaceNode.h>
2930

3031
MATERIALX_NAMESPACE_BEGIN
3132

‎source/MaterialXGenGlsl/GlslShaderGenerator.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
#include <MaterialXGenGlsl/Export.h>
1313

14-
#include <MaterialXGenShader/HwShaderGenerator.h>
14+
#include <MaterialXGenHw/HwShaderGenerator.h>
15+
#include <MaterialXGenHw/HwResourceBindingContext.h>
1516

1617
MATERIALX_NAMESPACE_BEGIN
1718

‎source/MaterialXGenGlsl/GlslSyntax.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include <MaterialXGenGlsl/GlslSyntax.h>
77

88
#include <MaterialXGenShader/ShaderGenerator.h>
9-
#include <MaterialXGenShader/HwShaderGenerator.h>
109

1110
MATERIALX_NAMESPACE_BEGIN
1211

0 commit comments

Comments
 (0)