Merge pull request #1031 from xxxbxxx/for-upstream-2 (a459fc81) · Commits · CodeLinaro / public-release-test-restored / platform / external / deqp-deps / glslang · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

glslang
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

a459fc81

Commit a459fc81 authored 7 years ago by John Kessenich Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #1031 from xxxbxxx/for-upstream-2

HLSL: fix preprocessor concatenation behaviour.

parents 4e2f05da eb71cdd5

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Test/baseResults/hlsl.preprocessor.frag.out 163 additions, 0 deletions

Test/baseResults/hlsl.preprocessor.frag.out
Test/baseResults/hlsl.semantic-1.vert.out 374 additions, 0 deletions

Test/baseResults/hlsl.semantic-1.vert.out
Test/hlsl.preprocessor.frag 13 additions, 0 deletions

Test/hlsl.preprocessor.frag
Test/hlsl.semantic-1.vert 24 additions, 0 deletions

Test/hlsl.semantic-1.vert
glslang/MachineIndependent/preprocessor/Pp.cpp 4 additions, 0 deletions

glslang/MachineIndependent/preprocessor/Pp.cpp
gtests/Hlsl.FromFile.cpp 2 additions, 0 deletions

gtests/Hlsl.FromFile.cpp

with 580 additions and 0 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment