diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2018-06-25 09:12:41 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2018-09-20 06:37:10 -0700 |
commit | 05b9c02a8ef572c25e9ddd705d3ce7aa00de9205 (patch) | |
tree | bfd36718e5a4edc3d3fc2ed3556c86d6e791144d | |
parent | f1ae68985a1707d791fc6f8306bc55fe9d940d84 (diff) |
framework/wflinfo: delete deprecated interface
This is the old interface which is now not depended on by any tests.
v2: - remove shader_test interfaces as well
-rw-r--r-- | framework/test/shader_test.py | 19 | ||||
-rw-r--r-- | framework/wflinfo.py | 33 |
2 files changed, 0 insertions, 52 deletions
diff --git a/framework/test/shader_test.py b/framework/test/shader_test.py index 67d131577..4487e5d19 100644 --- a/framework/test/shader_test.py +++ b/framework/test/shader_test.py @@ -145,25 +145,6 @@ class Parser(object): else: self.prog = 'shader_runner' - # FIXME: All of these properties are a work-around for the fact that the - # FastSkipMixin assumes that operations are always > or >= - - @property - def gl_version(self): - return self._gl_version if self.__op not in ['<', '<='] else None - - @property - def gles_version(self): - return self._gles_version if self.__op not in ['<', '<='] else None - - @property - def glsl_version(self): - return self._glsl_version if self.__sl_op not in ['<', '<='] else None - - @property - def glsl_es_version(self): - return self._glsl_es_version if self.__sl_op not in ['<', '<='] else None - class ShaderTest(FastSkipMixin, PiglitBaseTest): """ Parse a shader test file and return a PiglitTest instance diff --git a/framework/wflinfo.py b/framework/wflinfo.py index d3a79437d..a568bc344 100644 --- a/framework/wflinfo.py +++ b/framework/wflinfo.py @@ -299,36 +299,3 @@ class WflInfo(object): @lazy_property def es3(self): return self.es2 - - @property - def gles_version(self): - v = max([self.es1.api_version, self.es2.api_version]) - if v == 0.0: - return None - return v - - @property - def gl_version(self): - v = max([self.core.api_version, self.compat.api_version]) - if v == 0.0: - return None - return v - - @property - def glsl_version(self): - v = max([self.core.shader_version, self.compat.shader_version]) - if v == 0.0: - return None - return v - - @property - def glsl_es_version(self): - v = max([self.es1.shader_version, self.es2.shader_version]) - if v == 0.0: - return None - return v - - @property - def gl_extensions(self): - return set.union(self.es1.extensions, self.es2.extensions, - self.core.extensions, self.compat.extensions) |