ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[glide64] sync changes to inc files 

from:
3b8d826964
4d8c50a0db
This commit is contained in:
zilmar 2015-10-10 22:15:57 +11:00
parent d0f45f17ab
commit f2d1097014
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Glide64/GlideExtensions.h
View File

@ -52,7 +52,7 @@ FX_ENTRY void FX_CALL grGetGammaTableExt(FxU32, FxU32*, FxU32*, FxU32*);
FX_ENTRY GrContext_t FX_CALL FX_ENTRY GrContext_t FX_CALL
grSstWinOpenExt( grSstWinOpenExt(
FxU32 hWnd, HWND hWnd,
GrScreenResolution_t screen_resolution, GrScreenResolution_t screen_resolution,
GrScreenRefresh_t refresh_rate, GrScreenRefresh_t refresh_rate,
GrColorFormat_t color_format, GrColorFormat_t color_format,

2
Source/Glide64/Main.cpp
View File

@ -905,7 +905,7 @@ int InitGfx ()
1); // 1 auxillary buffer 1); // 1 auxillary buffer
}*/ }*/
if (!gfx_context) if (!gfx_context)
gfx_context = grSstWinOpen (wxPtrToUInt(gfx.hWnd), gfx_context = grSstWinOpen (gfx.hWnd,
res_data, res_data,
GR_REFRESH_60Hz, GR_REFRESH_60Hz,
GR_COLORFORMAT_RGBA, GR_COLORFORMAT_RGBA,

6
Source/Glitch64/OGLglitchmain.cpp
View File

@ -762,7 +762,7 @@ int isWglExtensionSupported(const char *extension)
FX_ENTRY GrContext_t FX_CALL FX_ENTRY GrContext_t FX_CALL
grSstWinOpenExt( grSstWinOpenExt(
FxU32 hWnd, HWND hWnd,
GrScreenResolution_t screen_resolution, GrScreenResolution_t screen_resolution,
GrScreenRefresh_t refresh_rate, GrScreenRefresh_t refresh_rate,
GrColorFormat_t color_format, GrColorFormat_t color_format,
@ -787,7 +787,7 @@ grSstWinOpenExt(
FX_ENTRY GrContext_t FX_CALL FX_ENTRY GrContext_t FX_CALL
grSstWinOpen( grSstWinOpen(
FxU32 hWnd, HWND hWnd,
GrScreenResolution_t screen_resolution, GrScreenResolution_t screen_resolution,
GrScreenRefresh_t refresh_rate, GrScreenRefresh_t refresh_rate,
GrColorFormat_t color_format, GrColorFormat_t color_format,
@ -824,7 +824,7 @@ grSstWinOpen(
LOG("grSstWinOpen(%08lx, %d, %d, %d, %d, %d %d)\r\n", hWnd, screen_resolution&~0x80000000, refresh_rate, color_format, origin_location, nColBuffers, nAuxBuffers); LOG("grSstWinOpen(%08lx, %d, %d, %d, %d, %d %d)\r\n", hWnd, screen_resolution&~0x80000000, refresh_rate, color_format, origin_location, nColBuffers, nAuxBuffers);
#ifdef _WIN32 #ifdef _WIN32
if ((HWND)hWnd == NULL) hWnd = (FxU32)GetActiveWindow(); if ((HWND)hWnd == NULL) hWnd = GetActiveWindow();
hwnd_win = (HWND)hWnd; hwnd_win = (HWND)hWnd;
#endif // _WIN32 #endif // _WIN32
width = height = 0; width = height = 0;

10
Source/Glitch64/inc/glide.h
View File

@ -42,6 +42,10 @@
#include <3dfx.h> #include <3dfx.h>
#include <glidesys.h> #include <glidesys.h>
#include <sst1vid.h> #include <sst1vid.h>
#ifdef _WIN32
#include <windows.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -60,6 +64,10 @@ typedef FxU8 GrFog_t;
typedef FxU32 GrContext_t; typedef FxU32 GrContext_t;
typedef int (FX_CALL *GrProc)(); typedef int (FX_CALL *GrProc)();
#ifndef _WIN32
typedef int HWND;
#endif
/* /*
** ----------------------------------------------------------------------- ** -----------------------------------------------------------------------
** CONSTANTS AND TYPES ** CONSTANTS AND TYPES
@ -617,7 +625,7 @@ grFlush(void);
FX_ENTRY GrContext_t FX_CALL FX_ENTRY GrContext_t FX_CALL
grSstWinOpen( grSstWinOpen(
FxU32 hWnd, HWND hWnd,
GrScreenResolution_t screen_resolution, GrScreenResolution_t screen_resolution,
GrScreenRefresh_t refresh_rate, GrScreenRefresh_t refresh_rate,
GrColorFormat_t color_format, GrColorFormat_t color_format,

3
Source/Glitch64/inc/glidesys.h
View File

@ -110,7 +110,8 @@ n** -----------------------------------------------------------------------
/* Check for OS */ /* Check for OS */
#if defined(__IRIX__) || defined(__sparc__) || defined(__linux__) || \ #if defined(__IRIX__) || defined(__sparc__) || defined(__linux__) || \
defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
defined(__FreeBSD_kernel__) || defined(__GNU__)
# define GLIDE_OS GLIDE_OS_UNIX # define GLIDE_OS GLIDE_OS_UNIX
#elif defined(__DOS__) #elif defined(__DOS__)
# define GLIDE_OS GLIDE_OS_DOS32 # define GLIDE_OS GLIDE_OS_DOS32