funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-12 17:58:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG correction: tests for disabling or not dithering was also disabling cache for scaling, so scaling was recomputed at every frame

Browse Source 
Signed-off-by: Vincent-FK <vincent.buso@funkey-project.com>
This commit is contained in:
Vincent-FK 2020-02-27 15:30:22 +08:00
parent 2530514e55
commit 260178ef44
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
RetroFE/Source/Graphics/Component/Image.cpp
View File

@ -86,8 +86,8 @@ void Image::allocateGraphicsMemory()
needDithering_ = true; needDithering_ = true;
} }
/* Convert to RGB 32bit if necessary */ /* Convert to RGB 32bit if necessary */
if(img_tmp->format->BitsPerPixel != 32){ if(imgBitsPerPx_ != 32){
texture_ = SDL_CreateRGBSurface(0, img_tmp->w, img_tmp->h, 32, 0, 0, 0, 0); texture_ = SDL_CreateRGBSurface(0, img_tmp->w, img_tmp->h, 32, 0, 0, 0, 0);
SDL_BlitSurface(img_tmp, NULL, texture_, NULL); SDL_BlitSurface(img_tmp, NULL, texture_, NULL);
@ -102,8 +102,8 @@ void Image::allocateGraphicsMemory()
/* Set real dimensions */ /* Set real dimensions */
if (texture_ != NULL) if (texture_ != NULL)
{ {
baseViewInfo.ImageWidth = texture_->w * scaleX_; baseViewInfo.ImageWidth = texture_->w * scaleX_;
baseViewInfo.ImageHeight = texture_->h * scaleY_; baseViewInfo.ImageHeight = texture_->h * scaleY_;
} }
} }
SDL_UnlockMutex(SDL::getMutex()); SDL_UnlockMutex(SDL::getMutex());
@ -135,13 +135,15 @@ void Image::draw()
scaling_needed = rect.w!=0 && rect.h!=0 && (texture_->w != rect.w || texture_->h != rect.h); scaling_needed = rect.w!=0 && rect.h!=0 && (texture_->w != rect.w || texture_->h != rect.h);
if(scaling_needed){ if(scaling_needed){
cache_scaling_needed = (texture_prescaled_ == NULL)?true:(texture_prescaled_->w != rect.w || texture_prescaled_->h != rect.h); cache_scaling_needed = (texture_prescaled_ == NULL)?true:(texture_prescaled_->w != rect.w || texture_prescaled_->h != rect.h);
if(cache_scaling_needed && imgBitsPerPx_ > 16 && ditheringAuthorized_){ if(cache_scaling_needed){
needDithering_ = true;
texture_prescaled_ = SDL::zoomSurface(texture_, NULL, &rect); texture_prescaled_ = SDL::zoomSurface(texture_, NULL, &rect);
if(texture_prescaled_ == NULL){ if(texture_prescaled_ == NULL){
printf("ERROR in %s - Could not create texture_prescaled_\n", __func__); printf("ERROR in %s - Could not create texture_prescaled_\n", __func__);
use_prescaled = false; use_prescaled = false;
} }
if(imgBitsPerPx_ > 16 && ditheringAuthorized_){
needDithering_ = true;
}
} }
if(texture_prescaled_ != NULL){ if(texture_prescaled_ != NULL){
@ -159,11 +161,11 @@ void Image::draw()
} }
/* Dithering */ /* Dithering */
/*if(needDithering_){ if(needDithering_){
printf("Dither: %s\n", file_.c_str()); //printf("Dither: %s\n", file_.c_str());
SDL::ditherSurface32bppTo16Bpp(surfaceToRender); SDL::ditherSurface32bppTo16Bpp(surfaceToRender);
needDithering_ = false; needDithering_ = false;
}*/ }
/* Render */ /* Render */
SDL::renderCopy(surfaceToRender, baseViewInfo.Alpha, NULL, &rect, baseViewInfo); SDL::renderCopy(surfaceToRender, baseViewInfo.Alpha, NULL, &rect, baseViewInfo);