Skip to content

Commit 2e1fc24

Browse files
committed
fix headless import attempting to load graphics driver
1 parent 92e51fc commit 2e1fc24

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

modules/betsy/image_compress_betsy.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,16 @@
3636

3737
#include "bc1.glsl.gen.h"
3838
#include "bc6h.glsl.gen.h"
39+
#include "servers/display_server.h"
3940

4041
static Mutex betsy_mutex;
4142
static BetsyCompressor *betsy = nullptr;
4243

4344
void BetsyCompressor::_init() {
45+
if (!DisplayServer::can_create_rendering_device()) {
46+
return;
47+
}
48+
4449
// Create local RD.
4550
RenderingContextDriver *rcd = nullptr;
4651
RenderingDevice *rd = RenderingServer::get_singleton()->create_local_rendering_device();
@@ -177,6 +182,11 @@ static String get_shader_name(BetsyFormat p_format) {
177182
Error BetsyCompressor::_compress(BetsyFormat p_format, Image *r_img) {
178183
uint64_t start_time = OS::get_singleton()->get_ticks_msec();
179184

185+
// Return an error so that the compression can fall back to cpu compression
186+
if (compress_rd == nullptr) {
187+
return ERR_CANT_CREATE;
188+
}
189+
180190
if (r_img->is_compressed()) {
181191
return ERR_INVALID_DATA;
182192
}

servers/display_server.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,6 +1229,10 @@ void DisplayServer::_input_set_custom_mouse_cursor_func(const Ref<Resource> &p_i
12291229
}
12301230

12311231
bool DisplayServer::can_create_rendering_device() {
1232+
if (get_singleton()->get_name() == "headless") {
1233+
return false;
1234+
}
1235+
12321236
#if defined(RD_ENABLED)
12331237
RenderingDevice *device = RenderingDevice::get_singleton();
12341238
if (device) {

servers/rendering/rendering_device_binds.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@
3131
#include "rendering_device_binds.h"
3232

3333
Error RDShaderFile::parse_versions_from_text(const String &p_text, const String p_defines, OpenIncludeFunction p_include_func, void *p_include_func_userdata) {
34-
ERR_FAIL_NULL_V(RenderingDevice::get_singleton(), ERR_UNAVAILABLE);
34+
ERR_FAIL_NULL_V_MSG(
35+
RenderingDevice::get_singleton(),
36+
ERR_UNAVAILABLE,
37+
"Cannot import custom .glsl shaders when running without a RenderingDevice. This can happen if you are using the headless more or the Compatibility backend.");
3538

3639
Vector<String> lines = p_text.split("\n");
3740

0 commit comments

Comments
 (0)