Merge pull request #50838 from luzpaz/follow-up-typos
Fix various typos
This commit is contained in:
commit
d5bd8a704f
@ -935,7 +935,7 @@ void ResourceLoaderBinary::open(FileAccess *p_f, bool p_no_resources, bool p_kee
|
|||||||
// If a UID is found and the path is valid, it will be used, otherwise, it falls back to the path.
|
// If a UID is found and the path is valid, it will be used, otherwise, it falls back to the path.
|
||||||
er.path = ResourceUID::get_singleton()->get_id_path(er.uid);
|
er.path = ResourceUID::get_singleton()->get_id_path(er.uid);
|
||||||
} else {
|
} else {
|
||||||
WARN_PRINT(String(res_path + ": In external resouce #" + itos(i) + ", invalid UUID: " + ResourceUID::get_singleton()->id_to_text(er.uid) + " - using text path instead: " + er.path).utf8().get_data());
|
WARN_PRINT(String(res_path + ": In external resource #" + itos(i) + ", invalid UUID: " + ResourceUID::get_singleton()->id_to_text(er.uid) + " - using text path instead: " + er.path).utf8().get_data());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6037,7 +6037,7 @@ RID RenderingDeviceVulkan::render_pipeline_create(RID p_shader, FramebufferForma
|
|||||||
specialization_info.resize(pipeline_stages.size());
|
specialization_info.resize(pipeline_stages.size());
|
||||||
specialization_map_entries.resize(pipeline_stages.size());
|
specialization_map_entries.resize(pipeline_stages.size());
|
||||||
for (int i = 0; i < shader->specialization_constants.size(); i++) {
|
for (int i = 0; i < shader->specialization_constants.size(); i++) {
|
||||||
//see if overriden
|
//see if overridden
|
||||||
const Shader::SpecializationConstant &sc = shader->specialization_constants[i];
|
const Shader::SpecializationConstant &sc = shader->specialization_constants[i];
|
||||||
data_ptr[i] = sc.constant.int_value; //just copy the 32 bits
|
data_ptr[i] = sc.constant.int_value; //just copy the 32 bits
|
||||||
|
|
||||||
@ -6181,7 +6181,7 @@ RID RenderingDeviceVulkan::compute_pipeline_create(RID p_shader, const Vector<Pi
|
|||||||
specialization_constant_data.resize(shader->specialization_constants.size());
|
specialization_constant_data.resize(shader->specialization_constants.size());
|
||||||
uint32_t *data_ptr = specialization_constant_data.ptrw();
|
uint32_t *data_ptr = specialization_constant_data.ptrw();
|
||||||
for (int i = 0; i < shader->specialization_constants.size(); i++) {
|
for (int i = 0; i < shader->specialization_constants.size(); i++) {
|
||||||
//see if overriden
|
//see if overridden
|
||||||
const Shader::SpecializationConstant &sc = shader->specialization_constants[i];
|
const Shader::SpecializationConstant &sc = shader->specialization_constants[i];
|
||||||
data_ptr[i] = sc.constant.int_value; //just copy the 32 bits
|
data_ptr[i] = sc.constant.int_value; //just copy the 32 bits
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ Vector<String> EditorFileSystemDirectory::get_file_deps(int p_idx) const {
|
|||||||
}
|
}
|
||||||
ResourceUID::ID uid = ResourceUID::get_singleton()->text_to_id(dep);
|
ResourceUID::ID uid = ResourceUID::get_singleton()->text_to_id(dep);
|
||||||
if (uid != ResourceUID::INVALID_ID) {
|
if (uid != ResourceUID::INVALID_ID) {
|
||||||
//return proper dependency resoure from uid
|
//return proper dependency resource from uid
|
||||||
if (ResourceUID::get_singleton()->has_id(uid)) {
|
if (ResourceUID::get_singleton()->has_id(uid)) {
|
||||||
dep = ResourceUID::get_singleton()->get_id_path(uid);
|
dep = ResourceUID::get_singleton()->get_id_path(uid);
|
||||||
} else {
|
} else {
|
||||||
|
@ -1555,7 +1555,7 @@ int EditorNode::_save_external_resources() {
|
|||||||
if (!res->get_path().is_resource_file()) {
|
if (!res->get_path().is_resource_file()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
//not only check if this resourec is edited, check contained subresources too
|
//not only check if this resource is edited, check contained subresources too
|
||||||
if (_find_edited_resources(res, edited_subresources)) {
|
if (_find_edited_resources(res, edited_subresources)) {
|
||||||
ResourceSaver::save(res->get_path(), res, flg);
|
ResourceSaver::save(res->get_path(), res, flg);
|
||||||
saved++;
|
saved++;
|
||||||
|
@ -150,7 +150,7 @@ void PluginConfigDialog::_on_required_text_changed(const String &) {
|
|||||||
if (script_edit->get_text().get_extension() != ext) {
|
if (script_edit->get_text().get_extension() != ext) {
|
||||||
is_valid = false;
|
is_valid = false;
|
||||||
script_validation->set_texture(invalid_icon);
|
script_validation->set_texture(invalid_icon);
|
||||||
script_validation->set_tooltip(vformat(TTR("Script extension must match chosen langauge extension (.%s)."), ext));
|
script_validation->set_tooltip(vformat(TTR("Script extension must match chosen language extension (.%s)."), ext));
|
||||||
}
|
}
|
||||||
if (script_edit->get_text().get_basename().is_empty()) {
|
if (script_edit->get_text().get_basename().is_empty()) {
|
||||||
is_valid = false;
|
is_valid = false;
|
||||||
|
@ -160,12 +160,12 @@ bool RenderForwardMobile::free(RID p_rid) {
|
|||||||
/* Render functions */
|
/* Render functions */
|
||||||
|
|
||||||
RD::DataFormat RenderForwardMobile::_render_buffers_get_color_format() {
|
RD::DataFormat RenderForwardMobile::_render_buffers_get_color_format() {
|
||||||
// Using 32bit buffers enables AFBC on mobile devices which should have a definate performance improvement (MALI G710 and newer support this on 64bit RTs)
|
// Using 32bit buffers enables AFBC on mobile devices which should have a definite performance improvement (MALI G710 and newer support this on 64bit RTs)
|
||||||
return RD::DATA_FORMAT_A2B10G10R10_UNORM_PACK32;
|
return RD::DATA_FORMAT_A2B10G10R10_UNORM_PACK32;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool RenderForwardMobile::_render_buffers_can_be_storage() {
|
bool RenderForwardMobile::_render_buffers_can_be_storage() {
|
||||||
// Using 32bit buffers enables AFBC on mobile devices which should have a definate performance improvement (MALI G710 and newer support this on 64bit RTs)
|
// Using 32bit buffers enables AFBC on mobile devices which should have a definite performance improvement (MALI G710 and newer support this on 64bit RTs)
|
||||||
// Doesn't support storage
|
// Doesn't support storage
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -1214,7 +1214,7 @@ void main() {
|
|||||||
specular_light *= specular * metallic * albedo * 2.0;
|
specular_light *= specular * metallic * albedo * 2.0;
|
||||||
#else
|
#else
|
||||||
|
|
||||||
// scales the specular reflections, needs to be be computed before lighting happens,
|
// scales the specular reflections, needs to be computed before lighting happens,
|
||||||
// but after environment, GI, and reflection probes are added
|
// but after environment, GI, and reflection probes are added
|
||||||
// Environment brdf approximation (Lazarov 2013)
|
// Environment brdf approximation (Lazarov 2013)
|
||||||
// see https://www.unrealengine.com/en-US/blog/physically-based-shading-on-mobile
|
// see https://www.unrealengine.com/en-US/blog/physically-based-shading-on-mobile
|
||||||
|
@ -981,7 +981,7 @@ void main() {
|
|||||||
specular_light *= specular * metallic * albedo * 2.0;
|
specular_light *= specular * metallic * albedo * 2.0;
|
||||||
#else
|
#else
|
||||||
|
|
||||||
// scales the specular reflections, needs to be be computed before lighting happens,
|
// scales the specular reflections, needs to be computed before lighting happens,
|
||||||
// but after environment, GI, and reflection probes are added
|
// but after environment, GI, and reflection probes are added
|
||||||
// Environment brdf approximation (Lazarov 2013)
|
// Environment brdf approximation (Lazarov 2013)
|
||||||
// see https://www.unrealengine.com/en-US/blog/physically-based-shading-on-mobile
|
// see https://www.unrealengine.com/en-US/blog/physically-based-shading-on-mobile
|
||||||
|
Loading…
Reference in New Issue
Block a user