From a99860c58443fa329d6d32849ab615c1ca29a9c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20K=C3=B6ppe?= Date: Thu, 18 Oct 2018 11:25:27 +0100 Subject: [PATCH] Disable SW rendering while OSMesa support is not working --- BUILD | 2 +- python/dmlab_module.c | 2 +- testing/load_level_test.cc | 2 +- testing/lua_unit_test.cc | 2 +- testing/recording_test.cc | 10 +++++----- testing/seed_level_test.cc | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/BUILD b/BUILD index a47d9b5b6..04bb856b4 100644 --- a/BUILD +++ b/BUILD @@ -984,7 +984,7 @@ cc_library( hdrs = ["public/dmlab.h"], data = [ ":libdmlab_headless_hw.so", - ":libdmlab_headless_sw.so", + #":libdmlab_headless_sw.so", ], linkopts = ["-ldl"], visibility = ["//testing:__subpackages__"], diff --git a/python/dmlab_module.c b/python/dmlab_module.c index 882175591..debfd92d0 100644 --- a/python/dmlab_module.c +++ b/python/dmlab_module.c @@ -185,7 +185,7 @@ static int Lab_init(PyObject* pself, PyObject* args, PyObject* kwds) { DeepMindLabLaunchParams params = {}; params.runfiles_path = get_module_state(module)->runfiles_path; - params.renderer = DeepMindLabRenderer_Software; + params.renderer = DeepMindLabRenderer_Hardware; if (renderer != NULL && renderer[0] != '\0') { if (strcmp(renderer, "hardware") == 0) { params.renderer = DeepMindLabRenderer_Hardware; diff --git a/testing/load_level_test.cc b/testing/load_level_test.cc index 081b989d8..066413a10 100644 --- a/testing/load_level_test.cc +++ b/testing/load_level_test.cc @@ -26,7 +26,7 @@ TEST(LoadLevelTest, LoadLevelAndWait) { DeepMindLabLaunchParams params = {}; params.runfiles_path = runfiles_path.c_str(); - params.renderer = DeepMindLabRenderer_Software; + params.renderer = DeepMindLabRenderer_Hardware; EnvCApi env_c_api; void* context; diff --git a/testing/lua_unit_test.cc b/testing/lua_unit_test.cc index e5da6a237..47c2e67ea 100644 --- a/testing/lua_unit_test.cc +++ b/testing/lua_unit_test.cc @@ -32,7 +32,7 @@ TEST(LuaUnitTest, RunsTest) { DeepMindLabLaunchParams params = {}; params.runfiles_path = runfiles_path.c_str(); - params.renderer = DeepMindLabRenderer_Software; + params.renderer = DeepMindLabRenderer_Hardware; EnvCApi env_c_api; void* context; diff --git a/testing/recording_test.cc b/testing/recording_test.cc index 876067f76..a0b8d8191 100644 --- a/testing/recording_test.cc +++ b/testing/recording_test.cc @@ -115,7 +115,7 @@ class RecordingTest : public ::testing::Test { TEST_F(RecordingTest, SavesRecordingToDemoDirectory) { DeepMindLabLaunchParams params = {}; params.runfiles_path = runfiles_path.c_str(); - params.renderer = DeepMindLabRenderer_Software; + params.renderer = DeepMindLabRenderer_Hardware; EnvCApi env_c_api; void* context; @@ -152,7 +152,7 @@ TEST_F(RecordingTest, SavesRecordingToDemoDirectory) { TEST_F(RecordingTest, PlaysDemoFromDemoDirectory) { DeepMindLabLaunchParams params = {}; params.runfiles_path = runfiles_path.c_str(); - params.renderer = DeepMindLabRenderer_Software; + params.renderer = DeepMindLabRenderer_Hardware; EnvCApi env_c_api; void* context; @@ -216,7 +216,7 @@ TEST_F(RecordingTest, PlaysDemoFromDemoDirectory) { TEST_F(RecordingTest, RecordsMultipleVideos) { DeepMindLabLaunchParams params = {}; params.runfiles_path = runfiles_path.c_str(); - params.renderer = DeepMindLabRenderer_Software; + params.renderer = DeepMindLabRenderer_Hardware; EnvCApi env_c_api; void* context; @@ -270,7 +270,7 @@ TEST_F(RecordingTest, RecordsMultipleVideos) { TEST_F(RecordingTest, TotalScorePreserved) { DeepMindLabLaunchParams params = {}; params.runfiles_path = runfiles_path.c_str(); - params.renderer = DeepMindLabRenderer_Software; + params.renderer = DeepMindLabRenderer_Hardware; EnvCApi env_c_api; void* context; @@ -325,7 +325,7 @@ TEST_F(RecordingTest, TotalScorePreserved) { TEST_F(RecordingTest, MissingDemoFilesSetsError) { DeepMindLabLaunchParams params = {}; params.runfiles_path = runfiles_path.c_str(); - params.renderer = DeepMindLabRenderer_Software; + params.renderer = DeepMindLabRenderer_Hardware; EnvCApi env_c_api; void* context; diff --git a/testing/seed_level_test.cc b/testing/seed_level_test.cc index 564a9aace..aa5afec06 100644 --- a/testing/seed_level_test.cc +++ b/testing/seed_level_test.cc @@ -23,7 +23,7 @@ TEST(SeedLevelTest, RandomSeedTest) { DeepMindLabLaunchParams params = {}; params.runfiles_path = runfiles_path.c_str(); - params.renderer = DeepMindLabRenderer_Software; + params.renderer = DeepMindLabRenderer_Hardware; EnvCApi env_c_api; void* context;