mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
WGL: Don't depend on Core/VideoCommon
This commit is contained in:
@ -3,14 +3,10 @@
|
|||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <windows.h>
|
||||||
|
|
||||||
#include "Common/GL/GLInterface/WGL.h"
|
#include "Common/GL/GLInterface/WGL.h"
|
||||||
|
#include "Common/Logging/Log.h"
|
||||||
#include "Core/Host.h"
|
|
||||||
|
|
||||||
#include "VideoCommon/RenderBase.h"
|
|
||||||
#include "VideoCommon/VertexShaderManager.h"
|
|
||||||
#include "VideoCommon/VideoConfig.h"
|
|
||||||
|
|
||||||
static HDC hDC = nullptr; // Private GDI Device Context
|
static HDC hDC = nullptr; // Private GDI Device Context
|
||||||
static HGLRC hRC = nullptr; // Permanent Rendering Context
|
static HGLRC hRC = nullptr; // Permanent Rendering Context
|
||||||
|
@ -2,33 +2,14 @@
|
|||||||
// Licensed under GPLv2+
|
// Licensed under GPLv2+
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include "Common/IniFile.h"
|
|
||||||
#include "Common/StringUtil.h"
|
|
||||||
#include "Common/GL/GLInterfaceBase.h"
|
#include "Common/GL/GLInterfaceBase.h"
|
||||||
#include "Common/GL/GLUtil.h"
|
#include "Common/GL/GLUtil.h"
|
||||||
|
#include "Common/Logging/Log.h"
|
||||||
#include "Core/ConfigManager.h"
|
|
||||||
#include "Core/Core.h"
|
|
||||||
|
|
||||||
#include "VideoBackends/OGL/Render.h"
|
|
||||||
#include "VideoBackends/OGL/VideoBackend.h"
|
|
||||||
|
|
||||||
#include "VideoCommon/VideoConfig.h"
|
|
||||||
|
|
||||||
cInterfaceBase *GLInterface;
|
cInterfaceBase *GLInterface;
|
||||||
static GLuint attributelessVAO = 0;
|
static GLuint attributelessVAO = 0;
|
||||||
static GLuint attributelessVBO = 0;
|
static GLuint attributelessVBO = 0;
|
||||||
|
|
||||||
namespace OGL
|
|
||||||
{
|
|
||||||
|
|
||||||
// Draw messages on top of the screen
|
|
||||||
unsigned int VideoBackend::PeekMessages()
|
|
||||||
{
|
|
||||||
return GLInterface->PeekMessages();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
void InitInterface()
|
void InitInterface()
|
||||||
{
|
{
|
||||||
GLInterface = HostGL_CreateGLInterface();
|
GLInterface = HostGL_CreateGLInterface();
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Common/MathUtil.h"
|
|
||||||
#include "Common/GL/GLExtensions/GLExtensions.h"
|
#include "Common/GL/GLExtensions/GLExtensions.h"
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
|
@ -84,6 +84,12 @@ Make AA apply instantly during gameplay if possible
|
|||||||
namespace OGL
|
namespace OGL
|
||||||
{
|
{
|
||||||
|
|
||||||
|
// Draw messages on top of the screen
|
||||||
|
unsigned int VideoBackend::PeekMessages()
|
||||||
|
{
|
||||||
|
return GLInterface->PeekMessages();
|
||||||
|
}
|
||||||
|
|
||||||
std::string VideoBackend::GetName() const
|
std::string VideoBackend::GetName() const
|
||||||
{
|
{
|
||||||
return "OGL";
|
return "OGL";
|
||||||
|
Reference in New Issue
Block a user