Skip to content

Commit 19c3915

Browse files
committed
Remove HLSL compiler code.
Per Ryan: "This was never completed, and is sort of stinking up the headers in general."
1 parent cf2661b commit 19c3915

108 files changed

Lines changed: 0 additions & 23447 deletions

File tree

Some content is hidden

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

CMakeLists.txt

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ OPTION(PROFILE_METAL "Build MojoShader with support for the Metal profile" APPLE
1919
OPTION(PROFILE_SPIRV "Build MojoShader with support for the SPIR-V profile" ON)
2020
OPTION(PROFILE_GLSPIRV "Build MojoShader with support for the ARB_gl_spirv profile" ON)
2121
OPTION(EFFECT_SUPPORT "Build MojoShader with support for Effect framework files" ON)
22-
OPTION(COMPILER_SUPPORT "Build MojoShader with support for HLSL source files" !WIN32) # TODO: Fix lemon on Windows
2322
OPTION(FLIP_VIEWPORT "Build MojoShader with the ability to flip the GL viewport" OFF)
2423
OPTION(DEPTH_CLIPPING "Build MojoShader with the ability to simulate [0, 1] depth clipping" OFF)
2524
OPTION(XNA4_VERTEXTEXTURE "Build MojoShader with XNA4 vertex texturing behavior" OFF)
@@ -91,18 +90,6 @@ IF(MSVC)
9190
ADD_DEFINITIONS(-TP) # force .c files to compile as C++.
9291
ENDIF(MSVC)
9392

94-
# We build lemon, then use it to generate parser C code.
95-
IF(COMPILER_SUPPORT)
96-
ADD_EXECUTABLE(lemon "misc/lemon.c")
97-
ADD_CUSTOM_COMMAND(
98-
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/mojoshader_parser_hlsl.h"
99-
MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/mojoshader_parser_hlsl.lemon"
100-
DEPENDS lemon "${CMAKE_CURRENT_SOURCE_DIR}/misc/lempar.c"
101-
COMMAND lemon
102-
ARGS -q "-T${CMAKE_CURRENT_SOURCE_DIR}/misc/lempar.c" "${CMAKE_CURRENT_SOURCE_DIR}/mojoshader_parser_hlsl.lemon"
103-
)
104-
ENDIF(COMPILER_SUPPORT)
105-
10693
IF(APPLE)
10794
IF(NOT IOS)
10895
find_library(CARBON_FRAMEWORK Carbon) # Stupid Gestalt.
@@ -187,14 +174,6 @@ IF(EFFECT_SUPPORT)
187174
mojoshader_effects.c
188175
)
189176
ENDIF(EFFECT_SUPPORT)
190-
IF(COMPILER_SUPPORT)
191-
TARGET_SOURCES(mojoshader PRIVATE
192-
mojoshader_compiler.c
193-
mojoshader_preprocessor.c
194-
mojoshader_lexer.c
195-
mojoshader_assembler.c
196-
)
197-
ENDIF(COMPILER_SUPPORT)
198177
IF(BUILD_SHARED_LIBS)
199178
TARGET_LINK_LIBRARIES(mojoshader ${LIBM} ${LOBJC} ${CARBON_FRAMEWORK})
200179
ENDIF(BUILD_SHARED_LIBS)
@@ -206,11 +185,6 @@ TARGET_INCLUDE_DIRECTORIES(mojoshader PUBLIC
206185
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../dxvk-native/include/native/wsi>
207186
)
208187

209-
SET_SOURCE_FILES_PROPERTIES(
210-
mojoshader_compiler.c
211-
PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/mojoshader_parser_hlsl.h"
212-
)
213-
214188
FIND_PROGRAM(RE2C re2c DOC "Path to re2c command line app: http://re2c.org/")
215189
IF(NOT RE2C)
216190
MESSAGE(STATUS "re2c missing. You can go on, but can't rebuild the lexer.")
@@ -237,19 +211,6 @@ IF(SDL2_FOUND)
237211
TARGET_LINK_LIBRARIES(testglcompile mojoshader ${SDL2_LIBRARIES} ${LIBM} ${LOBJC} ${CARBON_FRAMEWORK})
238212
ENDIF(SDL2_FOUND)
239213

240-
IF(COMPILER_SUPPORT)
241-
ADD_EXECUTABLE(finderrors utils/finderrors.c)
242-
IF(SDL2_FOUND)
243-
TARGET_LINK_LIBRARIES(finderrors mojoshader ${SDL2_LIBRARIES} ${LIBM} ${LOBJC} ${CARBON_FRAMEWORK})
244-
SET_SOURCE_FILES_PROPERTIES(
245-
utils/finderrors.c
246-
PROPERTIES COMPILE_FLAGS "-DFINDERRORS_COMPILE_SHADERS=1"
247-
)
248-
ELSE(SDL2_FOUND)
249-
TARGET_LINK_LIBRARIES(finderrors mojoshader ${LIBM} ${LOBJC} ${CARBON_FRAMEWORK})
250-
ENDIF(SDL2_FOUND)
251-
ENDIF(COMPILER_SUPPORT)
252-
253214
FIND_PATH(SPIRV_TOOLS_INCLUDE_DIR "spirv-tools/libspirv.h" PATH_SUFFIXES "include")
254215
FIND_LIBRARY(SPIRV_TOOLS_LIBRARY NAMES SPIRV-Tools-shared)
255216
IF(SPIRV_TOOLS_INCLUDE_DIR AND SPIRV_TOOLS_LIBRARY)
@@ -264,22 +225,6 @@ IF(SPIRV_TOOLS_INCLUDE_DIR AND SPIRV_TOOLS_LIBRARY)
264225
ENDIF(SPIRV_TOOLS_INCLUDE_DIR AND SPIRV_TOOLS_LIBRARY)
265226
ADD_EXECUTABLE(testoutput utils/testoutput.c)
266227
TARGET_LINK_LIBRARIES(testoutput mojoshader ${LIBM} ${LOBJC} ${CARBON_FRAMEWORK})
267-
IF(COMPILER_SUPPORT)
268-
ADD_EXECUTABLE(mojoshader-compiler utils/mojoshader-compiler.c)
269-
TARGET_LINK_LIBRARIES(mojoshader-compiler mojoshader ${LIBM} ${LOBJC} ${CARBON_FRAMEWORK})
270-
ENDIF(COMPILER_SUPPORT)
271-
272-
# Unit tests...
273-
IF(COMPILER_SUPPORT)
274-
ADD_CUSTOM_TARGET(
275-
test
276-
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/unit_tests/run_tests.pl"
277-
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
278-
DEPENDS mojoshader-compiler
279-
COMMENT "Running unit tests..."
280-
VERBATIM
281-
)
282-
ENDIF(COMPILER_SUPPORT)
283228

284229
# End of CMakeLists.txt ...
285230

0 commit comments

Comments
 (0)