Commit 3a562c5b authored by tokonbekov's avatar tokonbekov

Dropping workarounds: surfaceless, icd and expat

parent 871e6c01
......@@ -103,8 +103,13 @@ class CrucibleTester(object):
def test(self):
pm = bs.ProjectMap()
build_root = pm.build_root()
global_opts = bs.Options()
if global_opts.arch == "m64":
icd_name = "intel_icd.x86_64.json"
elif global_opts.arch == "m32":
icd_name = "intel_icd.i686.json"
env = { "LD_LIBRARY_PATH" : build_root + "/lib",
"VK_ICD_FILENAMES" : build_root + "/usr/share/vulkan/icd.d/dev_icd.json",
"VK_ICD_FILENAMES" : build_root + "/share/vulkan/icd.d/" + icd_name,
"ANV_ABORT_ON_DEVICE_LOSS" : "true"}
o = bs.Options()
o.update_env(env)
......
......@@ -13,17 +13,8 @@ class MesaBuilder(bs.AutoBuilder):
global_opts = bs.Options()
options = []
if global_opts.arch == "m32":
# expat pkg-config fails for some reason on i386
options = ['EXPAT_LIBS="-L/usr/lib/i386-linux-gnu -lexpat"']
surfaceless = ""
if path.exists(bs.ProjectMap().project_source_dir() + "/src/egl/drivers/dri2/platform_surfaceless.c"):
# surfaceless not supported on 10.6 and earlier
surfaceless = ",surfaceless"
options = options + ["--enable-gbm",
"--with-egl-platforms=x11,drm" + surfaceless,
"--with-egl-platforms=x11,drm",
"--enable-glx-tls",
"--enable-gles1",
"--enable-gles2",
......@@ -48,24 +39,6 @@ class MesaBuilder(bs.AutoBuilder):
# without them.
bs.AutoBuilder.__init__(self, configure_options=options, opt_flags="-O2")
def build(self):
"""since mesa doesn't install an icd, generate one"""
bs.AutoBuilder.build(self)
icd_path = "/tmp/build_root/" + self._options.arch + "/usr/share/vulkan/icd.d/dev_icd.json"
icd_content = """\
{
"file_format_version": "1.0.0",
"ICD": {
"library_path": "/tmp/build_root/%s/lib/libvulkan_intel.so",
"abi_versions": "1.0.3"
}
}
""" % self._options.arch
if not os.path.exists(os.path.dirname(icd_path)):
os.makedirs(os.path.dirname(icd_path))
with open(icd_path, "w") as icd_f:
icd_f.write(icd_content)
def test(self):
"""Provide gtests as available"""
# override the test method, because tests have moved
......
......@@ -48,8 +48,13 @@ class VulkanTester(object):
pass
def test(self):
pm = bs.ProjectMap()
global_opts = bs.Options()
if global_opts.arch == "m64":
icd_name = "intel_icd.x86_64.json"
elif global_opts.arch == "m32":
icd_name = "intel_icd.i686.json"
env = {"VK_ICD_FILENAMES" : pm.build_root() + \
"/usr/share/vulkan/icd.d/dev_icd.json",
"/share/vulkan/icd.d/" + icd_name,
"ANV_ABORT_ON_DEVICE_LOSS" : "true"}
tester = bs.DeqpTester()
binary = pm.build_root() + "/opt/deqp/modules/vulkan/deqp-vk"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment