mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove glslang.m4

Browse Source 
The m4 grammar build mechanism was only ever needed as a preprocessor
for bison, to be used with GLSLANG_WEB, which has now been removed.

Fixes #2958
This commit is contained in:
Arcady Goldmints-Orlov 2023-07-28 12:02:44 -06:00 committed by arcady-lunarg
parent 6bc35749ec
commit 54726b3c1c
5 changed files with 2 additions and 4434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -234,16 +234,13 @@ changes are quite infrequent. For windows you can get binaries from
The command to rebuild is: The command to rebuild is:
```bash ```bash
m4 -P MachineIndependent/glslang.m4 > MachineIndependent/glslang.y
bison --defines=MachineIndependent/glslang_tab.cpp.h bison --defines=MachineIndependent/glslang_tab.cpp.h
-t MachineIndependent/glslang.y -t MachineIndependent/glslang.y
-o MachineIndependent/glslang_tab.cpp -o MachineIndependent/glslang_tab.cpp
``` ```
The above commands are also available in the bash script in `updateGrammar`, The above command is also available in the bash script in `updateGrammar`,
when executed from the glslang subdirectory of the glslang repository. when executed from the glslang subdirectory of the glslang repository.
With no arguments it builds the full grammar, and with a "web" argument,
the web grammar subset (see more about the web subset in the next section).
### Building to WASM for the Web and Node ### Building to WASM for the Web and Node
### Building a standalone JS/WASM library for the Web and Node ### Building a standalone JS/WASM library for the Web and Node

1
glslang/CMakeLists.txt
View File

@ -57,7 +57,6 @@ set_property(TARGET GenericCodeGen PROPERTY FOLDER glslang)
# MachineIndependent # MachineIndependent
################################################################################ ################################################################################
set(MACHINEINDEPENDENT_SOURCES set(MACHINEINDEPENDENT_SOURCES
MachineIndependent/glslang.m4
MachineIndependent/glslang.y MachineIndependent/glslang.y
MachineIndependent/glslang_tab.cpp MachineIndependent/glslang_tab.cpp
MachineIndependent/attribute.cpp MachineIndependent/attribute.cpp

4419
glslang/MachineIndependent/glslang.m4
View File

File diff suppressed because it is too large Load Diff

8
glslang/MachineIndependent/glslang.y
View File

@ -37,14 +37,6 @@
// POSSIBILITY OF SUCH DAMAGE. // POSSIBILITY OF SUCH DAMAGE.
// //
//
// Do not edit the .y file, only edit the .m4 file.
// The .y bison file is not a source file, it is a derivative of the .m4 file.
// The m4 file needs to be processed by m4 to generate the .y bison file.
//
// m4 -P
//
/** /**
* This is bison grammar and productions for parsing all versions of the * This is bison grammar and productions for parsing all versions of the
* GLSL shading languages. * GLSL shading languages.

3
glslang/updateGrammar
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
# Copyright (C) 2020 The Khronos Group Inc. # Copyright (C) 2020 The Khronos Group Inc.
# #
@ -33,5 +33,4 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
m4 -P MachineIndependent/glslang.m4 > MachineIndependent/glslang.y
bison --defines=MachineIndependent/glslang_tab.cpp.h -t MachineIndependent/glslang.y -o MachineIndependent/glslang_tab.cpp bison --defines=MachineIndependent/glslang_tab.cpp.h -t MachineIndependent/glslang.y -o MachineIndependent/glslang_tab.cpp