godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Add various null checks in RenderingServer

Browse Source
This commit is contained in:
Haoyu Qiu
2022-09-30 09:55:32 +08:00
parent 56563ef09e
commit ffdac72eaa
5 changed files with 10 additions and 0 deletions
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) { void TextureStorage::texture_2d_initialize(RID p_texture, const Ref<Image> &p_image) {
ERR_FAIL_COND(p_image.is_null());
Texture texture; Texture texture;
texture.width = p_image->get_width(); texture.width = p_image->get_width();
texture.height = p_image->get_height(); 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) { 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(); RD::get_singleton()->prepare_screen_for_drawing();
RID texture = texture_storage->texture_allocate(); 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; //RID sampled_light;
RenderGeometryInstance *gi = geometry_instance_create(p_base); 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); uint32_t sc = RSG::mesh_storage->mesh_get_surface_count(p_base);
Vector<RID> materials; 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) { void MeshStorage::skeleton_set_base_transform_2d(RID p_skeleton, const Transform2D &p_base_transform) {
Skeleton *skeleton = skeleton_owner.get_or_null(p_skeleton); Skeleton *skeleton = skeleton_owner.get_or_null(p_skeleton);
ERR_FAIL_NULL(skeleton);
ERR_FAIL_COND(!skeleton->use_2d); ERR_FAIL_COND(!skeleton->use_2d);
skeleton->base_transform_2d = p_base_transform; 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) { void TextureStorage::texture_2d_initialize(RID p_texture, const Ref<Image> &p_image) {
ERR_FAIL_COND(p_image.is_null());
TextureToRDFormat ret_format; TextureToRDFormat ret_format;
Ref<Image> image = _validate_texture_format(p_image, ret_format); Ref<Image> image = _validate_texture_format(p_image, ret_format);