diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/alsa/audio_driver_alsa.h | 10 | ||||
| -rw-r--r-- | drivers/dummy/rasterizer_dummy.h | 6 | ||||
| -rw-r--r-- | drivers/gles2/rasterizer_storage_gles2.cpp | 2 | ||||
| -rw-r--r-- | drivers/unix/syslog_logger.cpp | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/drivers/alsa/audio_driver_alsa.h b/drivers/alsa/audio_driver_alsa.h index a8caf0fbae..50bd9e853d 100644 --- a/drivers/alsa/audio_driver_alsa.h +++ b/drivers/alsa/audio_driver_alsa.h @@ -28,12 +28,14 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "servers/audio_server.h" - #ifdef ALSA_ENABLED +#ifndef AUDIO_DRIVER_ALSA_H +#define AUDIO_DRIVER_ALSA_H + #include "core/os/mutex.h" #include "core/os/thread.h" +#include "servers/audio_server.h" #include <alsa/asoundlib.h> @@ -87,4 +89,6 @@ public: ~AudioDriverALSA(); }; -#endif +#endif // AUDIO_DRIVER_ALSA_H + +#endif // ALSA_ENABLED diff --git a/drivers/dummy/rasterizer_dummy.h b/drivers/dummy/rasterizer_dummy.h index 4dc634aefa..b446828128 100644 --- a/drivers/dummy/rasterizer_dummy.h +++ b/drivers/dummy/rasterizer_dummy.h @@ -58,6 +58,7 @@ public: void sky_set_mode(RID p_sky, VS::SkyMode p_samples) {} void sky_set_texture(RID p_sky, RID p_panorama) {} void sky_set_texture(RID p_sky, RID p_cube_map, int p_radiance_size) {} + void sky_set_material(RID p_sky, RID p_material) {} /* ENVIRONMENT API */ @@ -313,6 +314,11 @@ public: void texture_set_force_redraw_if_visible(RID p_texture, bool p_enable) {} #endif + /* SKY API */ + + RID sky_create() { return RID(); } + void sky_set_texture(RID p_sky, RID p_cube_map, int p_radiance_size) {} + /* SHADER API */ RID shader_create() { return RID(); } diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index 0f5452effc..f76c7da8e1 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -1427,6 +1427,8 @@ void RasterizerStorageGLES2::shader_set_code(RID p_shader, const String &p_code) mode = VS::SHADER_CANVAS_ITEM; else if (mode_string == "particles") mode = VS::SHADER_PARTICLES; + else if (mode_string == "sky") + mode = VS::SHADER_SKY; else mode = VS::SHADER_SPATIAL; diff --git a/drivers/unix/syslog_logger.cpp b/drivers/unix/syslog_logger.cpp index 59001f057d..dc9112bf14 100644 --- a/drivers/unix/syslog_logger.cpp +++ b/drivers/unix/syslog_logger.cpp @@ -68,4 +68,4 @@ void SyslogLogger::print_error(const char *p_function, const char *p_file, int p SyslogLogger::~SyslogLogger() { } -#endif
\ No newline at end of file +#endif |