D3D12Renderer: fixed some compilation errors

Removed GSFrameBase2 and D3DGSFrame.
Added frame for NullRender.
Minor improvements and fixes
This commit is contained in:
DH 2015-10-05 03:42:48 +03:00
parent 1c890f85c5
commit 4fdeeace66
30 changed files with 609 additions and 677 deletions

View file

@ -1,30 +1,18 @@
#pragma once
#include "Emu/RSX/GL/GLGSRender.h"
#include "Gui/GSFrame.h"
#include "wx/glcanvas.h"
struct GLGSFrame : public GSFrame, public GSFrameBase
class GLGSFrame : public GSFrame
{
wxGLCanvas* canvas;
u32 m_frames;
wxGLCanvas* m_canvas;
public:
GLGSFrame();
void close() override;
bool shown() override;
void hide() override;
void show() override;
void* make_context() override;
void set_current(draw_context_t context) override;
void delete_context(void* context) override;
void flip(draw_context_t context) override;
size2i client_size() override;
wxGLCanvas* GetCanvas() const { return canvas; }
virtual void SetViewport(int x, int y, u32 w, u32 h) override;
private:
virtual void OnSize(wxSizeEvent& event);