Skip to content

Commit

Permalink
Fully initialize all members of structs IdentifierActions, `Generat…
Browse files Browse the repository at this point in the history
…edCode` and `DefaultIdentifierActions`
  • Loading branch information
Chubercik committed Feb 6, 2024
1 parent d335281 commit b38ac30
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions servers/rendering/shader_compiler.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,47 +52,47 @@ class ShaderCompiler {
HashMap<StringName, bool *> usage_flag_pointers;
HashMap<StringName, bool *> write_flag_pointers;

HashMap<StringName, ShaderLanguage::ShaderNode::Uniform> *uniforms;
HashMap<StringName, ShaderLanguage::ShaderNode::Uniform> *uniforms = nullptr;
};

struct GeneratedCode {
Vector<String> defines;
struct Texture {
StringName name;
ShaderLanguage::DataType type;
ShaderLanguage::ShaderNode::Uniform::Hint hint;
ShaderLanguage::DataType type = ShaderLanguage::DataType::TYPE_VOID;
ShaderLanguage::ShaderNode::Uniform::Hint hint = ShaderLanguage::ShaderNode::Uniform::Hint::HINT_NONE;
bool use_color = false;
ShaderLanguage::TextureFilter filter;
ShaderLanguage::TextureRepeat repeat;
bool global;
int array_size;
ShaderLanguage::TextureFilter filter = ShaderLanguage::TextureFilter::FILTER_DEFAULT;
ShaderLanguage::TextureRepeat repeat = ShaderLanguage::TextureRepeat::REPEAT_DEFAULT;
bool global = false;
int array_size = 0;
};

Vector<Texture> texture_uniforms;

Vector<uint32_t> uniform_offsets;
uint32_t uniform_total_size;
uint32_t uniform_total_size = 0;
String uniforms;
String stage_globals[STAGE_MAX];

HashMap<String, String> code;

bool uses_global_textures;
bool uses_fragment_time;
bool uses_vertex_time;
bool uses_screen_texture_mipmaps;
bool uses_screen_texture;
bool uses_depth_texture;
bool uses_normal_roughness_texture;
bool uses_global_textures = false;
bool uses_fragment_time = false;
bool uses_vertex_time = false;
bool uses_screen_texture_mipmaps = false;
bool uses_screen_texture = false;
bool uses_depth_texture = false;
bool uses_normal_roughness_texture = false;
};

struct DefaultIdentifierActions {
HashMap<StringName, String> renames;
HashMap<StringName, String> render_mode_defines;
HashMap<StringName, String> usage_defines;
HashMap<StringName, String> custom_samplers;
ShaderLanguage::TextureFilter default_filter;
ShaderLanguage::TextureRepeat default_repeat;
ShaderLanguage::TextureFilter default_filter = ShaderLanguage::TextureFilter::FILTER_DEFAULT;
ShaderLanguage::TextureRepeat default_repeat = ShaderLanguage::TextureRepeat::REPEAT_DEFAULT;
int base_texture_binding_index = 0;
int texture_layout_set = 0;
String base_uniform_string;
Expand Down

0 comments on commit b38ac30

Please sign in to comment.