Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Roll deps & fix tests #1372

Merged
merged 2 commits into from
Sep 27, 2023
Merged

Roll deps & fix tests #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd13c8a
Roll deps
s-perron Sep 27, 2023
c0d3151
Fix expected preprocessing output
s-perron Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ vars = {

'abseil_revision': '5be22f98733c674d532598454ae729253bc53e82',
'effcee_revision' : '19b4aa87af25cb4ee779a071409732f34bfc305c',
'glslang_revision': '76b52ebf77833908dc4c0dd6c70a9c357ac720bd',
'googletest_revision': 'c541e7c11044b1e0303103ef8a47d7a9632c479b',
'glslang_revision': '2bfacdac91d5d9ba6bab7b4da52eb79c2300cd45',
'googletest_revision': 'e47544ad31cb3ceecd04cc13e8fe556f8df9fe0b',
're2_revision': 'c9cba76063cf4235c1a15dd14a24a4ef8d623761',
'spirv_headers_revision': '124a9665e464ef98b8b718d572d5f329311061eb',
'spirv_tools_revision': '8e3da01b45806fbacbb9e6fce9c5f9ae49f60e42',
'spirv_headers_revision': '79743b899fde5c954897b2694291002626358fac',
'spirv_tools_revision': '27673a054447e37810a38e7ce8d35a0a88af4a75',
}

deps = {
Expand Down
22 changes: 11 additions & 11 deletions glslc/test/line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class TestPoundVersion310InIncludingFile(
#line 1 "a.vert"

#line 1 "b.glsl"
void main(){ }
void main() { }
#line 3 "a.vert"

"""
Expand All @@ -61,7 +61,7 @@ class TestPoundVersion150InIncludingFile(
#line 0 "a.vert"

#line 0 "b.glsl"
void main(){ }
void main() { }
#line 2 "a.vert"

"""
Expand Down Expand Up @@ -138,7 +138,7 @@ class TestSpaceAroundPoundVersion310InIncludingFile(
#line 1 "a.vert"

#line 1 "b.glsl"
void main(){ }
void main() { }
#line 3 "a.vert"

"""
Expand All @@ -161,7 +161,7 @@ class TestSpaceAroundPoundVersion150InIncludingFile(
#line 0 "a.vert"

#line 0 "b.glsl"
void main(){ }
void main() { }
#line 2 "a.vert"

"""
Expand All @@ -183,7 +183,7 @@ class TestPoundLineWithForcedVersion310(
"""#extension GL_GOOGLE_include_directive : enable
#line 1 "a.vert"
#line 1 "b.glsl"
void main(){ }
void main() { }
#line 2 "a.vert"

"""
Expand All @@ -205,7 +205,7 @@ class TestPoundLineWithForcedVersion150(
"""#extension GL_GOOGLE_include_directive : enable
#line 0 "a.vert"
#line 0 "b.glsl"
void main(){ }
void main() { }
#line 1 "a.vert"

"""
Expand All @@ -230,7 +230,7 @@ class TestPoundLineWithForcedDifferentVersion(
#line 1 "a.vert"

#line 1 "b.glsl"
void main(){ }
void main() { }
#line 3 "a.vert"

"""
Expand Down Expand Up @@ -288,14 +288,14 @@ class TestExplicitPoundLineWithPoundInclude(
#line 1 "a.vert"

#line 10000 "injected.glsl"
int plus1(int a){ return a + 1;}
int plus1(int a) { return a + 1; }
#line 1 "inc.glsl"
int inc(int a){ return a + 1;}
int inc(int a) { return a + 1; }
#line 10002 "injected.glsl"
int plus2(int a){ return a + 2;}
int plus2(int a) { return a + 2; }
#line 55555
#line 1 "main.glsl"
void main(){
void main() {
gl_Position = vec4(1.);
}
#line 55556 "injected.glsl"
Expand Down
34 changes: 17 additions & 17 deletions glslc/test/option_dash_D.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ class TestDashCapDWithDashE(expect.ReturnCodeIsZero,

expected_stdout = [
"""
void main(){ return 3;}
void main() { return 3; }
"""]

@inside_glslc_testsuite('OptionCapD')
Expand All @@ -239,18 +239,18 @@ class TestDashCapDWithDashEIfDef(expect.ReturnCodeIsZero,
#else
void f() { int x; }
#endif
void main(){ return 3;}
void main(){ return 3; }
""", '.vert')
glslc_args = ['-DX', '-E', '-std=450core', shader]

expected_stdout = [
"""

void f(){ }
void f() { }



void main(){ return 3;}
void main() { return 3; }
"""]

@inside_glslc_testsuite('OptionCapD')
Expand All @@ -265,7 +265,7 @@ class TestDashCapDWithDashEIfNDef(expect.ReturnCodeIsZero,
#else
void f() { int x; }
#endif
void main(){ return 3;}
void main(){ return 3; }
""", '.vert')
glslc_args = ['-DX', '-E', '-std=450core', shader]

Expand All @@ -274,9 +274,9 @@ class TestDashCapDWithDashEIfNDef(expect.ReturnCodeIsZero,



void f(){ int x;}
void f() { int x; }

void main(){ return 3;}
void main() { return 3; }
"""]


Expand All @@ -292,18 +292,18 @@ class TestDashCapDWithDashEEqIfDef(expect.ReturnCodeIsZero,
#else
void f() { int x; }
#endif
void main(){ return 3;}
void main() { return 3; }
""", '.vert')
glslc_args = ['-DX=', '-E', '-std=450core', shader]

expected_stdout = [
"""

void f(){ }
void f() { }



void main(){ return 3;}
void main() { return 3; }
"""]

@inside_glslc_testsuite('OptionCapD')
Expand All @@ -318,7 +318,7 @@ class TestDashCapDWithDashEEqIfNDef(expect.ReturnCodeIsZero,
#else
void f() { int x; }
#endif
void main(){ return 3;}
void main(){ return 3; }
""", '.vert')
glslc_args = ['-DX=', '-E', '-std=450core', shader]

Expand All @@ -327,9 +327,9 @@ class TestDashCapDWithDashEEqIfNDef(expect.ReturnCodeIsZero,



void f(){ int x;}
void f() { int x; }

void main(){ return 3;}
void main() { return 3; }
"""]

@inside_glslc_testsuite('OptionCapD')
Expand All @@ -339,13 +339,13 @@ class TestDashCapDWithDashEFunctionMacro(expect.ReturnCodeIsZero,

shader = FileShader(
"""
void main(){ return FOO(3);}
void main(){ return FOO(3); }
""", '.vert')
glslc_args = ['-DFOO(x)=(2*x+1)*x*x', '-E', '-std=450core', shader]

expected_stdout = [
"""
void main(){ return(2 * 3 + 1)* 3 * 3;}
void main() { return(2 * 3 + 1) * 3 * 3; }
"""]

@inside_glslc_testsuite('OptionCapD')
Expand All @@ -355,11 +355,11 @@ class TestDashCapDWithDashENestedMacro(expect.ReturnCodeIsZero,

shader = FileShader(
"""
void main(){ return X;}
void main() { return X; }
""", '.vert')
glslc_args = ['-DY=4', '-DX=Y', '-E', '-std=450core', shader]

expected_stdout = [
"""
void main(){ return 4;}
void main() { return 4; }
"""]
40 changes: 20 additions & 20 deletions glslc/test/option_dash_E.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class TestDashCapENoDefs(expect.StdoutMatch):
"""Tests -E without any defines."""

shader = FileShader('#version 140\nvoid main(){}', '.vert')
expected_stdout = '#version 140\nvoid main(){ }\n'
expected_stdout = '#version 140\nvoid main() { }\n'
glslc_args = ['-E', shader]


Expand All @@ -31,7 +31,7 @@ class TestDashCapEGlslFileAccepted(expect.StdoutMatch):
"""Tests -E if we provide a .glsl file without an explicit stage."""

shader = FileShader('#version 140\nvoid main(){}', '.glsl')
expected_stdout = '#version 140\nvoid main(){ }\n'
expected_stdout = '#version 140\nvoid main() { }\n'
glslc_args = ['-E', shader]


Expand All @@ -40,7 +40,7 @@ class TestDashCapESingleDefine(expect.StdoutMatch):
"""Tests -E with command-line define."""

shader = FileShader('#version 140\nvoid main(){ int a = X; }', '.vert')
expected_stdout = '#version 140\nvoid main(){ int a = 4;}\n'
expected_stdout = '#version 140\nvoid main() { int a = 4; }\n'
glslc_args = ['-DX=4', '-E', shader]


Expand All @@ -57,7 +57,7 @@ class TestDashCapEExpansion(expect.StdoutMatch):

expected_stdout = '''#version 140

void main(){
void main() {
int a = 4;
}
'''
Expand All @@ -77,7 +77,7 @@ class TestDashCapEFunctionMacro(expect.StdoutMatch):

expected_stdout = '''#version 140

void main(){
void main() {
int a = 4 + 1;
}
'''
Expand All @@ -96,7 +96,7 @@ class TestDashCapEPragma(expect.StdoutMatch):

expected_stdout = '''#version 140
#pragma optimize(off)
void main(){
void main() {
}
'''
glslc_args = ['-E', shader]
Expand All @@ -114,7 +114,7 @@ class TestDashCapEExtension(expect.StdoutMatch):

expected_stdout = '''#version 140
#extension foo : require
void main(){
void main() {
}
'''
glslc_args = ['-E', shader]
Expand All @@ -140,7 +140,7 @@ class TestDashCapELine(expect.StdoutMatch):

#line 2 3

void main(){
void main() {
}
'''
glslc_args = ['-E', shader]
Expand Down Expand Up @@ -176,7 +176,7 @@ class TestDashCapEStdin(expect.StdoutMatch):
''')

expected_stdout = '''#version 140
void main(){
void main() {
}
'''
glslc_args = ['-E', '-fshader-stage=vertex', shader]
Expand All @@ -193,7 +193,7 @@ class TestDashCapEStdinDoesNotRequireShaderStage(expect.StdoutMatch):
''')

expected_stdout = '''#version 140
void main(){
void main() {
}
'''
glslc_args = ['-E', shader]
Expand All @@ -212,10 +212,10 @@ class TestDashCapEMultipleFiles(expect.StdoutMatch):
}
''', '.vert')
expected_stdout = '''#version 140
void main(){
void main() {
}
#version 140
void function(){
void function() {
}
'''
glslc_args = ['-E', '-fshader-stage=vertex', shader, shader2]
Expand All @@ -235,10 +235,10 @@ class TestDashCapEMultipleFilesWithoutStage(expect.StdoutMatch):
}
''', '.glsl')
expected_stdout = '''#version 140
void main(){
void main() {
}
#version 140
void function(){
void function() {
}
'''
glslc_args = ['-E', shader, shader2]
Expand All @@ -253,7 +253,7 @@ class TestDashCapEOutputFile(expect.SuccessfulReturn, expect.ValidFileContents):
}
''', '.vert')
expected_file_contents = '''#version 140
void function(){
void function() {
}
'''
target_filename = 'foo'
Expand All @@ -265,7 +265,7 @@ class TestDashCapEWithS(expect.StdoutMatch):
"""Tests -E in the presence of -S."""

shader = FileShader('#version 140\nvoid main(){}', '.vert')
expected_stdout = '#version 140\nvoid main(){ }\n'
expected_stdout = '#version 140\nvoid main() { }\n'
glslc_args = ['-E', '-S', shader]


Expand All @@ -274,7 +274,7 @@ class TestMultipileDashCapE(expect.StdoutMatch):
"""Tests that using -E multiple times works."""

shader = FileShader('#version 140\nvoid main(){}', '.vert')
expected_stdout = '#version 140\nvoid main(){ }\n'
expected_stdout = '#version 140\nvoid main() { }\n'
glslc_args = ['-E', '-E', shader, '-E']


Expand All @@ -283,7 +283,7 @@ class TestDashCapEAfterFile(expect.StdoutMatch):
"""Tests that using -E after the filename also works."""

shader = FileShader('#version 140\nvoid main(){}', '.vert')
expected_stdout = '#version 140\nvoid main(){ }\n'
expected_stdout = '#version 140\nvoid main() { }\n'
glslc_args = [shader, '-E']


Expand All @@ -300,10 +300,10 @@ class TestDashCapEWithDashC(expect.StdoutMatch):
}
''', '.vert')
expected_stdout = '''#version 140
void main(){
void main() {
}
#version 140
void function(){
void function() {
}
'''
glslc_args = ['-E', '-c', shader, shader2]
Expand Down
4 changes: 2 additions & 2 deletions glslc/test/option_dash_M.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,8 +552,8 @@ class TestDashCapMDMultipleFilePreprocessingOnlyMode(expect.StdoutMatch,
dependency_info_files_expected_contents.append([{'target': 'b.vert.spv',
'dependency': {'b.vert'}}
])
expected_stdout = ("#version 140\nvoid main(){ }\n"
"#version 140\nvoid main(){ }\n")
expected_stdout = ("#version 140\nvoid main() { }\n"
"#version 140\nvoid main() { }\n")


@inside_glslc_testsuite('OptionsCapM')
Expand Down
Loading