6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-27 06:35:04 +00:00
Code Issues Projects Releases Wiki Activity

Declines improper use of offset within loops and adds missing header.

Browse Source
This commit is contained in:
Thomas Harte 2019-01-25 20:14:53 -05:00 committed by Thomas Harte
parent 097bc7055e
commit 74e1a9a621
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Outputs/OpenGL/ScanTargetGLSLFragments.cpp
View File

@ -8,6 +8,8 @@
#include "ScanTarget.hpp"
#include <cmath>
using namespace Outputs::Display::OpenGL;
void Outputs::Display::OpenGL::ScanTarget::set_uniforms(ShaderType type, Shader &target) {
@ -21,6 +23,12 @@ void Outputs::Display::OpenGL::ScanTarget::set_uniforms(ShaderType type, Shader
}
void ScanTarget::enable_vertex_attributes(ShaderType type, Shader &target) {
#define rt_offset_of(field, source) (reinterpret_cast<uint8_t *>(&source.field) - reinterpret_cast<uint8_t *>(&source))
// test_scan and test_line are here so that the byte offsets that need to be
// calculated inside a loop can be done so validly; offsetof requires constant arguments.
Scan test_scan;
Line test_line;
switch(type) {
case ShaderType::Composition:
for(int c = 0; c < 2; ++c) {
@ -30,14 +38,14 @@ void ScanTarget::enable_vertex_attributes(ShaderType type, Shader &target) {
prefix + "DataX",
1, GL_UNSIGNED_SHORT, GL_FALSE,
sizeof(Scan),
reinterpret_cast<void *>(offsetof(Scan, scan.end_points[c].data_offset)),
reinterpret_cast<void *>(rt_offset_of(scan.end_points[c].data_offset, test_scan)),
1);
target.enable_vertex_attribute_with_pointer(
prefix + "Clock",
1, GL_UNSIGNED_SHORT, GL_FALSE,
sizeof(Scan),
reinterpret_cast<void *>(offsetof(Scan, scan.end_points[c].cycles_since_end_of_horizontal_retrace)),
reinterpret_cast<void *>(rt_offset_of(scan.end_points[c].cycles_since_end_of_horizontal_retrace, test_scan)),
1);
}
@ -64,21 +72,21 @@ void ScanTarget::enable_vertex_attributes(ShaderType type, Shader &target) {
prefix + "Point",
2, GL_UNSIGNED_SHORT, GL_FALSE,
sizeof(Line),
reinterpret_cast<void *>(offsetof(Line, end_points[c].x)),
reinterpret_cast<void *>(rt_offset_of(end_points[c].x, test_line)),
1);
target.enable_vertex_attribute_with_pointer(
prefix + "Clock",
1, GL_UNSIGNED_SHORT, GL_FALSE,
sizeof(Line),
reinterpret_cast<void *>(offsetof(Line, end_points[c].cycles_since_end_of_horizontal_retrace)),
reinterpret_cast<void *>(rt_offset_of(end_points[c].cycles_since_end_of_horizontal_retrace, test_line)),
1);
target.enable_vertex_attribute_with_pointer(
prefix + "CompositeAngle",
1, GL_SHORT, GL_FALSE,
sizeof(Line),
reinterpret_cast<void *>(offsetof(Line, end_points[c].composite_angle)),
reinterpret_cast<void *>(rt_offset_of(end_points[c].composite_angle, test_line)),
1);
}
@ -97,6 +105,7 @@ void ScanTarget::enable_vertex_attributes(ShaderType type, Shader &target) {
1);
break;
}
#undef rt_offset_of
}
std::unique_ptr<Shader> ScanTarget::composition_shader() const {