Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-23 13:41:43 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

put some limits to max ubo sizes to avoid crashes

Browse Source
This commit is contained in:
Juan Linietsky 2016-12-23 01:05:21 -03:00
parent 4e729f38e0
commit 19ba45587c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gles3/rasterizer_scene_gles3.cpp
View File

@ -4706,7 +4706,7 @@ void RasterizerSceneGLES3::initialize() {
glGetIntegerv(GL_MAX_UNIFORM_BLOCK_SIZE,&max_ubo_size);
const int ubo_light_size=160;
state.ubo_light_size=ubo_light_size;
state.max_ubo_lights=max_ubo_size/ubo_light_size;
state.max_ubo_lights=MIN(RenderList::MAX_LIGHTS,max_ubo_size/ubo_light_size);
print_line("max ubo light: "+itos(state.max_ubo_lights));
state.spot_array_tmp = (uint8_t*)memalloc(ubo_light_size*state.max_ubo_lights);
@ -4734,7 +4734,7 @@ void RasterizerSceneGLES3::initialize() {
state.scene_shader.add_custom_define("#define MAX_LIGHT_DATA_STRUCTS "+itos(state.max_ubo_lights)+"\n");
state.scene_shader.add_custom_define("#define MAX_FORWARD_LIGHTS "+itos(state.max_forward_lights_per_object)+"\n");
state.max_ubo_reflections=max_ubo_size/sizeof(ReflectionProbeDataUBO);
state.max_ubo_reflections=MIN(RenderList::MAX_REFLECTIONS,max_ubo_size/sizeof(ReflectionProbeDataUBO));
print_line("max ubo reflections: "+itos(state.max_ubo_reflections)+" ubo size: "+itos(sizeof(ReflectionProbeDataUBO)));
state.reflection_array_tmp = (uint8_t*)memalloc(sizeof(ReflectionProbeDataUBO)*state.max_ubo_reflections);
@ -4746,7 +4746,7 @@ void RasterizerSceneGLES3::initialize() {
state.scene_shader.add_custom_define("#define MAX_REFLECTION_DATA_STRUCTS "+itos(state.max_ubo_reflections)+"\n");
state.max_skeleton_bones=max_ubo_size/(12*sizeof(float));
state.max_skeleton_bones=MIN(2048,max_ubo_size/(12*sizeof(float)));
state.scene_shader.add_custom_define("#define MAX_SKELETON_BONES "+itos(state.max_skeleton_bones)+"\n");

1
drivers/gles3/rasterizer_scene_gles3.h
View File

@ -557,6 +557,7 @@ public:
SORT_FLAG_INSTANCING=2,
MAX_DIRECTIONAL_LIGHTS=16,
MAX_LIGHTS=4096,
MAX_REFLECTIONS=1024,
SORT_KEY_DEPTH_LAYER_SHIFT=60,

1
tools/editor/plugins/gi_probe_editor_plugin.cpp
View File

@ -43,7 +43,6 @@ GIProbeEditorPlugin::GIProbeEditorPlugin(EditorNode *p_node) {
editor=p_node;
bake = memnew( Button );
bake->set_text("Bake GI!");
bake->set_icon(editor->get_gui_base()->get_icon("BakedLight","EditorIcons"));
bake->hide();;
bake->connect("pressed",this,"_bake");