From 20b4896940d72f182cd3e01cd293a9e0bbfa9b90 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Fri, 25 Jan 2019 19:11:39 -0500 Subject: [PATCH] Eliminates the dead stuff of CRTConstants.hpp. --- .../Clock Signal.xcodeproj/project.pbxproj | 2 - Outputs/CRT/Internals/CRTConstants.hpp | 52 ------------------- 2 files changed, 54 deletions(-) delete mode 100644 Outputs/CRT/Internals/CRTConstants.hpp diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index d9bc03a70..50fcc1dfd 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -712,7 +712,6 @@ 4B08A2771EE39306008B7065 /* TestMachine.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestMachine.mm; sourceTree = ""; }; 4B08A2791EE3957B008B7065 /* TestMachine+ForSubclassEyesOnly.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TestMachine+ForSubclassEyesOnly.h"; sourceTree = ""; }; 4B08A56820D72BEF0016CE5A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Clock Signal/Base.lproj/Activity.xib"; sourceTree = SOURCE_ROOT; }; - 4B0B6E121C9DBD5D00FFB60D /* CRTConstants.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CRTConstants.hpp; sourceTree = ""; }; 4B0CCC421C62D0B3001CAC5F /* CRT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CRT.cpp; sourceTree = ""; }; 4B0CCC431C62D0B3001CAC5F /* CRT.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CRT.hpp; sourceTree = ""; }; 4B0E04E81FC9E5DA00F43484 /* CAS.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CAS.cpp; sourceTree = ""; }; @@ -2931,7 +2930,6 @@ 4BBF99071C8FBA6F0075DAFB /* Internals */ = { isa = PBXGroup; children = ( - 4B0B6E121C9DBD5D00FFB60D /* CRTConstants.hpp */, 4BBF990E1C8FBA6F0075DAFB /* Flywheel.hpp */, ); path = Internals; diff --git a/Outputs/CRT/Internals/CRTConstants.hpp b/Outputs/CRT/Internals/CRTConstants.hpp deleted file mode 100644 index 70b7e581a..000000000 --- a/Outputs/CRT/Internals/CRTConstants.hpp +++ /dev/null @@ -1,52 +0,0 @@ -// -// CRTContants.hpp -// Clock Signal -// -// Created by Thomas Harte on 19/03/2016. -// Copyright 2016 Thomas Harte. All rights reserved. -// - -#ifndef CRTConstants_h -#define CRTConstants_h - -#include "OpenGL.hpp" -#include - -namespace Outputs { -namespace CRT { - -// Output vertices are those used to copy from an input buffer, whether it describes data that maps directly to RGB -// or is one of the intermediate buffers that we've used to convert from composite towards RGB. -const GLsizei OutputVertexOffsetOfHorizontal = 0; -const GLsizei OutputVertexOffsetOfVertical = 4; - -const GLsizei OutputVertexSize = 8; - -// Input vertices, used only in composite mode, map from the input buffer to temporary buffer locations; such -// remapping occurs to ensure a continous stream of data for each scan, giving correct out-of-bounds behaviour -const GLsizei SourceVertexOffsetOfInputStart = 0; -const GLsizei SourceVertexOffsetOfOutputStart = 4; -const GLsizei SourceVertexOffsetOfEnds = 8; -const GLsizei SourceVertexOffsetOfPhaseTimeAndAmplitude = 12; - -const GLsizei SourceVertexSize = 16; - -// These constants hold the size of the rolling buffer to which the CPU writes -const GLsizei InputBufferBuilderWidth = 2048; -const GLsizei InputBufferBuilderHeight = 512; - -// This is the size of the intermediate buffers used during composite to RGB conversion -const GLsizei IntermediateBufferWidth = 2048; -const GLsizei IntermediateBufferHeight = 512; - -// Some internal buffer sizes -const GLsizeiptr OutputVertexBufferDataSize = OutputVertexSize * IntermediateBufferHeight; // i.e. the maximum number of scans of output that can be created between draws -const GLsizeiptr SourceVertexBufferDataSize = SourceVertexSize * IntermediateBufferHeight * 10; // (the maximum number of scans) * conservative, high guess at a maximumum number of events likely to occur within a scan - -// TODO: when SourceVertexBufferDataSize is exhausted, the CRT keeps filling OutputVertexBufferDataSize regardless, -// leading to empty scanlines that nevertheless clear old contents. - -} -} - -#endif /* CRTContants_h */