From bda22345530b00be5707d7112610e5044dea186a Mon Sep 17 00:00:00 2001 From: Subv Date: Sun, 16 Aug 2015 22:46:24 -0500 Subject: [PATCH] fixup! --- src/common/common_types.h | 5 ++++- src/video_core/renderer_opengl/gl_rasterizer.cpp | 5 ++--- src/video_core/utils.cpp | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/common/common_types.h b/src/common/common_types.h index 1d933bd6f..35e51edf2 100644 --- a/src/common/common_types.h +++ b/src/common/common_types.h @@ -50,7 +50,10 @@ typedef double f64; ///< 64-bit floating point typedef u32 VAddr; ///< Represents a pointer in the userspace virtual address space. typedef u32 PAddr; ///< Represents a pointer in the ARM11 physical address space. -// A 24-bit storage datatype to make working with data of this size (e.g. RGB8 textures) easier. Not intended for usage in arithmetic. +/** + * A 24-bit storage datatype to make working with data of this size (e.g. RGB8 textures) easier. + * Not intended for usage in arithmetic. + */ struct u24_be { u8 components[3]; }; diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index f0819aa3e..f280a6cdb 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -102,10 +102,9 @@ void RasterizerOpenGL::InitObjects() { glEnableVertexAttribArray(attrib_texcoords + 1); glEnableVertexAttribArray(attrib_texcoords + 2); - // Create textures for OGL framebuffer that will be rendered to, initially 8x8 to succeed in framebuffer creation - // 3DS textures' width and height must be multiples of 8 + // Create textures for OGL framebuffer that will be rendered to, initially 1x1 to succeed in framebuffer creation fb_color_texture.texture.Create(); - ReconfigureColorTexture(fb_color_texture, Pica::Regs::ColorFormat::RGBA8, 8, 8); + ReconfigureColorTexture(fb_color_texture, Pica::Regs::ColorFormat::RGBA8, 1, 1); state.texture_units[0].texture_2d = fb_color_texture.texture.handle; state.Apply(); diff --git a/src/video_core/utils.cpp b/src/video_core/utils.cpp index dfac1b620..a8c3afc7f 100644 --- a/src/video_core/utils.cpp +++ b/src/video_core/utils.cpp @@ -77,4 +77,5 @@ void CopyTextureAndUntile(const T* src, T* dst, unsigned int width, unsigned int template void CopyTextureAndUntile(const u16* src, u16* dst, unsigned int width, unsigned int height); template void CopyTextureAndUntile(const u24_be* src, u24_be* dst, unsigned int width, unsigned int height); template void CopyTextureAndUntile(const u32* src, u32* dst, unsigned int width, unsigned int height); + } // namespace