gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-05 18:49:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #66638 from timothyqiu/rendering-null

Browse source 
Add various null checks in RenderingServer
This commit is contained in:
Rémi Verschelde 2022-09-30 09:58:58 +02:00
parent a0d17380fd ffdac72eaa
commit fe40c52be8
5 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gles3/storage/texture_storage.cpp
View file

@ -666,6 +666,8 @@ void TextureStorage::texture_free(RID p_texture) {
}
void TextureStorage::texture_2d_initialize(RID p_texture, const Ref<Image> &p_image) {
ERR_FAIL_COND(p_image.is_null());
Texture texture;
texture.width = p_image->get_width();
texture.height = p_image->get_height();

4
servers/rendering/renderer_rd/renderer_compositor_rd.cpp
View file

@ -170,6 +170,10 @@ void RendererCompositorRD::finalize() {
}
void RendererCompositorRD::set_boot_image(const Ref<Image> &p_image, const Color &p_color, bool p_scale, bool p_use_filter) {
if (p_image.is_null() || p_image->is_empty()) {
return;
}
RD::get_singleton()->prepare_screen_for_drawing();
RID texture = texture_storage->texture_allocate();

1
servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
View file

@ -3621,6 +3621,7 @@ TypedArray<Image> RendererSceneRenderRD::bake_render_uv2(RID p_base, const Typed
//RID sampled_light;
RenderGeometryInstance *gi = geometry_instance_create(p_base);
ERR_FAIL_NULL_V(gi, TypedArray<Image>());
uint32_t sc = RSG::mesh_storage->mesh_get_surface_count(p_base);
Vector<RID> materials;

1
servers/rendering/renderer_rd/storage_rd/mesh_storage.cpp
View file

@ -2021,6 +2021,7 @@ Transform2D MeshStorage::skeleton_bone_get_transform_2d(RID p_skeleton, int p_bo
void MeshStorage::skeleton_set_base_transform_2d(RID p_skeleton, const Transform2D &p_base_transform) {
Skeleton *skeleton = skeleton_owner.get_or_null(p_skeleton);
ERR_FAIL_NULL(skeleton);
ERR_FAIL_COND(!skeleton->use_2d);
skeleton->base_transform_2d = p_base_transform;

2
servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
View file

@ -673,6 +673,8 @@ void TextureStorage::texture_free(RID p_texture) {
}
void TextureStorage::texture_2d_initialize(RID p_texture, const Ref<Image> &p_image) {
ERR_FAIL_COND(p_image.is_null());
TextureToRDFormat ret_format;
Ref<Image> image = _validate_texture_format(p_image, ret_format);