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

Merge pull request #563 from TomHarte/ResizeCrash

Browse Source 
Corrects likely crash shortly after starting a TMS9918 or derivative
This commit is contained in:
Thomas Harte 2018-10-22 10:19:20 -04:00 committed by GitHub
commit 027e9c7816
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Components/9918/9918.cpp
View File

@ -370,7 +370,8 @@ void TMS9918::run_for(const HalfCycles cycles) {
intersect(
line_buffer.first_pixel_output_column,
line_buffer.next_border_column,
if(start == line_buffer.first_pixel_output_column) {
if(!asked_for_write_area_) {
asked_for_write_area_ = true;
pixel_origin_ = pixel_target_ = reinterpret_cast<uint32_t *>(
crt_->allocate_write_area(static_cast<unsigned int>(line_buffer.next_border_column - line_buffer.first_pixel_output_column))
);
@ -392,6 +393,7 @@ void TMS9918::run_for(const HalfCycles cycles) {
const unsigned int length = static_cast<unsigned int>(line_buffer.next_border_column - line_buffer.first_pixel_output_column);
crt_->output_data(length * 4, length);
pixel_origin_ = pixel_target_ = nullptr;
asked_for_write_area_ = false;
}
);

1
Components/9918/Implementation/9918Base.hpp
View File

@ -788,6 +788,7 @@ class Base {
#undef slot
uint32_t *pixel_target_ = nullptr, *pixel_origin_ = nullptr;
bool asked_for_write_area_ = false;
void draw_tms_character(int start, int end);
void draw_tms_text(int start, int end);
void draw_sms(int start, int end);

2
Outputs/CRT/Internals/TextureBuilder.hpp
View File

@ -91,7 +91,7 @@ class TextureBuilder {
void submit();
struct WriteArea {
uint16_t x, y, length;
uint16_t x = 0, y = 0, length = 0;
};
/// Finalises all write areas allocated since the last call to @c flush. Only finalised areas will be
/// submitted upon the next @c submit. The supplied function will be called with a list of write areas