6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-07-29 23:24:43 +00:00
Code Issues Projects Releases Wiki Activity

Fixed: the two shaders that use a common input array should use common bindings.

Browse Source
This commit is contained in:
Thomas Harte
2019-02-10 22:39:24 -05:00
parent c94acb1ca2
commit 008f50832c
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Outputs/OpenGL/ScanTargetGLSLFragments.cpp
View File

@@ -14,7 +14,7 @@ using namespace Outputs::Display::OpenGL;
// MARK: - State setup for compiled shaders.
void Outputs::Display::OpenGL::ScanTarget::set_uniforms(ShaderType type, Shader &target) {
void Outputs::Display::OpenGL::ScanTarget::set_uniforms(ShaderType type, Shader &target) const {
// Slightly over-amping rowHeight here is a cheap way to make sure that lines
// converge even allowing for the fact that they may not be spaced by exactly
// the expected distance. Cf. the stencil-powered logic for making sure all
@@ -144,6 +144,30 @@ void ScanTarget::enable_vertex_attributes(ShaderType type, Shader &target) {
#undef rt_offset_of
}
std::vector<std::string> ScanTarget::bindings(ShaderType type) const {
switch(type) {
case ShaderType::Composition: return {
"startDataX",
"startClock",
"endDataX",
"endClock",
"dataY",
"lineY"
};
default: return {
"startPoint",
"endPoint",
"startClock",
"endClock",
"lineY",
"lineCompositeAmplitude",
"startCompositeAngle",
"endCompositeAngle"
};
}
}
// MARK: - Shader code.
std::string ScanTarget::sampling_function() const {
@@ -421,16 +445,7 @@ std::unique_ptr<Shader> ScanTarget::conversion_shader() const {
return std::unique_ptr<Shader>(new Shader(
vertex_shader,
fragment_shader,
{
"startPoint",
"endPoint",
"startClock",
"endClock",
"lineY",
"lineCompositeAmplitude",
"startCompositeAngle",
"endCompositeAngle"
}
bindings(ShaderType::Conversion)
));
}
@@ -504,14 +519,7 @@ std::unique_ptr<Shader> ScanTarget::composition_shader() const {
return std::unique_ptr<Shader>(new Shader(
vertex_shader,
fragment_shader + "}",
{
"startDataX",
"startClock",
"endDataX",
"endClock",
"dataY",
"lineY",
}
bindings(ShaderType::Composition)
));
}
@@ -624,14 +632,6 @@ std::unique_ptr<Shader> ScanTarget::qam_separation_shader() const {
return std::unique_ptr<Shader>(new Shader(
vertex_shader,
fragment_shader,
{
"startClock",
"startCompositeAngle",
"endClock",
"endCompositeAngle",
"lineY",
"lineCompositeAmplitude"
}
bindings(ShaderType::QAMSeparation)
));
}