X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fjpeg_frame_view.cpp;h=6ab19482fb93772956036c19175b6ecef36262e3;hb=7b2079d4e22b1766eb8415df613ef3af10becded;hp=af894328dc1f27cd311796707d16d3327e685692;hpb=26a5c1c6a939fba538d96254181f32218ac42b71;p=nageru

diff --git a/futatabi/jpeg_frame_view.cpp b/futatabi/jpeg_frame_view.cpp
index af89432..6ab1948 100644
--- a/futatabi/jpeg_frame_view.cpp
+++ b/futatabi/jpeg_frame_view.cpp
@@ -210,6 +210,7 @@ shared_ptr<Frame> decode_jpeg(const string &jpeg)
 	glFlushMappedNamedBufferRange(pbo.pbo, 0, dinfo.image_width * dinfo.image_height + chroma_width * chroma_height * 2);
 	glMemoryBarrier(GL_PIXEL_BUFFER_BARRIER_BIT);
 	pbo.upload_done = RefCountedGLsync(GL_SYNC_GPU_COMMANDS_COMPLETE, /*flags=*/0);
+	glFlush();
 	frame->uploaded_ui_thread = pbo.upload_done;
 	frame->uploaded_interpolation = pbo.upload_done;
 	global_pbo_pool->release_pbo(move(pbo));
@@ -411,6 +412,7 @@ void JPEGFrameView::setFrame(shared_ptr<Frame> frame)
 	lock_guard<mutex> lock(cache_mu);
 	PendingDecode decode;
 	decode.frame = std::move(frame);
+	decode.fade_alpha = 0.0f;
 	pending_decodes.push_back(decode);
 	any_pending_decodes.notify_all();
 }