diff options
| author | David Neto <dneto@google.com> | 2016-09-21 12:31:38 -0400 |
|---|---|---|
| committer | David Neto <dneto@google.com> | 2016-09-21 13:18:36 -0400 |
| commit | a8a1d347c48f14698b7db3f3ac6e34b09f38a664 (patch) | |
| tree | 3a630ae5c002c4ae4200db24cd14f5aa92274502 | |
| parent | 6d112337e3cbc1bba5660958b41a516ce19967c8 (diff) | |
| parent | 62be0c04cd55a413dd0d1a55bd3bd4ab01f95e16 (diff) | |
| download | shaderc-a8a1d347c48f14698b7db3f3ac6e34b09f38a664.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into shaderc-update-master
Pulls in the following:
62be0c0 Update glslang error messages about entry points
e17bb8b Add util/parse_number.cpp to third_party/Android.mk
f6767fc SPIRV-Tools source/capability_set.cpp was removed
060500e Add SPIRV-Tools file source/capability_set.cpp
7e77671 Update Glslang sources for Android NDK build
Test: ndk/checkbuild.py on Linux; manually ran unit tests on Windows
Change-Id: I0708606800712f27361de07c3a1ad14ed374706a
| -rw-r--r-- | glslc/test/messages_tests.py | 8 | ||||
| -rw-r--r-- | third_party/Android.mk | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/glslc/test/messages_tests.py b/glslc/test/messages_tests.py index 6ac5016..21c1bbc 100644 --- a/glslc/test/messages_tests.py +++ b/glslc/test/messages_tests.py @@ -23,7 +23,7 @@ class MultipleErrors(expect.ErrorMessage): shader = FileShader('#version 140\nint main() {}', '.vert') glslc_args = ['-c', shader] expected_error = [ - shader, ":2: error: 'int' : main function cannot return a value\n", + shader, ":2: error: 'int' : entry point cannot return a value\n", shader, ":2: error: '' : function does not return a value: main\n", '2 errors generated.\n'] @@ -178,7 +178,7 @@ class WarningAndError(expect.ErrorMessage): expected_error = [ shader, ':2: warning: attribute deprecated in version 130; ', 'may be removed in future release\n', - shader, ":3: error: 'int' : main function cannot return a value\n", + shader, ":3: error: 'int' : entry point cannot return a value\n", shader, ":3: error: '' : function does not return a value: main\n", '1 warning and 2 errors generated.\n'] @@ -195,7 +195,7 @@ class SuppressedWarningAndError(expect.ErrorMessage): glslc_args = ['-c', shader, '-w'] expected_error = [ - shader, ":3: error: 'int' : main function cannot return a value\n", + shader, ":3: error: 'int' : entry point cannot return a value\n", shader, ":3: error: '' : function does not return a value: main\n", '2 errors generated.\n'] @@ -214,7 +214,7 @@ class WarningAsErrorAndError(expect.ErrorMessage): expected_error = [ shader, ':2: error: attribute deprecated in version 130; ', 'may be removed in future release\n', - shader, ":3: error: 'int' : main function cannot return a value\n", + shader, ":3: error: 'int' : entry point cannot return a value\n", shader, ":3: error: '' : function does not return a value: main\n", '3 errors generated.\n'] diff --git a/third_party/Android.mk b/third_party/Android.mk index 7084297..c9827fc 100644 --- a/third_party/Android.mk +++ b/third_party/Android.mk @@ -78,6 +78,7 @@ LOCAL_SRC_FILES:= \ glslang/MachineIndependent/limits.cpp \ glslang/MachineIndependent/linkValidate.cpp \ glslang/MachineIndependent/parseConst.cpp \ + glslang/MachineIndependent/ParseContextBase.cpp \ glslang/MachineIndependent/ParseHelper.cpp \ glslang/MachineIndependent/PoolAlloc.cpp \ glslang/MachineIndependent/propagateNoContraction.cpp \ @@ -183,6 +184,7 @@ LOCAL_SRC_FILES:= \ source/table.cpp \ source/text.cpp \ source/text_handler.cpp \ + source/util/parse_number.cpp \ source/val/BasicBlock.cpp \ source/val/Construct.cpp \ source/val/Function.cpp \ |