ahmed2007/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Bug fixes and formatting

Browse source
This commit is contained in:
Fernando Sahmkow 2019-02-08 20:33:11 -04:00 committed by FernandoS27
parent 5bc82d124c
commit e9d84ef22c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
View file

@ -549,6 +549,8 @@ CachedSurface::CachedSurface(const SurfaceParams& params)
// alternatives. This signals a bug on those functions. // alternatives. This signals a bug on those functions.
const auto width = static_cast<GLsizei>(params.MipWidth(0)); const auto width = static_cast<GLsizei>(params.MipWidth(0));
const auto height = static_cast<GLsizei>(params.MipHeight(0)); const auto height = static_cast<GLsizei>(params.MipHeight(0));
memory_size = params.MemorySize();
reinterpreted = false;
const auto& format_tuple = GetFormatTuple(params.pixel_format, params.component_type); const auto& format_tuple = GetFormatTuple(params.pixel_format, params.component_type);
gl_internal_format = format_tuple.internal_format; gl_internal_format = format_tuple.internal_format;
@ -995,6 +997,7 @@ void RasterizerCacheOpenGL::LoadSurface(const Surface& surface) {
surface->LoadGLBuffer(); surface->LoadGLBuffer();
surface->UploadGLTexture(read_framebuffer.handle, draw_framebuffer.handle); surface->UploadGLTexture(read_framebuffer.handle, draw_framebuffer.handle);
surface->MarkAsModified(false, *this); surface->MarkAsModified(false, *this);
surface->MarkForReload(false);
} }
Surface RasterizerCacheOpenGL::GetSurface(const SurfaceParams& params, bool preserve_contents) { Surface RasterizerCacheOpenGL::GetSurface(const SurfaceParams& params, bool preserve_contents) {
@ -1388,7 +1391,6 @@ bool RasterizerCacheOpenGL::PartialReinterpretSurface(Surface triggering_surface
return true; return true;
} }
void RasterizerCacheOpenGL::NotifyFrameBufferChange(Surface triggering_surface) { void RasterizerCacheOpenGL::NotifyFrameBufferChange(Surface triggering_surface) {
if (triggering_surface == nullptr) if (triggering_surface == nullptr)
return; return;

3
src/video_core/renderer_opengl/gl_rasterizer_cache.h
View file

@ -150,7 +150,7 @@ struct SurfaceParams {
} }
u32 MipWidthGobAligned(u32 mip_level) const { u32 MipWidthGobAligned(u32 mip_level) const {
return std::max(64U*8U / GetFormatBpp(), width >> mip_level); return Common::AlignUp(std::max(1U, width >> mip_level), 64U * 8U / GetFormatBpp());
} }
u32 MipHeight(u32 mip_level) const { u32 MipHeight(u32 mip_level) const {
@ -564,7 +564,6 @@ protected:
} }
RasterizerCache<Surface>::Unregister(object); RasterizerCache<Surface>::Unregister(object);
} }
}; };
} // namespace OpenGL } // namespace OpenGL