Skip to content

Commit cddcfa5

Browse files
committed
Disable SW rendering while OSMesa support is not working
1 parent 1cfc2e6 commit cddcfa5

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

Diff for: BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ cc_library(
927927
hdrs = ["public/dmlab.h"],
928928
data = [
929929
":libdmlab_headless_hw.so",
930-
":libdmlab_headless_sw.so",
930+
#":libdmlab_headless_sw.so",
931931
],
932932
linkopts = ["-ldl"],
933933
visibility = ["//testing:__subpackages__"],

Diff for: python/dmlab_module.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static int Lab_init(PyObject* pself, PyObject* args, PyObject* kwds) {
185185

186186
DeepMindLabLaunchParams params = {};
187187
params.runfiles_path = get_module_state(module)->runfiles_path;
188-
params.renderer = DeepMindLabRenderer_Software;
188+
params.renderer = DeepMindLabRenderer_Hardware;
189189
if (renderer != NULL && renderer[0] != '\0') {
190190
if (strcmp(renderer, "hardware") == 0) {
191191
params.renderer = DeepMindLabRenderer_Hardware;

Diff for: testing/load_level_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ TEST(LoadLevelTest, LoadLevelAndWait) {
2626

2727
DeepMindLabLaunchParams params = {};
2828
params.runfiles_path = runfiles_path.c_str();
29-
params.renderer = DeepMindLabRenderer_Software;
29+
params.renderer = DeepMindLabRenderer_Hardware;
3030

3131
EnvCApi env_c_api;
3232
void* context;

Diff for: testing/lua_unit_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ TEST(LuaUnitTest, RunsTest) {
3232

3333
DeepMindLabLaunchParams params = {};
3434
params.runfiles_path = runfiles_path.c_str();
35-
params.renderer = DeepMindLabRenderer_Software;
35+
params.renderer = DeepMindLabRenderer_Hardware;
3636

3737
EnvCApi env_c_api;
3838
void* context;

Diff for: testing/recording_test.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class RecordingTest : public ::testing::Test {
115115
TEST_F(RecordingTest, SavesRecordingToDemoDirectory) {
116116
DeepMindLabLaunchParams params = {};
117117
params.runfiles_path = runfiles_path.c_str();
118-
params.renderer = DeepMindLabRenderer_Software;
118+
params.renderer = DeepMindLabRenderer_Hardware;
119119

120120
EnvCApi env_c_api;
121121
void* context;
@@ -152,7 +152,7 @@ TEST_F(RecordingTest, SavesRecordingToDemoDirectory) {
152152
TEST_F(RecordingTest, PlaysDemoFromDemoDirectory) {
153153
DeepMindLabLaunchParams params = {};
154154
params.runfiles_path = runfiles_path.c_str();
155-
params.renderer = DeepMindLabRenderer_Software;
155+
params.renderer = DeepMindLabRenderer_Hardware;
156156

157157
EnvCApi env_c_api;
158158
void* context;
@@ -216,7 +216,7 @@ TEST_F(RecordingTest, PlaysDemoFromDemoDirectory) {
216216
TEST_F(RecordingTest, RecordsMultipleVideos) {
217217
DeepMindLabLaunchParams params = {};
218218
params.runfiles_path = runfiles_path.c_str();
219-
params.renderer = DeepMindLabRenderer_Software;
219+
params.renderer = DeepMindLabRenderer_Hardware;
220220

221221
EnvCApi env_c_api;
222222
void* context;
@@ -270,7 +270,7 @@ TEST_F(RecordingTest, RecordsMultipleVideos) {
270270
TEST_F(RecordingTest, TotalScorePreserved) {
271271
DeepMindLabLaunchParams params = {};
272272
params.runfiles_path = runfiles_path.c_str();
273-
params.renderer = DeepMindLabRenderer_Software;
273+
params.renderer = DeepMindLabRenderer_Hardware;
274274

275275
EnvCApi env_c_api;
276276
void* context;
@@ -325,7 +325,7 @@ TEST_F(RecordingTest, TotalScorePreserved) {
325325
TEST_F(RecordingTest, MissingDemoFilesSetsError) {
326326
DeepMindLabLaunchParams params = {};
327327
params.runfiles_path = runfiles_path.c_str();
328-
params.renderer = DeepMindLabRenderer_Software;
328+
params.renderer = DeepMindLabRenderer_Hardware;
329329

330330
EnvCApi env_c_api;
331331
void* context;

Diff for: testing/seed_level_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ TEST(SeedLevelTest, RandomSeedTest) {
2323

2424
DeepMindLabLaunchParams params = {};
2525
params.runfiles_path = runfiles_path.c_str();
26-
params.renderer = DeepMindLabRenderer_Software;
26+
params.renderer = DeepMindLabRenderer_Hardware;
2727

2828
EnvCApi env_c_api;
2929
void* context;

0 commit comments

Comments
 (0)