MAME SVN History

199869 Revisions

r36211 Tuesday 3rd March, 2015 at 03:00:45 UTC by Peter Ferrie
really fix opengl compile on MSVC (thanks to couriersud) (nw)

[src/osd/modules/opengl]	osd_opengl.h
[src/osd/modules/render]	drawogl.c

trunk/src/osd/modules/opengl/osd_opengl.h
r244722	r244723
17	17	*/
18	18	#ifdef OSD_WINDOWS
19	19	#ifdef _MSC_VER
	20	#include <windows.h>
20	21	#include "SDL1211_opengl.h"
21	22	#else
22	23	#include "GL/gl.h"

trunk/src/osd/modules/render/drawogl.c
r244722	r244723
199	199	{
200	200	m_error[0] = 0;
201	201
202		this->pfn_wglGetProcAddress = (PROC WINAPI (*)(LPCSTR lpszProc)) GetProcAddress(m_module, "wglGetProcAddress");
203		this->pfn_wglCreateContext = (HGLRC WINAPI (*)(HDC hdc)) GetProcAddress(m_module, "wglCreateContext");
204		this->pfn_wglDeleteContext = (BOOL WINAPI (*)(HGLRC hglrc)) GetProcAddress(m_module, "wglDeleteContext");
205		this->pfn_wglMakeCurrent = (BOOL WINAPI (*)(HDC hdc, HGLRC hglrc)) GetProcAddress(m_module, "wglMakeCurrent");
	202	this->pfn_wglGetProcAddress = (PROC (WINAPI *)(LPCSTR lpszProc)) GetProcAddress(m_module, "wglGetProcAddress");
	203	this->pfn_wglCreateContext = (HGLRC (WINAPI *)(HDC hdc)) GetProcAddress(m_module, "wglCreateContext");
	204	this->pfn_wglDeleteContext = (BOOL (WINAPI *)(HGLRC hglrc)) GetProcAddress(m_module, "wglDeleteContext");
	205	this->pfn_wglMakeCurrent = (BOOL (WINAPI *)(HDC hdc, HGLRC hglrc)) GetProcAddress(m_module, "wglMakeCurrent");
206	206
207	207	m_hdc = GetDC(window);
208	208	if (!setupPixelFormat(m_hdc))
r244722	r244723
306	306	HDC m_hdc;
307	307	char m_error[256];
308	308
309		PROC WINAPI (*pfn_wglGetProcAddress)(LPCSTR lpszProc);
310		HGLRC WINAPI (*pfn_wglCreateContext)(HDC hdc);
311		BOOL WINAPI (*pfn_wglDeleteContext)(HGLRC hglrc);
312		BOOL WINAPI (*pfn_wglMakeCurrent)(HDC hdc, HGLRC hglrc);
	309	PROC (WINAPI *pfn_wglGetProcAddress)(LPCSTR lpszProc);
	310	HGLRC (WINAPI *pfn_wglCreateContext)(HDC hdc);
	311	BOOL (WINAPI *pfn_wglDeleteContext)(HGLRC hglrc);
	312	BOOL (WINAPI *pfn_wglMakeCurrent)(HDC hdc, HGLRC hglrc);
313	313
314	314	static HMODULE m_module;
315	315	};

https://github.com/mamedev/mame/commit/e77ccca75d6f8b7551ff3952fe8eeeb4f0fcbdd0

199869 Revisions