6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-16 18:30:32 +00:00
Code Issues Projects Releases Wiki Activity

Initialize all const members.

Browse Source 
Without this change, GCC versions >4.8 will error with things like:

```
./CLK/Outputs/CRT/Internals/CRTOpenGL.cpp:154:2:error: uninitialized const member
'Outputs::CRT::OpenGLOutputBuilder::draw_frame(unsigned int, unsigned int, bool)::RenderStage::target'
```
This commit is contained in:
Matt Godbolt 2017-11-24 12:09:10 -06:00
parent 85085a6375
commit bded406caa
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Outputs/CRT/Internals/CRTOpenGL.cpp
View File

@ -150,14 +150,14 @@ void OpenGLOutputBuilder::draw_frame(unsigned int output_width, unsigned int out
{composite_input_shader_program_.get(), composite_texture_.get(), {0.0, 0.0, 0.0}}, {composite_input_shader_program_.get(), composite_texture_.get(), {0.0, 0.0, 0.0}},
{composite_separation_filter_program_.get(), separated_texture_.get(), {0.0, 0.5, 0.5}}, {composite_separation_filter_program_.get(), separated_texture_.get(), {0.0, 0.5, 0.5}},
{composite_chrominance_filter_shader_program_.get(), filtered_texture_.get(), {0.0, 0.0, 0.0}}, {composite_chrominance_filter_shader_program_.get(), filtered_texture_.get(), {0.0, 0.0, 0.0}},
{nullptr} {nullptr, nullptr}
}; };
// for RGB video, there's only two steps // for RGB video, there's only two steps
RenderStage rgb_render_stages[] = { RenderStage rgb_render_stages[] = {
{rgb_input_shader_program_.get(), composite_texture_.get(), {0.0, 0.0, 0.0}}, {rgb_input_shader_program_.get(), composite_texture_.get(), {0.0, 0.0, 0.0}},
{rgb_filter_shader_program_.get(), filtered_texture_.get(), {0.0, 0.0, 0.0}}, {rgb_filter_shader_program_.get(), filtered_texture_.get(), {0.0, 0.0, 0.0}},
{nullptr} {nullptr, nullptr}
}; };
RenderStage *active_pipeline = get_is_television_output() ? composite_render_stages : rgb_render_stages; RenderStage *active_pipeline = get_is_television_output() ? composite_render_stages : rgb_render_stages;

2
Outputs/CRT/Internals/Shaders/IntermediateShader.cpp
View File

@ -21,7 +21,7 @@ namespace {
{"outputStart", 1}, {"outputStart", 1},
{"ends", 2}, {"ends", 2},
{"phaseTimeAndAmplitude", 3}, {"phaseTimeAndAmplitude", 3},
{nullptr} {nullptr, 0}
}; };
} }

2
Outputs/CRT/Internals/Shaders/OutputShader.cpp
View File

@ -17,7 +17,7 @@ namespace {
const OpenGL::Shader::AttributeBinding bindings[] = { const OpenGL::Shader::AttributeBinding bindings[] = {
{"position", 0}, {"position", 0},
{"srcCoordinates", 1}, {"srcCoordinates", 1},
{nullptr} {nullptr, 0}
}; };
} }