mirror of
https://github.com/mupen64plus/mupen64plus-video-arachnoid.git
synced 2024-06-02 19:27:49 -04:00
Update video extension API version to 3.0.0 and video plugin API version to 2.2.0
This commit is contained in:
parent
0bfae1fad5
commit
876f992074
|
@ -101,7 +101,7 @@ bool GraphicsPlugin::initialize(GFX_INFO* graphicsInfo)
|
|||
}
|
||||
|
||||
if (CoreVideo_SetVideoMode(m_config->fullscreenWidth, m_config->fullscreenHeight, m_config->fullscreenBitDepth,
|
||||
m_config->startFullscreen ? M64VIDEO_FULLSCREEN : M64VIDEO_WINDOWED) != M64ERR_SUCCESS)
|
||||
m_config->startFullscreen ? M64VIDEO_FULLSCREEN : M64VIDEO_WINDOWED, (m64p_video_flags) 0) != M64ERR_SUCCESS)
|
||||
{
|
||||
Logger::getSingleton().printMsg("Could not set video mode.", M64MSG_ERROR);
|
||||
return false;
|
||||
|
|
|
@ -63,6 +63,7 @@ extern ptr_VidExt_ListFullscreenModes CoreVideo_ListFullscreenModes;
|
|||
extern ptr_VidExt_SetVideoMode CoreVideo_SetVideoMode;
|
||||
extern ptr_VidExt_SetCaption CoreVideo_SetCaption;
|
||||
extern ptr_VidExt_ToggleFullScreen CoreVideo_ToggleFullScreen;
|
||||
extern ptr_VidExt_ResizeWindow CoreVideo_ResizeWindow;
|
||||
extern ptr_VidExt_GL_GetProcAddress CoreVideo_GL_GetProcAddress;
|
||||
extern ptr_VidExt_GL_SetAttribute CoreVideo_GL_SetAttribute;
|
||||
extern ptr_VidExt_GL_SwapBuffers CoreVideo_GL_SwapBuffers;
|
||||
|
|
18
src/main.cpp
18
src/main.cpp
|
@ -39,9 +39,9 @@
|
|||
//Definitions
|
||||
#define PLUGIN_NAME "Arachnoid Video Plugin"
|
||||
#define PLUGIN_VERSION 0x016305
|
||||
#define VIDEO_PLUGIN_API_VERSION 0x020100
|
||||
#define VIDEO_PLUGIN_API_VERSION 0x020200
|
||||
#define CONFIG_API_VERSION 0x020000
|
||||
#define VIDEXT_API_VERSION 0x020000
|
||||
#define VIDEXT_API_VERSION 0x030000
|
||||
|
||||
#define VERSION_PRINTF_SPLIT(x) (((x) >> 16) & 0xffff), (((x) >> 8) & 0xff), ((x) & 0xff)
|
||||
|
||||
|
@ -86,6 +86,7 @@ ptr_VidExt_ListFullscreenModes CoreVideo_ListFullscreenModes = NULL;
|
|||
ptr_VidExt_SetVideoMode CoreVideo_SetVideoMode = NULL;
|
||||
ptr_VidExt_SetCaption CoreVideo_SetCaption = NULL;
|
||||
ptr_VidExt_ToggleFullScreen CoreVideo_ToggleFullScreen = NULL;
|
||||
ptr_VidExt_ResizeWindow CoreVideo_ResizeWindow = NULL;
|
||||
ptr_VidExt_GL_GetProcAddress CoreVideo_GL_GetProcAddress = NULL;
|
||||
ptr_VidExt_GL_SetAttribute CoreVideo_GL_SetAttribute = NULL;
|
||||
ptr_VidExt_GL_SwapBuffers CoreVideo_GL_SwapBuffers = NULL;
|
||||
|
@ -163,13 +164,14 @@ EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle CoreLibHandle, void *Con
|
|||
CoreVideo_SetVideoMode = (ptr_VidExt_SetVideoMode) osal_dynlib_getproc(CoreLibHandle, "VidExt_SetVideoMode");
|
||||
CoreVideo_SetCaption = (ptr_VidExt_SetCaption) osal_dynlib_getproc(CoreLibHandle, "VidExt_SetCaption");
|
||||
CoreVideo_ToggleFullScreen = (ptr_VidExt_ToggleFullScreen) osal_dynlib_getproc(CoreLibHandle, "VidExt_ToggleFullScreen");
|
||||
CoreVideo_ResizeWindow = (ptr_VidExt_ResizeWindow) osal_dynlib_getproc(CoreLibHandle, "VidExt_ResizeWindow");
|
||||
CoreVideo_GL_GetProcAddress = (ptr_VidExt_GL_GetProcAddress) osal_dynlib_getproc(CoreLibHandle, "VidExt_GL_GetProcAddress");
|
||||
CoreVideo_GL_SetAttribute = (ptr_VidExt_GL_SetAttribute) osal_dynlib_getproc(CoreLibHandle, "VidExt_GL_SetAttribute");
|
||||
CoreVideo_GL_SwapBuffers = (ptr_VidExt_GL_SwapBuffers) osal_dynlib_getproc(CoreLibHandle, "VidExt_GL_SwapBuffers");
|
||||
|
||||
if (!CoreVideo_Init || !CoreVideo_Quit || !CoreVideo_ListFullscreenModes || !CoreVideo_SetVideoMode ||
|
||||
!CoreVideo_SetCaption || !CoreVideo_ToggleFullScreen || !CoreVideo_GL_GetProcAddress ||
|
||||
!CoreVideo_GL_SetAttribute || !CoreVideo_GL_SwapBuffers)
|
||||
!CoreVideo_GL_SetAttribute || !CoreVideo_GL_SwapBuffers || !CoreVideo_ResizeWindow)
|
||||
{
|
||||
Logger::getSingleton().printMsg("Couldn't connect to Core video functions", M64MSG_ERROR);
|
||||
return M64ERR_INCOMPATIBLE;
|
||||
|
@ -257,6 +259,16 @@ EXPORT int CALL RomOpen()
|
|||
return g_graphicsPlugin.initialize(&g_graphicsInfo);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
//* Resize Video Output
|
||||
//! This function is called to force us to resize our output OpenGL window.
|
||||
//! This is currently unsupported, and should never be called because we do
|
||||
//! not pass the RESIZABLE flag to VidExt_SetVideoMode when initializing.
|
||||
//-----------------------------------------------------------------------------
|
||||
EXPORT void CALL ResizeVideoOutput(int Width, int Height)
|
||||
{
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
//* Rom Closed
|
||||
//! This function is called when a rom is closed.
|
||||
|
|
|
@ -15,6 +15,7 @@ ViStatusChanged;
|
|||
ViWidthChanged;
|
||||
ReadScreen2;
|
||||
SetRenderingCallback;
|
||||
ResizeVideoOutput;
|
||||
FBRead;
|
||||
FBWrite;
|
||||
FBGetFrameBufferInfo;
|
||||
|
|
Loading…
Reference in a new issue