This is the old interface which is now not depended on by any tests.
v2: - remove shader_test interfaces as well
---
framework/test/shader_test.py | 19 -------------------
framework/wflinfo.py | 33 ---------------------------------
2 files changed, 52 deletions(-)
diff --git a/framework/test/shader_test.py b/framework/test/shader_test.py
index d66fe45b2..eff80c972 100644
--- a/framework/test/shader_test.py
+++ b/framework/test/shader_test.py
@@ -146,25 +146,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)
--
2.18.0
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
