CCF_100/citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4738 from FearlessTobi/port-1020-new

Browse Source 
Port yuzu-emu/yuzu#1020: "core: Namespace EmuWindow"
This commit is contained in:
James Rowe
2019-04-26 08:58:09 -06:00
committed by GitHub
parent b9e51f0a0b 6e22891761
commit 3f2c7eb471
14 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@@ -43,7 +43,7 @@ static bool IsVendorAmd() {
return gpu_vendor == "ATI Technologies Inc." || gpu_vendor == "Advanced Micro Devices, Inc.";
}
RasterizerOpenGL::RasterizerOpenGL(EmuWindow& window)
RasterizerOpenGL::RasterizerOpenGL(Frontend::EmuWindow& window)
: is_amd(IsVendorAmd()), shader_dirty(true),
vertex_buffer(GL_ARRAY_BUFFER, VERTEX_BUFFER_SIZE, is_amd),
uniform_buffer(GL_UNIFORM_BUFFER, UNIFORM_BUFFER_SIZE, false),

7
src/video_core/renderer_opengl/gl_rasterizer.h
View File

@@ -29,14 +29,17 @@
#include "video_core/renderer_opengl/pica_to_gl.h"
#include "video_core/shader/shader.h"
namespace Frontend {
class EmuWindow;
}
class ShaderProgramManager;
namespace OpenGL {
class RasterizerOpenGL : public VideoCore::RasterizerInterface {
public:
explicit RasterizerOpenGL(EmuWindow& renderer);
explicit RasterizerOpenGL(Frontend::EmuWindow& renderer);
~RasterizerOpenGL() override;
void AddTriangle(const Pica::Shader::OutputVertex& v0, const Pica::Shader::OutputVertex& v1,
@@ -261,7 +264,7 @@ private:
RasterizerCacheOpenGL res_cache;
EmuWindow& emu_window;
Frontend::EmuWindow& emu_window;
std::vector<HardwareVertex> vertex_batch;

2
src/video_core/renderer_opengl/renderer_opengl.cpp
View File

@@ -93,7 +93,7 @@ static std::array<GLfloat, 3 * 2> MakeOrthographicMatrix(const float width, cons
return matrix;
}
RendererOpenGL::RendererOpenGL(EmuWindow& window) : RendererBase{window} {}
RendererOpenGL::RendererOpenGL(Frontend::EmuWindow& window) : RendererBase{window} {}
RendererOpenGL::~RendererOpenGL() = default;
/// Swap buffers (render frame)

2
src/video_core/renderer_opengl/renderer_opengl.h
View File

@@ -38,7 +38,7 @@ struct ScreenInfo {
class RendererOpenGL : public RendererBase {
public:
explicit RendererOpenGL(EmuWindow& window);
explicit RendererOpenGL(Frontend::EmuWindow& window);
~RendererOpenGL() override;
/// Swap buffers (render frame)