From 23506defe3f2e9e1eee2968ababc9fb7fca918ae Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 5 Apr 2014 16:04:25 -0400 Subject: added video_core project to solution --- src/video_core/CMakeLists.txt | 19 +++++ src/video_core/src/renderer_base.h | 116 +++++++++++++++++++++++++++ src/video_core/src/utils.cpp | 66 +++++++++++++++ src/video_core/src/utils.h | 83 +++++++++++++++++++ src/video_core/src/video_core.cpp | 91 +++++++++++++++++++++ src/video_core/src/video_core.h | 48 +++++++++++ src/video_core/video_core.vcxproj | 129 ++++++++++++++++++++++++++++++ src/video_core/video_core.vcxproj.filters | 15 ++++ 8 files changed, 567 insertions(+) create mode 100644 src/video_core/CMakeLists.txt create mode 100644 src/video_core/src/renderer_base.h create mode 100644 src/video_core/src/utils.cpp create mode 100644 src/video_core/src/utils.h create mode 100644 src/video_core/src/video_core.cpp create mode 100644 src/video_core/src/video_core.h create mode 100644 src/video_core/video_core.vcxproj create mode 100644 src/video_core/video_core.vcxproj.filters (limited to 'src/video_core') diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt new file mode 100644 index 000000000..3f486b8fe --- /dev/null +++ b/src/video_core/CMakeLists.txt @@ -0,0 +1,19 @@ +set(SRCS + src/bp_mem.cpp + src/cp_mem.cpp + src/xf_mem.cpp + src/fifo.cpp + src/fifo_player.cpp + src/vertex_loader.cpp + src/vertex_manager.cpp + src/video_core.cpp + src/shader_manager.cpp + src/texture_decoder.cpp + src/texture_manager.cpp + src/utils.cpp + src/renderer_gl3/renderer_gl3.cpp + src/renderer_gl3/shader_interface.cpp + src/renderer_gl3/texture_interface.cpp + src/renderer_gl3/uniform_manager.cpp) + +add_library(video_core STATIC ${SRCS}) diff --git a/src/video_core/src/renderer_base.h b/src/video_core/src/renderer_base.h new file mode 100644 index 000000000..9cd02e0b4 --- /dev/null +++ b/src/video_core/src/renderer_base.h @@ -0,0 +1,116 @@ +/** + * Copyright (C) 2014 Citra Emulator + * + * @file renderer_base.h + * @author bunnei + * @date 2014-04-05 + * @brief Renderer base class for new video core + * + * @section LICENSE + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details at + * http://www.gnu.org/copyleft/gpl.html + * + * Official project repository can be found at: + * http://code.google.com/p/gekko-gc-emu/ + */ + +#pragma once + +#include "common.h" +#include "hash.h" + +class RendererBase { +public: + + /// Used to reference a framebuffer + enum kFramebuffer { + kFramebuffer_VirtualXFB = 0, + kFramebuffer_EFB, + kFramebuffer_Texture + }; + + /// Used for referencing the render modes + enum kRenderMode { + kRenderMode_None = 0, + kRenderMode_Multipass = 1, + kRenderMode_ZComp = 2, + kRenderMode_UseDstAlpha = 4 + }; + + RendererBase() : current_fps_(0), current_frame_(0) { + } + + ~RendererBase() { + } + + /** + * Blits the EFB to the external framebuffer (XFB) + * @param src_rect Source rectangle in EFB to copy + * @param dst_rect Destination rectangle in EFB to copy to + * @param dest_height Destination height in pixels + */ + virtual void CopyToXFB(const Rect& src_rect, const Rect& dst_rect) = 0; + + /** + * Clear the screen + * @param rect Screen rectangle to clear + * @param enable_color Enable color clearing + * @param enable_alpha Enable alpha clearing + * @param enable_z Enable depth clearing + * @param color Clear color + * @param z Clear depth + */ + virtual void Clear(const Rect& rect, bool enable_color, bool enable_alpha, bool enable_z, + u32 color, u32 z) = 0; + + /** + * Set a specific render mode + * @param flag Render flags mode to enable + */ + virtual void SetMode(kRenderMode flags) = 0; + + /// Reset the full renderer API to the NULL state + virtual void ResetRenderState() = 0; + + /// Restore the full renderer API state - As the game set it + virtual void RestoreRenderState() = 0; + + /** + * Set the emulator window to use for renderer + * @param window EmuWindow handle to emulator window to use for rendering + */ + virtual void SetWindow(EmuWindow* window) = 0; + + /// Initialize the renderer + virtual void Init() = 0; + + /// Shutdown the renderer + virtual void ShutDown() = 0; + + /// Converts EFB rectangle coordinates to renderer rectangle coordinates + //static Rect EFBToRendererRect(const Rect& rect) { + // return Rect(rect.x0_, kGCEFBHeight - rect.y0_, rect.x1_, kGCEFBHeight - rect.y1_); + //} + + // Getter/setter functions: + // ------------------------ + + f32 current_fps() const { return current_fps_; } + + int current_frame() const { return current_frame_; } + +protected: + f32 current_fps_; ///< Current framerate, should be set by the renderer + int current_frame_; ///< Current frame, should be set by the renderer + +private: + DISALLOW_COPY_AND_ASSIGN(RendererBase); +}; diff --git a/src/video_core/src/utils.cpp b/src/video_core/src/utils.cpp new file mode 100644 index 000000000..a5e702f67 --- /dev/null +++ b/src/video_core/src/utils.cpp @@ -0,0 +1,66 @@ +/** + * Copyright (C) 2005-2012 Gekko Emulator + * + * @file utils.cpp + * @author ShizZy + * @date 2012-12-28 + * @brief Utility functions (in general, not related to emulation) useful for video core + * + * @section LICENSE + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details at + * http://www.gnu.org/copyleft/gpl.html + * + * Official project repository can be found at: + * http://code.google.com/p/gekko-gc-emu/ + */ + +#include +#include + +#include "utils.h" + +namespace VideoCore { + +/** + * Dumps a texture to TGA + * @param filename String filename to dump texture to + * @param width Width of texture in pixels + * @param height Height of texture in pixels + * @param raw_data Raw RGBA8 texture data to dump + * @todo This should be moved to some general purpose/common code + */ +void DumpTGA(std::string filename, int width, int height, u8* raw_data) { + TGAHeader hdr; + FILE* fout; + u8 r, g, b; + + memset(&hdr, 0, sizeof(hdr)); + hdr.datatypecode = 2; // uncompressed RGB + hdr.bitsperpixel = 24; // 24 bpp + hdr.width = width; + hdr.height = height; + + fout = fopen(filename.c_str(), "wb"); + fwrite(&hdr, sizeof(TGAHeader), 1, fout); + for (int i = 0; i < height; i++) { + for (int j = 0; j < width; j++) { + r = raw_data[(4 * (i * width)) + (4 * j) + 0]; + g = raw_data[(4 * (i * width)) + (4 * j) + 1]; + b = raw_data[(4 * (i * width)) + (4 * j) + 2]; + putc(b, fout); + putc(g, fout); + putc(r, fout); + } + } + fclose(fout); +} + +} // namespace diff --git a/src/video_core/src/utils.h b/src/video_core/src/utils.h new file mode 100644 index 000000000..2d7fa4a3a --- /dev/null +++ b/src/video_core/src/utils.h @@ -0,0 +1,83 @@ +/** + * Copyright (C) 2005-2012 Gekko Emulator + * + * @file utils.h + * @author ShizZy + * @date 2012-12-28 + * @brief Utility functions (in general, not related to emulation) useful for video core + * + * @section LICENSE + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details at + * http://www.gnu.org/copyleft/gpl.html + * + * Official project repository can be found at: + * http://code.google.com/p/gekko-gc-emu/ + */ + +#pragma once + +#include "common_types.h" +#include + +namespace FormatPrecision { + +/// Adjust RGBA8 color with RGBA6 precision +static inline u32 rgba8_with_rgba6(u32 src) { + u32 color = src; + color &= 0xFCFCFCFC; + color |= (color >> 6) & 0x03030303; + return color; +} + +/// Adjust RGBA8 color with RGB565 precision +static inline u32 rgba8_with_rgb565(u32 src) { + u32 color = (src & 0xF8FCF8); + color |= (color >> 5) & 0x070007; + color |= (color >> 6) & 0x000300; + color |= 0xFF000000; + return color; +} + +/// Adjust Z24 depth value with Z16 precision +static inline u32 z24_with_z16(u32 src) { + return (src & 0xFFFF00) | (src >> 16); +} + +} // namespace + +namespace VideoCore { + +/// Structure for the TGA texture format (for dumping) +struct TGAHeader { + char idlength; + char colourmaptype; + char datatypecode; + short int colourmaporigin; + short int colourmaplength; + short int x_origin; + short int y_origin; + short width; + short height; + char bitsperpixel; + char imagedescriptor; +}; + +/** + * Dumps a texture to TGA + * @param filename String filename to dump texture to + * @param width Width of texture in pixels + * @param height Height of texture in pixels + * @param raw_data Raw RGBA8 texture data to dump + * @todo This should be moved to some general purpose/common code + */ +void DumpTGA(std::string filename, int width, int height, u8* raw_data); + +} // namespace diff --git a/src/video_core/src/video_core.cpp b/src/video_core/src/video_core.cpp new file mode 100644 index 000000000..8ad45c912 --- /dev/null +++ b/src/video_core/src/video_core.cpp @@ -0,0 +1,91 @@ +/** + * Copyright (C) 2014 Citra Emulator + * + * @file video_core.cpp + * @author bunnei + * @date 2014-04-05 + * @brief Main module for new video core + * + * @section LICENSE + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details at + * http://www.gnu.org/copyleft/gpl.html + * + * Official project repository can be found at: + * http://code.google.com/p/gekko-gc-emu/ + */ + +#include "common.h" +#include "emu_window.h" +#include "log.h" + +#include "core.h" +#include "video_core.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Video Core namespace + +namespace VideoCore { + +EmuWindow* g_emu_window = NULL; ///< Frontend emulator window +RendererBase* g_renderer = NULL; ///< Renderer plugin +int g_current_frame = 0; + +int VideoEntry(void*) { + if (g_emu_window == NULL) { + ERROR_LOG(VIDEO, "VideoCore::VideoEntry called without calling Init()!"); + } + g_emu_window->MakeCurrent(); + //for(;;) { + // gp::Fifo_DecodeCommand(); + //} + return 0; +} + +/// Start the video core +void Start() { + if (g_emu_window == NULL) { + ERROR_LOG(VIDEO, "VideoCore::Start called without calling Init()!"); + } + //if (common::g_config->enable_multicore()) { + // g_emu_window->DoneCurrent(); + // g_video_thread = SDL_CreateThread(VideoEntry, NULL, NULL); + // if (g_video_thread == NULL) { + // LOG_ERROR(TVIDEO, "Unable to create thread: %s... Exiting\n", SDL_GetError()); + // exit(1); + // } + //} +} + +/// Initialize the video core +void Init(EmuWindow* emu_window) { + g_emu_window = emu_window; + //g_renderer = new RendererGL3(); + //g_renderer->SetWindow(g_emu_window); + //g_renderer->Init(); + + //gp::Fifo_Init(); + //gp::VertexManager_Init(); + //gp::VertexLoader_Init(); + //gp::BP_Init(); + //gp::CP_Init(); + //gp::XF_Init(); + + g_current_frame = 0; + + NOTICE_LOG(VIDEO, "initialized ok"); +} + +/// Shutdown the video core +void Shutdown() { + //delete g_renderer; +} + +} // namespace diff --git a/src/video_core/src/video_core.h b/src/video_core/src/video_core.h new file mode 100644 index 000000000..9b80d7715 --- /dev/null +++ b/src/video_core/src/video_core.h @@ -0,0 +1,48 @@ +/*! + * Copyright (C) 2014 Citra Emulator + * + * @file video_core.h + * @author bunnei + * @date 2014-04-05 + * @brief Main module for new video core + * + * @section LICENSE + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details at + * http://www.gnu.org/copyleft/gpl.html + * + * Official project repository can be found at: + * http://code.google.com/p/gekko-gc-emu/ + */ + +#pragma once + +#include "common.h" +#include "emu_window.h" +#include "renderer_base.h" + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// Video Core namespace + +namespace VideoCore { + +extern RendererBase* g_renderer; ///< Renderer plugin +extern int g_current_frame; ///< Current frame + +/// Start the video core +void Start(); + +/// Initialize the video core +void Init(EmuWindow* emu_window); + +/// Shutdown the video core +void ShutDown(); + +} // namespace diff --git a/src/video_core/video_core.vcxproj b/src/video_core/video_core.vcxproj new file mode 100644 index 000000000..4a1429745 --- /dev/null +++ b/src/video_core/video_core.vcxproj @@ -0,0 +1,129 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + {6678D1A3-33A6-48A9-878B-48E5D2903D27} + input_common + video_core + + + + StaticLibrary + true + v120 + + + StaticLibrary + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + true + + + + + + true + true + true + + + + + + + + + true + true + true + + + + + + \ No newline at end of file diff --git a/src/video_core/video_core.vcxproj.filters b/src/video_core/video_core.vcxproj.filters new file mode 100644 index 000000000..2a84b7edf --- /dev/null +++ b/src/video_core/video_core.vcxproj.filters @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 080f847550b028e59f5a37471e00b8a27e6f1b23 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 6 Apr 2014 16:55:39 -0400 Subject: added initial renderer code --- src/video_core/src/renderer_base.h | 26 +- .../src/renderer_opengl/renderer_opengl.cpp | 340 +++++++++++++++++++++ .../src/renderer_opengl/renderer_opengl.h | 138 +++++++++ src/video_core/src/video_core.cpp | 19 +- src/video_core/src/video_core.h | 17 +- src/video_core/video_core.vcxproj | 2 + src/video_core/video_core.vcxproj.filters | 11 + 7 files changed, 534 insertions(+), 19 deletions(-) create mode 100644 src/video_core/src/renderer_opengl/renderer_opengl.cpp create mode 100644 src/video_core/src/renderer_opengl/renderer_opengl.h (limited to 'src/video_core') diff --git a/src/video_core/src/renderer_base.h b/src/video_core/src/renderer_base.h index 9cd02e0b4..50f1475b2 100644 --- a/src/video_core/src/renderer_base.h +++ b/src/video_core/src/renderer_base.h @@ -51,6 +51,9 @@ public: ~RendererBase() { } + /// Swap buffers (render frame) + virtual void SwapBuffers() = 0; + /** * Blits the EFB to the external framebuffer (XFB) * @param src_rect Source rectangle in EFB to copy @@ -71,6 +74,24 @@ public: virtual void Clear(const Rect& rect, bool enable_color, bool enable_alpha, bool enable_z, u32 color, u32 z) = 0; + /// Sets the renderer viewport location, width, and height + virtual void SetViewport(int x, int y, int width, int height) = 0; + + /// Sets the renderer depthrange, znear and zfar + virtual void SetDepthRange(double znear, double zfar) = 0; + + /* Sets the scissor box + * @param rect Renderer rectangle to set scissor box to + */ + virtual void SetScissorBox(const Rect& rect) = 0; + + /** + * Sets the line and point size + * @param line_width Line width to use + * @param point_size Point size to use + */ + virtual void SetLinePointSize(f32 line_width, f32 point_size) = 0; + /** * Set a specific render mode * @param flag Render flags mode to enable @@ -95,11 +116,6 @@ public: /// Shutdown the renderer virtual void ShutDown() = 0; - /// Converts EFB rectangle coordinates to renderer rectangle coordinates - //static Rect EFBToRendererRect(const Rect& rect) { - // return Rect(rect.x0_, kGCEFBHeight - rect.y0_, rect.x1_, kGCEFBHeight - rect.y1_); - //} - // Getter/setter functions: // ------------------------ diff --git a/src/video_core/src/renderer_opengl/renderer_opengl.cpp b/src/video_core/src/renderer_opengl/renderer_opengl.cpp new file mode 100644 index 000000000..133740a74 --- /dev/null +++ b/src/video_core/src/renderer_opengl/renderer_opengl.cpp @@ -0,0 +1,340 @@ +/** + * Copyright (C) 2014 Citra Emulator + * + * @file renderer_opengl.cpp + * @author bunnei + * @date 2014-04-05 + * @brief Renderer for OpenGL 3.x + * + * @section LICENSE + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details at + * http://www.gnu.org/copyleft/gpl.html + * + * Official project repository can be found at: + * http://code.google.com/p/gekko-gc-emu/ + */ + +#include "video_core.h" +#include "renderer_opengl/renderer_opengl.h" + +/// RendererOpenGL constructor +RendererOpenGL::RendererOpenGL() { + memset(fbo_, 0, sizeof(fbo_)); + memset(fbo_rbo_, 0, sizeof(fbo_rbo_)); + memset(fbo_depth_buffers_, 0, sizeof(fbo_depth_buffers_)); + + resolution_width_ = max(VideoCore::kScreenTopWidth, VideoCore::kScreenBottomWidth); + resolution_height_ = VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight; +} + +/// RendererOpenGL destructor +RendererOpenGL::~RendererOpenGL() { +} + + +/// Swap buffers (render frame) +void RendererOpenGL::SwapBuffers() { + + glClearColor(1.0f, 1.0f, 0.0f, 1.0f); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + ResetRenderState(); + + // EFB->XFB copy + // TODO(bunnei): This is a hack and does not belong here. The copy should be triggered by some + // register write We're also treating both framebuffers as a single one in OpenGL. + Rect framebuffer_size(0, 0, VideoCore::kScreenTopWidth, + VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight); + CopyToXFB(framebuffer_size, framebuffer_size); + + // XFB->Window copy + RenderFramebuffer(); + + // Swap buffers + render_window_->PollEvents(); + render_window_->SwapBuffers(); + + // Switch back to EFB and clear + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo_[kFramebuffer_EFB]); + + RestoreRenderState(); +} + +/** + * Blits the EFB to the external framebuffer (XFB) + * @param src_rect Source rectangle in EFB to copy + * @param dst_rect Destination rectangle in EFB to copy to + * @param dest_height Destination height in pixels + */ +void RendererOpenGL::CopyToXFB(const Rect& src_rect, const Rect& dst_rect) { + ResetRenderState(); + + // Render target is destination framebuffer + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo_[kFramebuffer_VirtualXFB]); + glViewport(0, 0, resolution_width_, resolution_height_); + + // Render source is our EFB + glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo_[kFramebuffer_EFB]); + glReadBuffer(GL_COLOR_ATTACHMENT0); + + // Blit + glBlitFramebuffer(src_rect.x0_, src_rect.y0_, src_rect.x1_, src_rect.y1_, + dst_rect.x0_, dst_rect.y1_, dst_rect.x1_, dst_rect.y0_, + GL_COLOR_BUFFER_BIT, GL_LINEAR); + + glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); + + RestoreRenderState(); +} + +/** + * Clear the screen + * @param rect Screen rectangle to clear + * @param enable_color Enable color clearing + * @param enable_alpha Enable alpha clearing + * @param enable_z Enable depth clearing + * @param color Clear color + * @param z Clear depth + */ +void RendererOpenGL::Clear(const Rect& rect, bool enable_color, bool enable_alpha, bool enable_z, + u32 color, u32 z) { + GLboolean const color_mask = enable_color ? GL_TRUE : GL_FALSE; + GLboolean const alpha_mask = enable_alpha ? GL_TRUE : GL_FALSE; + + ResetRenderState(); + + // Clear color + glColorMask(color_mask, color_mask, color_mask, alpha_mask); + glClearColor(float((color >> 16) & 0xFF) / 255.0f, float((color >> 8) & 0xFF) / 255.0f, + float((color >> 0) & 0xFF) / 255.0f, float((color >> 24) & 0xFF) / 255.0f); + + // Clear depth + glDepthMask(enable_z ? GL_TRUE : GL_FALSE); + glClearDepth(float(z & 0xFFFFFF) / float(0xFFFFFF)); + + // Specify the rectangle of the EFB to clear + glEnable(GL_SCISSOR_TEST); + glScissor(rect.x0_, rect.y1_, rect.width(), rect.height()); + + // Clear it! + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + RestoreRenderState(); +} + +/// Sets the renderer viewport location, width, and height +void RendererOpenGL::SetViewport(int x, int y, int width, int height) { + glViewport(x, y, width, height); +} + +/// Sets the renderer depthrange, znear and zfar +void RendererOpenGL::SetDepthRange(double znear, double zfar) { + glDepthRange(znear, zfar); +} + +/* Sets the scissor box + * @param rect Renderer rectangle to set scissor box to + */ +void RendererOpenGL::SetScissorBox(const Rect& rect) { + glScissor(rect.x0_, rect.y1_, rect.width(), rect.height()); +} + +/** + * Sets the line and point size + * @param line_width Line width to use + * @param point_size Point size to use + */ +void RendererOpenGL::SetLinePointSize(f32 line_width, f32 point_size) { + glLineWidth((GLfloat)line_width); + glPointSize((GLfloat)point_size); +} + +/** + * Set a specific render mode + * @param flag Render flags mode to enable + */ +void RendererOpenGL::SetMode(kRenderMode flags) { + if(flags & kRenderMode_ZComp) { + glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); + } + if(flags & kRenderMode_Multipass) { + glEnable(GL_DEPTH_TEST); + glDepthMask(GL_FALSE); + glDepthFunc(GL_EQUAL); + } + if (flags & kRenderMode_UseDstAlpha) { + glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE); + glDisable(GL_BLEND); + } + last_mode_ |= flags; +} + +/// Reset the full renderer API to the NULL state +void RendererOpenGL::ResetRenderState() { + glDisable(GL_SCISSOR_TEST); + glDisable(GL_DEPTH_TEST); + glDisable(GL_CULL_FACE); + glDisable(GL_BLEND); + glDepthMask(GL_FALSE); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); +} + +/// Restore the full renderer API state - As the game set it +void RendererOpenGL::RestoreRenderState() { + + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo_[kFramebuffer_EFB]); + + //gp::XF_UpdateViewport(); + SetViewport(0, 0, resolution_width_, resolution_height_); + SetDepthRange(0.0f, 1.0f); + + //SetGenerationMode(); + glEnable(GL_CULL_FACE); + glFrontFace(GL_CCW); + + //glEnable(GL_SCISSOR_TEST); + //gp::BP_SetScissorBox(); + glDisable(GL_SCISSOR_TEST); + + //SetColorMask(gp::g_bp_regs.cmode0); + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + + //SetDepthMode(); + glDisable(GL_DEPTH_TEST); + glDepthMask(GL_FALSE); + + //SetBlendMode(gp::g_bp_regs.cmode0, gp::g_bp_regs.cmode1, true); + //if (common::g_config->current_renderer_config().enable_wireframe) { + // glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); + //} else { + // glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); + //} +} + +/// Initialize the FBO +void RendererOpenGL::InitFramebuffer() { + // TODO(en): This should probably be implemented with the top screen and bottom screen as + // separate framebuffers + + // Init the FBOs + // ------------- + + glGenFramebuffers(kMaxFramebuffers, fbo_); // Generate primary framebuffer + glGenRenderbuffers(kMaxFramebuffers, fbo_rbo_); // Generate primary RBOs + glGenRenderbuffers(kMaxFramebuffers, fbo_depth_buffers_); // Generate primary depth buffer + + for (int i = 0; i < kMaxFramebuffers; i++) { + // Generate color buffer storage + glBindRenderbuffer(GL_RENDERBUFFER, fbo_rbo_[i]); + glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, resolution_width_, resolution_height_); + + // Generate depth buffer storage + glBindRenderbuffer(GL_RENDERBUFFER, fbo_depth_buffers_[i]); + glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT32, resolution_width_, + resolution_height_); + + // Attach the buffers + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo_[i]); + glFramebufferRenderbuffer(GL_DRAW_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, + GL_RENDERBUFFER, fbo_depth_buffers_[i]); + glFramebufferRenderbuffer(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, + GL_RENDERBUFFER, fbo_rbo_[i]); + + // Check for completeness + if (GL_FRAMEBUFFER_COMPLETE == glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER)) { + NOTICE_LOG(RENDER, "framebuffer(%d) initialized ok", i); + } else { + ERROR_LOG(RENDER, "couldn't create OpenGL frame buffer"); + exit(1); + } + } + glBindFramebuffer(GL_FRAMEBUFFER, 0); // Unbind our frame buffer(s) +} + +/// Blit the FBO to the OpenGL default framebuffer +void RendererOpenGL::RenderFramebuffer() { + + // Render target is default framebuffer + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); + glViewport(0, 0, resolution_width_, resolution_height_); + + // Render source is our XFB + glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo_[kFramebuffer_VirtualXFB]); + glReadBuffer(GL_COLOR_ATTACHMENT0); + + // Blit + glBlitFramebuffer(0, 0, resolution_width_, resolution_height_, 0, 0, + render_window_->client_area_width(), render_window_->client_area_height(), + GL_COLOR_BUFFER_BIT, GL_LINEAR); + + // Update the FPS count + UpdateFramerate(); + + // Rebind EFB + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo_[kFramebuffer_EFB]); + + current_frame_++; +} + +/// Updates the framerate +void RendererOpenGL::UpdateFramerate() { +} + +/** + * Set the emulator window to use for renderer + * @param window EmuWindow handle to emulator window to use for rendering + */ +void RendererOpenGL::SetWindow(EmuWindow* window) { + render_window_ = window; +} + +/// Initialize the renderer +void RendererOpenGL::Init() { + render_window_->MakeCurrent(); + glShadeModel(GL_SMOOTH); + + + glStencilFunc(GL_ALWAYS, 0, 0); + glBlendFunc(GL_ONE, GL_ONE); + + glViewport(0, 0, resolution_width_, resolution_height_); + + glClearDepth(1.0f); + glEnable(GL_DEPTH_TEST); + glDisable(GL_LIGHTING); + glDepthFunc(GL_LEQUAL); + + glPixelStorei(GL_UNPACK_ALIGNMENT, 4); + + glDisable(GL_STENCIL_TEST); + glEnable(GL_SCISSOR_TEST); + + glScissor(0, 0, resolution_width_, resolution_height_); + glClearDepth(1.0f); + + GLenum err = glewInit(); + if (GLEW_OK != err) { + ERROR_LOG(RENDER, " Failed to initialize GLEW! Error message: \"%s\". Exiting...", + glewGetErrorString(err)); + exit(-1); + } + + // Initialize everything else + // -------------------------- + + InitFramebuffer(); + + NOTICE_LOG(RENDER, "GL_VERSION: %s\n", glGetString(GL_VERSION)); +} + +/// Shutdown the renderer +void RendererOpenGL::ShutDown() { +} diff --git a/src/video_core/src/renderer_opengl/renderer_opengl.h b/src/video_core/src/renderer_opengl/renderer_opengl.h new file mode 100644 index 000000000..0c41977e4 --- /dev/null +++ b/src/video_core/src/renderer_opengl/renderer_opengl.h @@ -0,0 +1,138 @@ +/** + * Copyright (C) 2014 Citra Emulator + * + * @file renderer_opengl.h + * @author bunnei + * @date 2014-04-05 + * @brief Renderer for OpenGL 3.x + * + * @section LICENSE + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details at + * http://www.gnu.org/copyleft/gpl.html + * + * Official project repository can be found at: + * http://code.google.com/p/gekko-gc-emu/ + */ + +#pragma once + +#include + + +#include "common.h" +#include "emu_window.h" + +#include "renderer_base.h" + + +class RendererOpenGL : virtual public RendererBase { +public: + + static const int kMaxFramebuffers = 2; ///< Maximum number of framebuffers + + RendererOpenGL(); + ~RendererOpenGL(); + + /// Swap buffers (render frame) + void SwapBuffers(); + + /** + * Blits the EFB to the external framebuffer (XFB) + * @param src_rect Source rectangle in EFB to copy + * @param dst_rect Destination rectangle in EFB to copy to + * @param dest_height Destination height in pixels + */ + void CopyToXFB(const Rect& src_rect, const Rect& dst_rect); + + /** + * Clear the screen + * @param rect Screen rectangle to clear + * @param enable_color Enable color clearing + * @param enable_alpha Enable alpha clearing + * @param enable_z Enable depth clearing + * @param color Clear color + * @param z Clear depth + */ + void Clear(const Rect& rect, bool enable_color, bool enable_alpha, bool enable_z, + u32 color, u32 z); + + /// Sets the renderer viewport location, width, and height + void SetViewport(int x, int y, int width, int height); + + /// Sets the renderer depthrange, znear and zfar + void SetDepthRange(double znear, double zfar); + + /* Sets the scissor box + * @param rect Renderer rectangle to set scissor box to + */ + void SetScissorBox(const Rect& rect); + + /** + * Sets the line and point size + * @param line_width Line width to use + * @param point_size Point size to use + */ + void SetLinePointSize(f32 line_width, f32 point_size); + + /** + * Set a specific render mode + * @param flag Render flags mode to enable + */ + void SetMode(kRenderMode flags); + + /// Reset the full renderer API to the NULL state + void ResetRenderState(); + + /// Restore the full renderer API state - As the game set it + void RestoreRenderState(); + + /** + * Set the emulator window to use for renderer + * @param window EmuWindow handle to emulator window to use for rendering + */ + void SetWindow(EmuWindow* window); + + /// Initialize the renderer + void Init(); + + /// Shutdown the renderer + void ShutDown(); + + // Framebuffer object(s) + // --------------------- + + GLuint fbo_[kMaxFramebuffers]; ///< Framebuffer objects + +private: + + /// Initialize the FBO + void InitFramebuffer(); + + // Blit the FBO to the OpenGL default framebuffer + void RenderFramebuffer(); + + /// Updates the framerate + void UpdateFramerate(); + + EmuWindow* render_window_; + u32 last_mode_; ///< Last render mode + + int resolution_width_; + int resolution_height_; + + // Framebuffer object(s) + // --------------------- + + GLuint fbo_rbo_[kMaxFramebuffers]; ///< Render buffer objects + GLuint fbo_depth_buffers_[kMaxFramebuffers]; ///< Depth buffers objects + + DISALLOW_COPY_AND_ASSIGN(RendererOpenGL); +}; \ No newline at end of file diff --git a/src/video_core/src/video_core.cpp b/src/video_core/src/video_core.cpp index 8ad45c912..52ff90488 100644 --- a/src/video_core/src/video_core.cpp +++ b/src/video_core/src/video_core.cpp @@ -27,7 +27,10 @@ #include "log.h" #include "core.h" + #include "video_core.h" +#include "renderer_base.h" +#include "renderer_opengl/renderer_opengl.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // Video Core namespace @@ -67,16 +70,10 @@ void Start() { /// Initialize the video core void Init(EmuWindow* emu_window) { g_emu_window = emu_window; - //g_renderer = new RendererGL3(); - //g_renderer->SetWindow(g_emu_window); - //g_renderer->Init(); - - //gp::Fifo_Init(); - //gp::VertexManager_Init(); - //gp::VertexLoader_Init(); - //gp::BP_Init(); - //gp::CP_Init(); - //gp::XF_Init(); + g_emu_window->MakeCurrent(); + g_renderer = new RendererOpenGL(); + g_renderer->SetWindow(g_emu_window); + g_renderer->Init(); g_current_frame = 0; @@ -85,7 +82,7 @@ void Init(EmuWindow* emu_window) { /// Shutdown the video core void Shutdown() { - //delete g_renderer; + delete g_renderer; } } // namespace diff --git a/src/video_core/src/video_core.h b/src/video_core/src/video_core.h index 9b80d7715..10b8f1105 100644 --- a/src/video_core/src/video_core.h +++ b/src/video_core/src/video_core.h @@ -33,8 +33,19 @@ namespace VideoCore { -extern RendererBase* g_renderer; ///< Renderer plugin -extern int g_current_frame; ///< Current frame +// 3DS Video Constants +// ------------------- + +static const int kScreenTopWidth = 400; ///< 3DS top screen width +static const int kScreenTopHeight = 240; ///< 3DS top screen height +static const int kScreenBottomWidth = 320; ///< 3DS bottom screen width +static const int kScreenBottomHeight = 240; ///< 3DS bottom screen height + +// Video core renderer +// --------------------- + +extern RendererBase* g_renderer; ///< Renderer plugin +extern int g_current_frame; ///< Current frame /// Start the video core void Start(); @@ -43,6 +54,6 @@ void Start(); void Init(EmuWindow* emu_window); /// Shutdown the video core -void ShutDown(); +void Shutdown(); } // namespace diff --git a/src/video_core/video_core.vcxproj b/src/video_core/video_core.vcxproj index 4a1429745..5c56e9b71 100644 --- a/src/video_core/video_core.vcxproj +++ b/src/video_core/video_core.vcxproj @@ -19,11 +19,13 @@ + + diff --git a/src/video_core/video_core.vcxproj.filters b/src/video_core/video_core.vcxproj.filters index 2a84b7edf..e796fbe21 100644 --- a/src/video_core/video_core.vcxproj.filters +++ b/src/video_core/video_core.vcxproj.filters @@ -3,13 +3,24 @@ + + renderer_opengl + + + renderer_opengl + + + + {e0245557-dbd4-423e-9399-513d5e99f1e4} + + \ No newline at end of file -- cgit v1.2.3 From 506e6049d3e15410b0bbf3df32477c7d27d55bab Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 6 Apr 2014 22:57:04 -0400 Subject: added external framebuffer GL handles --- src/video_core/src/renderer_opengl/renderer_opengl.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/video_core') diff --git a/src/video_core/src/renderer_opengl/renderer_opengl.h b/src/video_core/src/renderer_opengl/renderer_opengl.h index 0c41977e4..f9fb89d50 100644 --- a/src/video_core/src/renderer_opengl/renderer_opengl.h +++ b/src/video_core/src/renderer_opengl/renderer_opengl.h @@ -128,11 +128,20 @@ private: int resolution_width_; int resolution_height_; - // Framebuffer object(s) - // --------------------- + // Render buffers + // -------------- GLuint fbo_rbo_[kMaxFramebuffers]; ///< Render buffer objects GLuint fbo_depth_buffers_[kMaxFramebuffers]; ///< Depth buffers objects + // External framebuffers + // --------------------- + + GLuint xfb_texture_top_; ///< GL handle to top framebuffer texture + GLuint xfb_texture_bottom_; ///< GL handle to bottom framebuffer texture + + GLuint xfb_top_; + GLuint xfb_bottom_; + DISALLOW_COPY_AND_ASSIGN(RendererOpenGL); }; \ No newline at end of file -- cgit v1.2.3 From 8cf851f68a6611980ccabc646a59763bd30c4eff Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 7 Apr 2014 00:52:34 -0400 Subject: added support for renderering the external framebuffers --- .../src/renderer_opengl/renderer_opengl.cpp | 159 ++++++++++++++++++--- .../src/renderer_opengl/renderer_opengl.h | 8 +- 2 files changed, 147 insertions(+), 20 deletions(-) (limited to 'src/video_core') diff --git a/src/video_core/src/renderer_opengl/renderer_opengl.cpp b/src/video_core/src/renderer_opengl/renderer_opengl.cpp index 133740a74..27917a5a2 100644 --- a/src/video_core/src/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/src/renderer_opengl/renderer_opengl.cpp @@ -22,9 +22,31 @@ * http://code.google.com/p/gekko-gc-emu/ */ +#include "mem_map.h" #include "video_core.h" #include "renderer_opengl/renderer_opengl.h" +/** + * Helper function to flip framebuffer from left-to-right to top-to-bottom + * @param addr Address of framebuffer in RAM + * @param out Pointer to output buffer with flipped framebuffer + * @todo Early on hack... I'd like to find a more efficient way of doing this /bunnei + */ +inline void _flip_framebuffer(u32 addr, u8* out) { + u8* in = Memory::GetPointer(addr); + for (int y = 0; y < VideoCore::kScreenTopHeight; y++) { + for (int x = 0; x < VideoCore::kScreenTopWidth; x++) { + int in_coord = (VideoCore::kScreenTopHeight * 3 * x) + (VideoCore::kScreenTopHeight * 3) + - (3 * y + 3); + int out_coord = (VideoCore::kScreenTopWidth * y * 3) + (x * 3); + + out[out_coord + 0] = in[in_coord + 0]; + out[out_coord + 1] = in[in_coord + 1]; + out[out_coord + 2] = in[in_coord + 2]; + } + } +} + /// RendererOpenGL constructor RendererOpenGL::RendererOpenGL() { memset(fbo_, 0, sizeof(fbo_)); @@ -33,27 +55,28 @@ RendererOpenGL::RendererOpenGL() { resolution_width_ = max(VideoCore::kScreenTopWidth, VideoCore::kScreenBottomWidth); resolution_height_ = VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight; + + xfb_texture_top_ = 0; + xfb_texture_bottom_ = 0; + + xfb_top_ = 0; + xfb_bottom_ = 0; } /// RendererOpenGL destructor RendererOpenGL::~RendererOpenGL() { } - /// Swap buffers (render frame) void RendererOpenGL::SwapBuffers() { - glClearColor(1.0f, 1.0f, 0.0f, 1.0f); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - ResetRenderState(); // EFB->XFB copy // TODO(bunnei): This is a hack and does not belong here. The copy should be triggered by some // register write We're also treating both framebuffers as a single one in OpenGL. - Rect framebuffer_size(0, 0, VideoCore::kScreenTopWidth, - VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight); - CopyToXFB(framebuffer_size, framebuffer_size); + Rect framebuffer_size(0, 0, resolution_width_, resolution_height_); + RenderXFB(framebuffer_size, framebuffer_size); // XFB->Window copy RenderFramebuffer(); @@ -69,20 +92,34 @@ void RendererOpenGL::SwapBuffers() { } /** - * Blits the EFB to the external framebuffer (XFB) - * @param src_rect Source rectangle in EFB to copy - * @param dst_rect Destination rectangle in EFB to copy to - * @param dest_height Destination height in pixels + * Renders external framebuffer (XFB) + * @param src_rect Source rectangle in XFB to copy + * @param dst_rect Destination rectangle in output framebuffer to copy to */ -void RendererOpenGL::CopyToXFB(const Rect& src_rect, const Rect& dst_rect) { +void RendererOpenGL::RenderXFB(const Rect& src_rect, const Rect& dst_rect) { + static u8 xfb_top_flipped[VideoCore::kScreenTopWidth * VideoCore::kScreenTopWidth *3]; + static u8 xfb_bottom_flipped[VideoCore::kScreenTopWidth * VideoCore::kScreenTopWidth *3]; + + _flip_framebuffer(0x20282160, xfb_top_flipped); + _flip_framebuffer(0x202118E0, xfb_bottom_flipped); + ResetRenderState(); + // Blit the top framebuffer + // ------------------------ + + // Update textures with contents of XFB in RAM - top + glBindTexture(GL_TEXTURE_2D, xfb_texture_top_); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight, + GL_RGB, GL_UNSIGNED_BYTE, xfb_top_flipped); + glBindTexture(GL_TEXTURE_2D, 0); + // Render target is destination framebuffer glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo_[kFramebuffer_VirtualXFB]); - glViewport(0, 0, resolution_width_, resolution_height_); + glViewport(0, 0, VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight); // Render source is our EFB - glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo_[kFramebuffer_EFB]); + glBindFramebuffer(GL_READ_FRAMEBUFFER, xfb_top_); glReadBuffer(GL_COLOR_ATTACHMENT0); // Blit @@ -92,9 +129,62 @@ void RendererOpenGL::CopyToXFB(const Rect& src_rect, const Rect& dst_rect) { glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); + // Blit the bottom framebuffer + // --------------------------- + + // Update textures with contents of XFB in RAM - bottom + glBindTexture(GL_TEXTURE_2D, xfb_texture_bottom_); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight, + GL_RGB, GL_UNSIGNED_BYTE, xfb_bottom_flipped); + glBindTexture(GL_TEXTURE_2D, 0); + + // Render target is destination framebuffer + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo_[kFramebuffer_VirtualXFB]); + glViewport(0, 0, + VideoCore::kScreenBottomWidth, VideoCore::kScreenBottomHeight); + + // Render source is our EFB + glBindFramebuffer(GL_READ_FRAMEBUFFER, xfb_bottom_); + glReadBuffer(GL_COLOR_ATTACHMENT0); + + // Blit + int offset = (VideoCore::kScreenTopWidth - VideoCore::kScreenBottomWidth) / 2; + glBlitFramebuffer(0,0, VideoCore::kScreenBottomWidth, VideoCore::kScreenBottomHeight, + offset, VideoCore::kScreenBottomHeight, VideoCore::kScreenBottomWidth + offset, 0, + GL_COLOR_BUFFER_BIT, GL_LINEAR); + + glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); + RestoreRenderState(); } +/** + * Blits the EFB to the external framebuffer (XFB) + * @param src_rect Source rectangle in EFB to copy + * @param dst_rect Destination rectangle in EFB to copy to + */ +void RendererOpenGL::CopyToXFB(const Rect& src_rect, const Rect& dst_rect) { + ERROR_LOG(RENDER, "CopyToXFB not implemented! No EFB support yet!"); + //ResetRenderState(); + + //// Render target is destination framebuffer + //glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo_[kFramebuffer_VirtualXFB]); + //glViewport(0, 0, VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight); + + //// Render source is our EFB + //glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo_[kFramebuffer_EFB]); + //glReadBuffer(GL_COLOR_ATTACHMENT0); + + //// Blit + //glBlitFramebuffer(src_rect.x0_, src_rect.y0_, src_rect.x1_, src_rect.y1_, + // dst_rect.x0_, dst_rect.y1_, dst_rect.x1_, dst_rect.y0_, + // GL_COLOR_BUFFER_BIT, GL_LINEAR); + + //glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); + + //RestoreRenderState(); +} + /** * Clear the screen * @param rect Screen rectangle to clear @@ -234,12 +324,13 @@ void RendererOpenGL::InitFramebuffer() { for (int i = 0; i < kMaxFramebuffers; i++) { // Generate color buffer storage glBindRenderbuffer(GL_RENDERBUFFER, fbo_rbo_[i]); - glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, resolution_width_, resolution_height_); + glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, VideoCore::kScreenTopWidth, + VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight); // Generate depth buffer storage glBindRenderbuffer(GL_RENDERBUFFER, fbo_depth_buffers_[i]); - glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT32, resolution_width_, - resolution_height_); + glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT32, VideoCore::kScreenTopWidth, + VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight); // Attach the buffers glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo_[i]); @@ -257,6 +348,37 @@ void RendererOpenGL::InitFramebuffer() { } } glBindFramebuffer(GL_FRAMEBUFFER, 0); // Unbind our frame buffer(s) + + // Initialize framebuffer textures + // ------------------------------- + + // Create XFB textures + glGenTextures(1, &xfb_texture_top_); + glGenTextures(1, &xfb_texture_bottom_); + + // Alocate video memorry for XFB textures + glBindTexture(GL_TEXTURE_2D, xfb_texture_top_); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight, + 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + glBindTexture(GL_TEXTURE_2D, 0); + + glBindTexture(GL_TEXTURE_2D, xfb_texture_bottom_); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight, + 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + glBindTexture(GL_TEXTURE_2D, 0); + + // Create the FBO and attach color/depth textures + glGenFramebuffers(1, &xfb_top_); // Generate framebuffer + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, xfb_top_); + glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, + xfb_texture_top_, 0); + glBindFramebuffer(GL_FRAMEBUFFER, 0); + + glGenFramebuffers(1, &xfb_bottom_); // Generate framebuffer + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, xfb_bottom_); + glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, + xfb_texture_bottom_, 0); + glBindFramebuffer(GL_FRAMEBUFFER, 0); } /// Blit the FBO to the OpenGL default framebuffer @@ -272,8 +394,7 @@ void RendererOpenGL::RenderFramebuffer() { // Blit glBlitFramebuffer(0, 0, resolution_width_, resolution_height_, 0, 0, - render_window_->client_area_width(), render_window_->client_area_height(), - GL_COLOR_BUFFER_BIT, GL_LINEAR); + resolution_width_, resolution_height_, GL_COLOR_BUFFER_BIT, GL_LINEAR); // Update the FPS count UpdateFramerate(); diff --git a/src/video_core/src/renderer_opengl/renderer_opengl.h b/src/video_core/src/renderer_opengl/renderer_opengl.h index f9fb89d50..b84afc5d2 100644 --- a/src/video_core/src/renderer_opengl/renderer_opengl.h +++ b/src/video_core/src/renderer_opengl/renderer_opengl.h @@ -44,11 +44,17 @@ public: /// Swap buffers (render frame) void SwapBuffers(); + /** + * Renders external framebuffer (XFB) + * @param src_rect Source rectangle in XFB to copy + * @param dst_rect Destination rectangle in output framebuffer to copy to + */ + void RenderXFB(const Rect& src_rect, const Rect& dst_rect); + /** * Blits the EFB to the external framebuffer (XFB) * @param src_rect Source rectangle in EFB to copy * @param dst_rect Destination rectangle in EFB to copy to - * @param dest_height Destination height in pixels */ void CopyToXFB(const Rect& src_rect, const Rect& dst_rect); -- cgit v1.2.3