diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-04-19 23:19:21 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2020-04-20 21:21:58 -0300 |
| commit | ae09b55a19c956cf6dafd446c71178f6bbffd91d (patch) | |
| tree | 94c9b2cc850eb2fb0608a52c05fb389e1cd35234 /modules/pvr | |
| parent | 6d8e1aea892dc80e2fb01729b9a532a447f0760d (diff) | |
Exposed RenderingDevice to script API
Also added an easier way to load native GLSL shaders.
Extras:
Had to fix no-cache for subresources in resource loader, it was not properly working, making shaders not properly reload.
Note:
The precommit hooks are broken because they don't seem to support enums from one class being used in another.
Feel free to fix this after merging this PR.
Diffstat (limited to 'modules/pvr')
| -rw-r--r-- | modules/pvr/texture_loader_pvr.cpp | 2 | ||||
| -rw-r--r-- | modules/pvr/texture_loader_pvr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/pvr/texture_loader_pvr.cpp b/modules/pvr/texture_loader_pvr.cpp index 10d4d71f5e..a8e8a9a2f1 100644 --- a/modules/pvr/texture_loader_pvr.cpp +++ b/modules/pvr/texture_loader_pvr.cpp @@ -51,7 +51,7 @@ enum PVRFLags { }; -RES ResourceFormatPVR::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress) { +RES ResourceFormatPVR::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, bool p_no_cache) { if (r_error) *r_error = ERR_CANT_OPEN; diff --git a/modules/pvr/texture_loader_pvr.h b/modules/pvr/texture_loader_pvr.h index 642323db35..07ef129689 100644 --- a/modules/pvr/texture_loader_pvr.h +++ b/modules/pvr/texture_loader_pvr.h @@ -36,7 +36,7 @@ class ResourceFormatPVR : public ResourceFormatLoader { public: - virtual RES load(const String &p_path, const String &p_original_path, Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr); + virtual RES load(const String &p_path, const String &p_original_path, Error *r_error = nullptr, bool p_use_sub_threads = false, float *r_progress = nullptr, bool p_no_cache = false); virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual bool handles_type(const String &p_type) const; virtual String get_resource_type(const String &p_path) const; |