Add scanner that can find '#version' across an array of non-null terminated, length-based, strings. Handle the ES error where #version is not the first thing found, while still supporting desktop behavior, and more generally support length-based multiple strings for a single shader.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22165 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
parent
ebf0825ec4
commit
41cf6b540b
8 changed files with 386 additions and 144 deletions
|
|
@ -11,12 +11,12 @@ LIBCODEGEN=./../GenericCodeGen/libCodeGen.a
|
|||
OBJECTS= Initialize.o IntermTraverse.o \
|
||||
Intermediate.o ParseHelper.o PoolAlloc.o QualifierAlive.o \
|
||||
RemoveTree.o ShaderLang.o intermOut.o parseConst.o SymbolTable.o \
|
||||
InfoSink.o Versions.o Constant.o
|
||||
InfoSink.o Versions.o Constant.o Scan.o
|
||||
|
||||
SRCS= gen_glslang.cpp gen_glslang_tab.cpp Initialize.cpp IntermTraverse.cpp \
|
||||
Intermediate.cpp ParseHelper.cpp PoolAlloc.cp QualifierAlive.cpp \
|
||||
RemoveTree.cpp ShaderLang.cpp SymbolTable.cpp intermOut.cpp \
|
||||
parseConst.cpp InfoSink.cpp Versions.cpp Constant.cpp
|
||||
parseConst.cpp InfoSink.cpp Versions.cpp Constant.cpp Scan.cpp
|
||||
CPPFLAGS=$(DEFINE) $(INCLUDE) -fPIC
|
||||
SHAREDOBJECT=./lib/libglslang.so
|
||||
|
||||
|
|
@ -161,3 +161,4 @@ parseConst.o: ../Public/ShaderLang.h
|
|||
InfoSink.o: ../Include/InfoSink.h
|
||||
Versions.o: ParseHelper.h Versions.h ../Include/ShHandle.h SymbolTable.h localintermediate.h
|
||||
Constant.o: localintermediate.h ../Include/intermediate.h ../Public/ShaderLang.h SymbolTable.h Versions.h
|
||||
Scan.o: Scan.h Versions.h
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue