diff options
Diffstat (limited to 'drivers/gles3/storage/material_storage.cpp')
| -rw-r--r-- | drivers/gles3/storage/material_storage.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gles3/storage/material_storage.cpp b/drivers/gles3/storage/material_storage.cpp index a594813ed0..b3a3506d40 100644 --- a/drivers/gles3/storage/material_storage.cpp +++ b/drivers/gles3/storage/material_storage.cpp @@ -1395,6 +1395,7 @@ MaterialStorage::MaterialStorage() { actions.renames["DELTA"] = "local_delta"; actions.renames["NUMBER"] = "particle_number"; actions.renames["INDEX"] = "index"; + actions.renames["AMOUNT_RATIO"] = "amount_ratio"; //actions.renames["GRAVITY"] = "current_gravity"; actions.renames["EMISSION_TRANSFORM"] = "emission_transform"; actions.renames["RANDOM_SEED"] = "random_seed"; @@ -1407,6 +1408,8 @@ MaterialStorage::MaterialStorage() { actions.renames["COLLISION_NORMAL"] = "collision_normal"; actions.renames["COLLISION_DEPTH"] = "collision_depth"; actions.renames["ATTRACTOR_FORCE"] = "attractor_force"; + actions.renames["EMITTER_VELOCITY"] = "emitter_velocity"; + actions.renames["INTERPOLATE_TO_END"] = "interp_to_end"; // These are unsupported, but may be used by users. To avoid compile time overhead, we add the stub only when used. actions.renames["FLAG_EMIT_POSITION"] = "uint(1)"; @@ -2396,7 +2399,7 @@ void MaterialStorage::material_set_shader(RID p_material, RID p_shader) { return; } - ERR_FAIL_COND(shader->data == nullptr); + ERR_FAIL_NULL(shader->data); material->data = material_data_request_func[shader->mode](shader->data); material->data->self = p_material; @@ -2893,6 +2896,7 @@ void SceneShaderData::set_code(const String &p_code) { actions.render_mode_flags["unshaded"] = &unshaded; actions.render_mode_flags["wireframe"] = &wireframe; actions.render_mode_flags["particle_trails"] = &uses_particle_trails; + actions.render_mode_flags["world_vertex_coords"] = &uses_world_coordinates; actions.usage_flag_pointers["ALPHA"] = &uses_alpha; actions.usage_flag_pointers["ALPHA_SCISSOR_THRESHOLD"] = &uses_alpha_clip; @@ -2944,7 +2948,7 @@ void SceneShaderData::set_code(const String &p_code) { cull_mode = Cull(cull_modei); blend_mode = BlendMode(blend_modei); alpha_antialiasing_mode = AlphaAntiAliasing(alpha_antialiasing_modei); - vertex_input_mask = uint32_t(uses_normal); + vertex_input_mask = uint64_t(uses_normal); vertex_input_mask |= uses_tangent << 1; vertex_input_mask |= uses_color << 2; vertex_input_mask |= uses_uv << 3; |