From 8284b272ad8ce2feaa5c11db3372c16878c02e56 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Thu, 5 May 2016 20:00:28 -0400 Subject: [PATCH] Picked appropriate new-world values for various buffers. --- Outputs/CRT/Internals/CRTConstants.hpp | 6 +++--- Outputs/CRT/Internals/CRTOpenGL.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Outputs/CRT/Internals/CRTConstants.hpp b/Outputs/CRT/Internals/CRTConstants.hpp index 65fc45f12..50096f4ec 100644 --- a/Outputs/CRT/Internals/CRTConstants.hpp +++ b/Outputs/CRT/Internals/CRTConstants.hpp @@ -37,11 +37,11 @@ const GLsizei InputBufferBuilderHeight = 1024; // This is the size of the intermediate buffers used during composite to RGB conversion const GLsizei IntermediateBufferWidth = 2048; -const GLsizei IntermediateBufferHeight = 1024; +const GLsizei IntermediateBufferHeight = 2048; // Some internal buffer sizes -const GLsizeiptr OutputVertexBufferDataSize = 5990400; // a multiple of 6 * OutputVertexSize -const GLsizeiptr SourceVertexBufferDataSize = 8736000; // a multiple of 2 * SourceVertexSize +const GLsizeiptr OutputVertexBufferDataSize = 44928; // a multiple of 6 * OutputVertexSize +const GLsizeiptr SourceVertexBufferDataSize = 29952; // a multiple of 2 * SourceVertexSize } } diff --git a/Outputs/CRT/Internals/CRTOpenGL.cpp b/Outputs/CRT/Internals/CRTOpenGL.cpp index 4b8afc1dd..3c3154d8c 100644 --- a/Outputs/CRT/Internals/CRTOpenGL.cpp +++ b/Outputs/CRT/Internals/CRTOpenGL.cpp @@ -374,8 +374,8 @@ void OpenGLOutputBuilder::draw_frame(unsigned int output_width, unsigned int out glBindFramebuffer(GL_FRAMEBUFFER, 0); glViewport(0, 0, (GLsizei)output_width, (GLsizei)output_height); glClear(GL_COLOR_BUFFER_BIT); - framebuffer->draw((float)output_width / (float)output_height); -// compositeTexture->draw((float)output_width / (float)output_height); +// framebuffer->draw((float)output_width / (float)output_height); + compositeTexture->draw((float)output_width / (float)output_height); // drawing commands having been issued, reclaim the array buffer pointer glBindBuffer(GL_ARRAY_BUFFER, output_array_buffer);