summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorChad Versace <chad.versace@intel.com>2011-01-27 15:08:01 -0800
committerChad Versace <chad.versace@intel.com>2011-01-27 16:28:04 -0800
commit8d05f057bbb56b4c89e02fcaf6e63bfbd5f538db (patch)
tree0c06839fa7e909ab6389223a9f9d4f2cd3cc98e9 /framework
parent7e5323f856f189a2a0dd82fe8d4783841b73d076 (diff)
Revert "glsl_parser_test: Add config opt 'override_extensions'"
This reverts commit 3fd587bcd8efa12baa65ef59f7ac527199b31f12. The email that precipitated the revert: On 01/27/2011 11:52 AM, Ian Romanick wrote: I don't understand why it is useful / necessary to have this in the test. If you're trying to test driver features while they're being implemented, you can / should do this by hand. If you're not trying to test driver features while they're being implemented, you don't any this to happen behind your back.
Diffstat (limited to 'framework')
-rwxr-xr-xframework/glsl_parser_test.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/framework/glsl_parser_test.py b/framework/glsl_parser_test.py
index d1979c11..d5fdd5ea 100755
--- a/framework/glsl_parser_test.py
+++ b/framework/glsl_parser_test.py
@@ -129,9 +129,6 @@ class GLSLParserTest(PlainExecTest):
Nonrequired Options
-------------------
- * override_extensions: List of GL extensions to manually enable or
- disable. Each extension name must begin with GL and be prefixed
- with '+' or '-'. List elements are separated by whitespace.
* 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.
@@ -151,9 +148,9 @@ class GLSLParserTest(PlainExecTest):
* glsl_version: 1.30
* expect_result: pass
* # Lists may be span multiple lines.
- * override_extensions:
- * +GL_ARB_fragment_coord_conventions
- * -GL_AMD_conservative_depth
+ * required_extensions:
+ * GL_ARB_fragment_coord_conventions
+ * GL_AMD_conservative_depth
* [end config]
*/
@@ -185,7 +182,6 @@ class GLSLParserTest(PlainExecTest):
]
__config_defaults = {
- 'override_extensions' : '',
'require_extensions' : '',
}
@@ -375,7 +371,7 @@ class GLSLParserTest(PlainExecTest):
@property
def env(self):
- return { 'MESA_EXTENSION_OVERRIDE' : self.config.get('config', 'override_extensions') }
+ return dict()
if __name__ == '__main__':
if len(sys.argv) != 2: