6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-22 12:33:29 +00:00
Code Issues Projects Releases Wiki Activity

Ensures OpenGL version is logged prior to any other GL calls.

Browse Source
This commit is contained in:
Thomas Harte 2019-02-20 20:21:17 -05:00
parent 9f6956bd87
commit 080f949f89
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Outputs/OpenGL/ScanTarget.cpp
View File

@ -10,7 +10,6 @@
#include "OpenGL.hpp"
#include "Primitives/Rectangle.hpp"
#include "../Log.hpp"
#include <cassert>
#include <cstring>
@ -79,9 +78,6 @@ ScanTarget::ScanTarget(GLuint target_framebuffer, float output_gamma) :
unprocessed_line_texture_(LineBufferWidth, LineBufferHeight, UnprocessedLineBufferTextureUnit, GL_NEAREST, false),
full_display_rectangle_(-1.0f, -1.0f, 2.0f, 2.0f) {
// Note the OpenGL version.
LOG("Constructing scan target with OpenGL " << glGetString(GL_VERSION) << "; shading language version " << glGetString(GL_SHADING_LANGUAGE_VERSION));
// Ensure proper initialisation of the two atomic pointer sets.
read_pointers_.store(write_pointers_);
submit_pointers_.store(write_pointers_);

11
Outputs/OpenGL/ScanTarget.hpp
View File

@ -10,6 +10,8 @@
#define ScanTarget_hpp
#include "../ScanTarget.hpp"
#include "../Log.hpp"
#include "OpenGL.hpp"
#include "Primitives/TextureTarget.hpp"
#include "Primitives/Rectangle.hpp"
@ -43,6 +45,15 @@ class ScanTarget: public Outputs::Display::ScanTarget {
void draw(bool synchronous, int output_width, int output_height);
private:
#ifndef NDEBUG
struct OpenGLVersionDumper {
OpenGLVersionDumper() {
// Note the OpenGL version, as the first thing this class does prior to construction.
LOG("Constructing scan target with OpenGL " << glGetString(GL_VERSION) << "; shading language version " << glGetString(GL_SHADING_LANGUAGE_VERSION));
}
} dumper_;
#endif
static constexpr int WriteAreaWidth = 2048;
static constexpr int WriteAreaHeight = 2048;