From 62be0c04cd55a413dd0d1a55bd3bd4ab01f95e16 Mon Sep 17 00:00:00 2001 From: David Neto Date: Tue, 20 Sep 2016 09:41:08 -0400 Subject: Update glslang error messages about entry points Change "main function" to "entry point" --- glslc/test/messages_tests.py | 8 ++++---- 1 file changed, 4 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'] -- cgit v1.2.3