review.tizen.org Git - platform/upstream/glslang.git/commit

projects / platform / upstream / glslang.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 5d43c4a) | patch

author	John Kessenich <cepheus@frii.com>
	Sat, 8 Dec 2018 01:38:26 +0000 (18:38 -0700)
committer	John Kessenich <cepheus@frii.com>
	Sat, 8 Dec 2018 01:38:26 +0000 (18:38 -0700)
commit	bd1c1831d5d1a81bdd1c595250199babca37a938
tree	e63af25323463a228cba38445a162341b9a8b1e1	tree \| snapshot
parent	5d43c4aac776f1504dc5c364bae49251eadb8111	commit \| diff

Manually merge ClemensRognerSD-dx9-sampler and resolve conflicts.

13 files changed:

StandAlone/StandAlone.cpp		diff \| blob \| history
Test/baseResults/hlsl.sample.dx9.frag.out	[new file with mode: 0644]	blob
Test/baseResults/hlsl.sample.dx9.vert.out	[new file with mode: 0644]	blob
Test/hlsl.sample.dx9.frag	[new file with mode: 0644]	blob
Test/hlsl.sample.dx9.vert	[new file with mode: 0644]	blob
glslang/MachineIndependent/parseVersions.h		diff \| blob \| history
glslang/Public/ShaderLang.h		diff \| blob \| history
gtests/Hlsl.FromFile.cpp	[changed mode: 0644->0755]	diff \| blob \| history
gtests/TestFixture.h		diff \| blob \| history
hlsl/hlslGrammar.cpp		diff \| blob \| history
hlsl/hlslGrammar.h		diff \| blob \| history
hlsl/hlslParseHelper.cpp		diff \| blob \| history
hlsl/hlslParseables.cpp		diff \| blob \| history

Domain: Graphics System / GL;