mirror of
https://github.com/TomHarte/CLK.git
synced 2024-09-06 05:54:28 +00:00
Merge pull request #404 from TomHarte/ProperShaderSetup
Ensures the SVideo shader gets all proper `enable_vertex_attribute_with_pointer`s.
This commit is contained in:
commit
8c511e2b76
@ -348,34 +348,33 @@ void OpenGLOutputBuilder::prepare_source_vertex_array() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
using Shader = OpenGL::IntermediateShader;
|
using Shader = OpenGL::IntermediateShader;
|
||||||
if(composite_input_shader_program_) {
|
OpenGL::IntermediateShader *const shaders[] = {
|
||||||
composite_input_shader_program_->enable_vertex_attribute_with_pointer(
|
composite_input_shader_program_.get(),
|
||||||
|
svideo_input_shader_program_.get()
|
||||||
|
};
|
||||||
|
for(int c = 0; c < 2; ++c) {
|
||||||
|
if(!shaders[c]) continue;
|
||||||
|
|
||||||
|
shaders[c]->enable_vertex_attribute_with_pointer(
|
||||||
Shader::get_input_name(Shader::Input::InputStart),
|
Shader::get_input_name(Shader::Input::InputStart),
|
||||||
2, GL_UNSIGNED_SHORT, GL_FALSE, SourceVertexSize,
|
2, GL_UNSIGNED_SHORT, GL_FALSE, SourceVertexSize,
|
||||||
(void *)SourceVertexOffsetOfInputStart, 1);
|
(void *)SourceVertexOffsetOfInputStart, 1);
|
||||||
|
|
||||||
composite_input_shader_program_->enable_vertex_attribute_with_pointer(
|
shaders[c]->enable_vertex_attribute_with_pointer(
|
||||||
Shader::get_input_name(Shader::Input::OutputStart),
|
Shader::get_input_name(Shader::Input::OutputStart),
|
||||||
2, GL_UNSIGNED_SHORT, GL_FALSE, SourceVertexSize,
|
2, GL_UNSIGNED_SHORT, GL_FALSE, SourceVertexSize,
|
||||||
(void *)SourceVertexOffsetOfOutputStart, 1);
|
(void *)SourceVertexOffsetOfOutputStart, 1);
|
||||||
|
|
||||||
composite_input_shader_program_->enable_vertex_attribute_with_pointer(
|
shaders[c]->enable_vertex_attribute_with_pointer(
|
||||||
Shader::get_input_name(Shader::Input::Ends),
|
Shader::get_input_name(Shader::Input::Ends),
|
||||||
2, GL_UNSIGNED_SHORT, GL_FALSE, SourceVertexSize,
|
2, GL_UNSIGNED_SHORT, GL_FALSE, SourceVertexSize,
|
||||||
(void *)SourceVertexOffsetOfEnds, 1);
|
(void *)SourceVertexOffsetOfEnds, 1);
|
||||||
|
|
||||||
composite_input_shader_program_->enable_vertex_attribute_with_pointer(
|
shaders[c]->enable_vertex_attribute_with_pointer(
|
||||||
Shader::get_input_name(Shader::Input::PhaseTimeAndAmplitude),
|
Shader::get_input_name(Shader::Input::PhaseTimeAndAmplitude),
|
||||||
3, GL_UNSIGNED_BYTE, GL_FALSE, SourceVertexSize,
|
3, GL_UNSIGNED_BYTE, GL_FALSE, SourceVertexSize,
|
||||||
(void *)SourceVertexOffsetOfPhaseTimeAndAmplitude, 1);
|
(void *)SourceVertexOffsetOfPhaseTimeAndAmplitude, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(svideo_input_shader_program_) {
|
|
||||||
svideo_input_shader_program_->enable_vertex_attribute_with_pointer(
|
|
||||||
Shader::get_input_name(Shader::Input::InputStart),
|
|
||||||
2, GL_UNSIGNED_SHORT, GL_FALSE, SourceVertexSize,
|
|
||||||
(void *)SourceVertexOffsetOfInputStart, 1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void OpenGLOutputBuilder::prepare_output_shader() {
|
void OpenGLOutputBuilder::prepare_output_shader() {
|
||||||
|
Loading…
Reference in New Issue
Block a user