6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Switched back to full buffer clearing. Until I can figure out the source of noise.

Browse Source
This commit is contained in:
Thomas Harte 2017-01-08 19:50:31 -05:00
parent d2a7d39749
commit 3d789732a2
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Outputs/CRT/Internals/CRTOpenGL.cpp
View File

@ -198,11 +198,11 @@ void OpenGLOutputBuilder::draw_frame(unsigned int output_width, unsigned int out
// if this is the final stage before painting to the CRT, clear the framebuffer before drawing in order to blank out // if this is the final stage before painting to the CRT, clear the framebuffer before drawing in order to blank out
// those portions for which no input was provided // those portions for which no input was provided
if(!active_pipeline[1].shader) // if(!active_pipeline[1].shader)
{ // {
glClearColor(active_pipeline->clear_colour[0], active_pipeline->clear_colour[1], active_pipeline->clear_colour[2], 1.0f); glClearColor(active_pipeline->clear_colour[0], active_pipeline->clear_colour[1], active_pipeline->clear_colour[2], 1.0f);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
} // }
} }
// draw // draw
@ -272,18 +272,16 @@ void OpenGLOutputBuilder::set_openGL_context_will_change(bool should_delete_reso
void OpenGLOutputBuilder::set_composite_sampling_function(const char *shader) void OpenGLOutputBuilder::set_composite_sampling_function(const char *shader)
{ {
output_mutex_.lock(); std::lock_guard<std::mutex> lock_guard(output_mutex_);
composite_shader_ = strdup(shader); composite_shader_ = strdup(shader);
reset_all_OpenGL_state(); reset_all_OpenGL_state();
output_mutex_.unlock();
} }
void OpenGLOutputBuilder::set_rgb_sampling_function(const char *shader) void OpenGLOutputBuilder::set_rgb_sampling_function(const char *shader)
{ {
output_mutex_.lock(); std::lock_guard<std::mutex> lock_guard(output_mutex_);
rgb_shader_ = strdup(shader); rgb_shader_ = strdup(shader);
reset_all_OpenGL_state(); reset_all_OpenGL_state();
output_mutex_.unlock();
} }
#pragma mark - Program compilation #pragma mark - Program compilation