Commit ae8d0a58 authored by Chad Versace's avatar Chad Versace

glsl_parser_test: Rename config opt 'extension' to 'require_extensions'

... and update all test file using the option.

The new name makes clear what the option does.
parent f183de62
......@@ -129,7 +129,7 @@ class GLSLParserTest(PlainExecTest):
Nonrequired Options
-------------------
* extensions: List of GL extensions. If an extension is not
* require_extensions: List of GL extensions. If an extension is not
supported, the test is skipped. Each extension name must begin
with GL and elements are separated by whitespace.
......@@ -140,7 +140,7 @@ class GLSLParserTest(PlainExecTest):
// glsl_version: 1.30
// expect_result: pass
// # Lists may be single-line.
// extensions: GL_ARB_fragment_coord_conventions GL_AMD_conservative_depth
// require_extensions: GL_ARB_fragment_coord_conventions GL_AMD_conservative_depth
// [end config]
::
......@@ -148,7 +148,7 @@ class GLSLParserTest(PlainExecTest):
* glsl_version: 1.30
* expect_result: pass
* # Lists may be span multiple lines.
* extensions:
* required_extensions:
* GL_ARB_fragment_coord_conventions
* GL_AMD_conservative_depth
* [end config]
......@@ -366,7 +366,7 @@ class GLSLParserTest(PlainExecTest):
self.config.get('config', 'expect_result'),
self.config.get('config', 'glsl_version')
]
command += self.config.get('config', 'extensions').split()
command += self.config.get('config', 'require_extensions').split()
return command
@property
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// The 'location' layout qualifier can only be used with 'in' and 'out'.
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "in" is allowed in shader input declarations in GLSL 1.10 when
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "in" is allowed in shader input declarations in GLSL 1.10 when
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "in" is not allowed on function local variables in GLSL 1.10 even when
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "in" is not allowed on function local variables in GLSL 1.10 even when
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// GL_ARB_explicit_attrib_location interacts with the 'centroid' qualifier,
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// From the GL_ARB_explicit_attrib_location spec:
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "out" is allowed in fragment shader output declarations in GLSL 1.10 when
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
#version 110
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// 'location' must be an integer constant
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// 'location' must be an integer constant
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// 'location' must be an integer constant
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// 'location' must be an integer constant
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// 'location' must be an integer constant
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// 'location' must be an integer constant
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// The 'layout' qualifier must come before 'in' or 'out'
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// The 'layout' qualifier must come before 'in' or 'out'
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
#version 110
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
#version 110
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
#version 110
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
#version 110
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
#version 110
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
#version 110
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// Even though the specified location is clearly too large, the spec says that
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// Even though the specified location is clearly too large, the spec says that
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// Even though the specified locations overlap, the spec says that a *link*
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// Even though the specified locations overlap, the spec says that a *link*
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// Even though there are too may outputs active, the spec says that a *link*
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// Even though the specified locations overlap, the spec says that a *link*
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// Even though the specified locations overlap, the spec says that a *link*
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// Even though the specified locations overlap, the spec says that a *link*
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "out" is allowed in fragment shader output declarations in GLSL 1.10 when
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "out" is allowed in shader output declarations in GLSL 1.10 when
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "out" is not allowed on function local variables in GLSL 1.10 even when
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "out" is not allowed on function local variables in GLSL 1.10 even when
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// GL_ARB_explicit_attrib_location interacts with the 'centroid' qualifier,
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// From the GL_ARB_explicit_attrib_location spec:
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// The 'location' layout qualifier can only be used with 'in' and 'out'. Also,
......
// [config]
// expect_result: fail
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// The 'location' layout qualifier can only be used with 'in' and 'out'. Also,
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
#version 110
......
// [config]
// expect_result: pass
// glsl_version: 1.10
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
#version 110
......
// [config]
// expect_result: fail
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// The 'location' layout qualifier can only be used with 'in' and 'out'.
......
// [config]
// expect_result: pass
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "in" is allowed in shader input declarations in GLSL 1.20 when
......
// [config]
// expect_result: pass
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "in" is allowed in shader input declarations in GLSL 1.20 when
......
// [config]
// expect_result: fail
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "in" is not allowed on function local variables in GLSL 1.20 even when
......
// [config]
// expect_result: fail
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "in" is not allowed on function local variables in GLSL 1.20 even when
......
// [config]
// expect_result: pass
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
#version 120
......
// [config]
// expect_result: pass
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// From the GL_ARB_explicit_attrib_location spec:
......
// [config]
// expect_result: fail
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// 'centroid' must appear before 'in'.
......
// [config]
// expect_result: pass
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// "out" is allowed in fragment shader output declarations in GLSL 1.20 when
......
// [config]
// expect_result: pass
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
#version 120
......
// [config]
// expect_result: fail
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// 'location' must be an integer constant
......
// [config]
// expect_result: fail
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// 'location' must be an integer constant
......
// [config]
// expect_result: pass
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// 'location' must be an integer constant
......
// [config]
// expect_result: pass
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// 'location' must be an integer constant
......
// [config]
// expect_result: fail
// glsl_version: 1.20
// extension: GL_ARB_explicit_attrib_location
// require_extensions: GL_ARB_explicit_attrib_location
// [end config]
//
// 'location' must be an integer constant
......