6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-20 10:17:05 +00:00
Code Issues Projects Releases Wiki Activity

Rename as per new duality.

Browse Source
This commit is contained in:
Thomas Harte
2026-02-04 13:46:44 -05:00
parent 763b4c1d1b
commit dfa5db5bf5
6 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj
+6 -6
View File
@@ -1167,7 +1167,7 @@
4BD235C32F312C0C0094AFAE /* CopyShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD235C12F312C0C0094AFAE /* CopyShader.cpp */; };
4BD235C42F312C0C0094AFAE /* CompositionShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD235BF2F312C0C0094AFAE /* CompositionShader.cpp */; };
4BD235C72F312C3A0094AFAE /* Rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD235C62F312C3A0094AFAE /* Rectangle.cpp */; };
4BD235CC2F32A4C80094AFAE /* SeparationShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD235CB2F32A4C80094AFAE /* SeparationShader.cpp */; };
4BD235CC2F32A4C80094AFAE /* KernelShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD235CB2F32A4C80094AFAE /* KernelShaders.cpp */; };
4BD388882239E198002D14B5 /* 68000Tests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BD388872239E198002D14B5 /* 68000Tests.mm */; };
4BD424E02193B5340097291A /* TextureTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424DD2193B5340097291A /* TextureTarget.cpp */; };
4BD424E62193B5830097291A /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424E12193B5820097291A /* Shader.cpp */; };
@@ -2477,8 +2477,8 @@
4BD235C62F312C3A0094AFAE /* Rectangle.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Rectangle.cpp; sourceTree = "<group>"; };
4BD235C82F326A280094AFAE /* DirtyZone.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = DirtyZone.hpp; sourceTree = "<group>"; };
4BD235C92F32A2780094AFAE /* CommonAtrributes.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CommonAtrributes.hpp; sourceTree = "<group>"; };
4BD235CA2F32A4C80094AFAE /* SeparationShader.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = SeparationShader.hpp; sourceTree = "<group>"; };
4BD235CB2F32A4C80094AFAE /* SeparationShader.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SeparationShader.cpp; sourceTree = "<group>"; };
4BD235CA2F32A4C80094AFAE /* KernelShaders.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = KernelShaders.hpp; sourceTree = "<group>"; };
4BD235CB2F32A4C80094AFAE /* KernelShaders.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = KernelShaders.cpp; sourceTree = "<group>"; };
4BD388411FE34E010042B588 /* 9918Base.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = 9918Base.hpp; sourceTree = "<group>"; };
4BD388872239E198002D14B5 /* 68000Tests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = 68000Tests.mm; sourceTree = "<group>"; };
4BD424DD2193B5340097291A /* TextureTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureTarget.cpp; sourceTree = "<group>"; };
@@ -5410,14 +5410,14 @@
children = (
4BD235BF2F312C0C0094AFAE /* CompositionShader.cpp */,
4BD235C12F312C0C0094AFAE /* CopyShader.cpp */,
4BD235CB2F32A4C80094AFAE /* KernelShaders.cpp */,
4BD235C62F312C3A0094AFAE /* Rectangle.cpp */,
4BD235CB2F32A4C80094AFAE /* SeparationShader.cpp */,
4BD235C92F32A2780094AFAE /* CommonAtrributes.hpp */,
4BD235BE2F312C0C0094AFAE /* CompositionShader.hpp */,
4BD235C02F312C0C0094AFAE /* CopyShader.hpp */,
4BD235C82F326A280094AFAE /* DirtyZone.hpp */,
4BD235CA2F32A4C80094AFAE /* KernelShaders.hpp */,
4BD235C52F312C3A0094AFAE /* Rectangle.hpp */,
4BD235CA2F32A4C80094AFAE /* SeparationShader.hpp */,
);
path = Shaders;
sourceTree = "<group>";
@@ -6508,7 +6508,7 @@
4B89452D201967B4007DE474 /* Tape.cpp in Sources */,
4B055AD61FAE9B130060FFFF /* MemoryFuzzer.cpp in Sources */,
4B69DEB82AB79E4F0055B217 /* Instruction.cpp in Sources */,
4BD235CC2F32A4C80094AFAE /* SeparationShader.cpp in Sources */,
4BD235CC2F32A4C80094AFAE /* KernelShaders.cpp in Sources */,
4B055AC21FAE9AE30060FFFF /* KeyboardMachine.cpp in Sources */,
4B89453B201967B4007DE474 /* StaticAnalyser.cpp in Sources */,
4B055AEB1FAE9BA20060FFFF /* PartialMachineCycle.cpp in Sources */,
Outputs/OpenGL/ScanTarget.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "Outputs/ScanTargets/FilterGenerator.hpp"
#include "Outputs/OpenGL/Shaders/CompositionShader.hpp"
#include "Outputs/OpenGL/Shaders/CopyShader.hpp"
#include "Outputs/OpenGL/Shaders/SeparationShader.hpp"
#include "Outputs/OpenGL/Shaders/KernelShaders.hpp"
#include <algorithm>
#include <cassert>
Outputs/OpenGL/Shaders/CommonAtrributes.hpp
+7 -1
View File
@@ -19,8 +19,14 @@ namespace Outputs::Display::OpenGL {
inline std::vector<std::string> scan_attributes() {
return std::vector<std::string>{
"scanEndpoint0DataOffset",
"scanEndpoint0CyclesSinceRetrace",
"scanEndpoint0CompositeAngle",
"scanEndpoint1DataOffset",
"scanDataY"
"scanEndpoint1CyclesSinceRetrace",
"scanEndpoint1CompositeAngle",
"scanDataY",
"scanLine",
"scanCompositeAmplitude",
};
};
Outputs/OpenGL/Shaders/SeparationShader.cpp → Outputs/OpenGL/Shaders/KernelShaders.cpp
+2 -2
View File
@@ -1,12 +1,12 @@
//
// SeparationShader.cpp
// KernelShaders.cpp
// Clock Signal Kiosk
//
// Created by Thomas Harte on 03/02/2026.
// Copyright © 2026 Thomas Harte. All rights reserved.
//
#include "SeparationShader.hpp"
#include "KernelShaders.hpp"
#include "CommonAtrributes.hpp"
#include "DirtyZone.hpp"
Outputs/OpenGL/Shaders/SeparationShader.hpp → Outputs/OpenGL/Shaders/KernelShaders.hpp
+16 -8
View File
@@ -1,5 +1,5 @@
//
// SeparationShader.hpp
// KernelShaders.hpp
// Clock Signal Kiosk
//
// Created by Thomas Harte on 03/02/2026.
@@ -15,19 +15,16 @@
namespace Outputs::Display::OpenGL {
/*!
A separation shader takes input in composite form, i.e.
Takes input in composite form, i.e.
(luma, cos(phase), sin(phase), chroma amplitude)
It applies the relevant filter as currently provided by an instance of Outputs::Display::Filtergenerator
and hence produces an output in S-Video form, i.e.
Applies the relevant filter as provided by an instance of Outputs::Display::Filtergenerator to output in S-Video form, i.e.
(luma, chroma * cos(phase), luma * sin(phase), 1)
It works only in terms of whole lines and uses instances of `DirtyZone` as input to indicate
the regions that need to be translated.
Both source and destination buffers are taken to be the same size.
Works only in terms of whole lines and uses instances of `DirtyZone` as input to indicate the regions that
need to be translated. Both source and destination buffers are taken to be the same size.
*/
Shader separation_shader(
API,
@@ -39,6 +36,17 @@ Shader separation_shader(
GLenum source_texture_unit
);
/*!
Takes input in S-Video form, i.e.
(luma, chroma * cos(phase), luma * sin(phase), 1)
Applies the relevant filter as provided by an instance of Outputs::Display::Filtergenerator to output in RGB form.
Works only in terms of whole lines and uses instances of `DirtyZone` as input to indicate the regions that
need to be translated. Both source and destination buffers are taken to be the same size.
*/
Shader demodulation_shader(
API,
ColourSpace,
cmake/CLK_SOURCES.cmake
+2 -2
View File
@@ -163,10 +163,10 @@ set(CLK_SOURCES
Outputs/OpenGL/Primitives/Texture.cpp
Outputs/OpenGL/Primitives/TextureTarget.cpp
Outputs/OpenGL/Primitives/VertexArray.cpp
Outputs/OpenGL/Shaders/Rectangle.cpp
Outputs/OpenGL/Shaders/CompositionShader.cpp
Outputs/OpenGL/Shaders/CopyShader.cpp
Outputs/OpenGL/Shaders/SeparationShader.cpp
Outputs/OpenGL/Shaders/KernelShaders.cpp
Outputs/OpenGL/Shaders/Rectangle.cpp
Outputs/OpenGL/ScanTarget.cpp
Outputs/OpenGL/ScanTargetGLSLFragments.cpp
Outputs/ScanTarget.cpp