6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-19 19:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Attempt stencil fill-in.

Browse Source
This commit is contained in:
Thomas Harte
2026-02-05 21:53:35 -05:00
parent 6332c8ae8c
commit 67bf076f2a
3 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme
+4
View File
@@ -56,6 +56,10 @@
argument = ""/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Soft/Master System/R-Type (NTSC).sms""
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "--volume=0.1"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "&quot;/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Soft/Master System/Alex Kidd in Miracle World (US).sms&quot;"
isEnabled = "YES">
Outputs/OpenGL/ScanTarget.cpp
+30 -12
View File
@@ -116,6 +116,10 @@ ScanTarget::ScanTarget(const API api, const GLuint target_framebuffer, const flo
test_gl([&]{ glBlendFunc(GL_SRC_ALPHA, GL_CONSTANT_COLOR); });
test_gl([&]{ glBlendColor(0.4f, 0.4f, 0.4f, 1.0f); });
// Set stencil function for underdraw.
test_gl([&]{ glStencilFunc(GL_EQUAL, 0, GLuint(~0)); });
test_gl([&]{ glStencilOp(GL_KEEP, GL_KEEP, GL_INCR); });
// Establish initial state for is_drawing_to_accumulation_buffer_.
is_drawing_to_output_.clear();
}
@@ -421,18 +425,24 @@ void ScanTarget::update(const int output_width, const int output_height) {
}
// Figure out how many new lines are ready.
if(area.end.line != area.begin.line) {
const auto new_lines = (area.end.line - area.begin.line + LineBufferHeight) % LineBufferHeight;
size_t begin = area.begin.line;
while(begin != area.end.line) {
// Hunt for an end-of-frame. TODO: eliminate this linear search.
size_t end = begin;
do {
++end;
if(end == line_metadata_buffer_.size()) end = 0;
} while(end != area.end.line && !line_metadata_buffer_[end].is_first_in_frame);
// Populate dirty zones, and record quantity.
const int num_dirty_zones = 1 + (area.begin.line >= area.end.line);
dirty_zones_buffer_[0].begin = area.begin.line;
const int num_dirty_zones = 1 + (begin >= end);
dirty_zones_buffer_[0].begin = begin;
if(num_dirty_zones == 1) {
dirty_zones_buffer_[0].end = area.end.line;
dirty_zones_buffer_[0].end = end;
} else {
dirty_zones_buffer_[0].end = LineBufferHeight;
dirty_zones_buffer_[1].begin = 0;
dirty_zones_buffer_[1].end = area.end.line;
dirty_zones_buffer_[1].end = end;
}
dirty_zones_.bind_all();
@@ -484,22 +494,30 @@ void ScanTarget::update(const int output_width, const int output_height) {
});
buffer_destination += (end - begin) * sizeof(Line);
};
if(area.begin.line < area.end.line) {
submit(area.begin.line, area.end.line);
if(begin < end) {
submit(begin, end);
} else {
submit(area.begin.line, line_buffer_.size());
submit(0, area.end.line);
submit(begin, line_buffer_.size());
submit(0, end);
}
// Output new lines.
line_output_shader_.bind();
output_buffer_.bind_framebuffer();
test_gl([&]{ glEnable(GL_BLEND); });
test_gl([&]{ glEnable(GL_STENCIL_TEST); });
const auto new_lines = (end - begin + LineBufferHeight) % LineBufferHeight;
test_gl([&]{ glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, GLsizei(new_lines)); });
test_gl([&]{ glDisable(GL_BLEND); });
// TODO: end-of-frame blanking of untouched areas.
begin = end;
if(line_metadata_buffer_[end].is_first_in_frame) {
if(line_metadata_buffer_[end].previous_frame_was_complete) {
full_display_rectangle_.draw(1.0, 0.0, 0.0);
}
test_gl([&]{ glClear(GL_STENCIL_BUFFER_BIT); });
}
test_gl([&]{ glDisable(GL_STENCIL_TEST); });
}
// That's it for operations affecting the accumulation buffer.
Outputs/OpenGL/ScanTarget.hpp
-4
View File
@@ -98,10 +98,6 @@ private:
std::array<Scan, LineBufferHeight*5> scan_buffer_{};
std::array<Line, LineBufferHeight> line_buffer_{};
std::array<LineMetadata, LineBufferHeight> line_metadata_buffer_{};
//
// NEW PIPELINE. Starts here.
//
std::array<DirtyZone, 2> dirty_zones_buffer_{};
VertexArray scans_;