Merge branch 'master' into kg15 (0b46c1ed) · 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

0b46c1ed

Unverified Commit 0b46c1ed authored 7 years ago by greg-lunarg Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge branch 'master' into kg15

parents eecb874c 7cec64fc

No related branches found

No related tags found

No related merge requests found

Changes 58

Expand all Hide whitespace changes

Inline Side-by-side

Showing

SPIRV/GlslangToSpv.cpp 151 additions, 124 deletions

SPIRV/GlslangToSpv.cpp
SPIRV/SpvBuilder.cpp 64 additions, 1 deletion

SPIRV/SpvBuilder.cpp
SPIRV/SpvBuilder.h 4 additions, 0 deletions

SPIRV/SpvBuilder.h
SPIRV/doc.cpp 23 additions, 0 deletions

SPIRV/doc.cpp
StandAlone/StandAlone.cpp 18 additions, 7 deletions

StandAlone/StandAlone.cpp
Test/baseResults/300.frag.out 1 addition, 1 deletion

Test/baseResults/300.frag.out
Test/baseResults/310.frag.out 1 addition, 1 deletion

Test/baseResults/310.frag.out
Test/baseResults/310.tese.out 1 addition, 1 deletion

Test/baseResults/310.tese.out
Test/baseResults/320.frag.out 1 addition, 1 deletion

Test/baseResults/320.frag.out
Test/baseResults/320.tese.out 1 addition, 1 deletion

Test/baseResults/320.tese.out
Test/baseResults/cppRelaxSkipTokensErrors.vert.out 14 additions, 0 deletions

Test/baseResults/cppRelaxSkipTokensErrors.vert.out
Test/baseResults/hlsl.implicitBool.frag.out 106 additions, 109 deletions

Test/baseResults/hlsl.implicitBool.frag.out
Test/baseResults/hlsl.logical.binary.frag.out 48 additions, 53 deletions

Test/baseResults/hlsl.logical.binary.frag.out
Test/baseResults/hlsl.structbuffer.incdec.frag.hlslfun1.out 125 additions, 0 deletions

Test/baseResults/hlsl.structbuffer.incdec.frag.hlslfun1.out
Test/baseResults/nvShaderNoperspectiveInterpolation.frag.out 38 additions, 0 deletions

Test/baseResults/nvShaderNoperspectiveInterpolation.frag.out
Test/baseResults/spv.debugInfo.1.1.frag.out 1 addition, 0 deletions

Test/baseResults/spv.debugInfo.1.1.frag.out
Test/baseResults/spv.debugInfo.frag.out 1 addition, 0 deletions

Test/baseResults/spv.debugInfo.frag.out
Test/baseResults/spv.int16.frag.out 336 additions, 338 deletions

Test/baseResults/spv.int16.frag.out
Test/baseResults/spv.int32.frag.out 330 additions, 332 deletions

Test/baseResults/spv.int32.frag.out
Test/baseResults/spv.int64.frag.out 369 additions, 362 deletions

Test/baseResults/spv.int64.frag.out

with 1633 additions and 1331 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