mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-25 12:41:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Win32) Start using win32_shader_dlg.c for both D3D and GL

Browse Source
This commit is contained in:
twinaphex 2015-11-18 14:19:35 +01:00
parent 588b4259f7
commit 7e16e417b4
4 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/common/win32_common.cpp
View File

@ -28,13 +28,10 @@
#include <commdlg.h>
#include "../../retroarch.h"
#include "../video_thread_wrapper.h"
#ifdef HAVE_OPENGL
#include "../drivers_wm/win32_shader_dlg.h"
#endif
#ifdef HAVE_D3D
#include "../d3d/d3d.h"
#include "d3d_common.h"
#endif
#ifdef __cplusplus
@ -229,10 +226,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
{
HWND d3dr = g_hwnd;
if (!strcmp(video_driver, "d3d"))
{
d3d_video_t *d3d = (d3d_video_t*)driver->video_data;
d3dr = g_hwnd;
}
LRESULT ret = win32_menu_loop(d3dr, wparam);
(void)ret;
}
@ -261,6 +255,9 @@ bool win32_window_init(WNDCLASSEX *wndclass, bool fullscreen)
if (!RegisterClassEx(wndclass))
return false;
if (!win32_shader_dlg_init())
RARCH_ERR("[WGL]: wgl_shader_dlg_init() failed.\n");
#endif
return true;
}
@ -391,11 +388,9 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
case ID_M_FULL_SCREEN:
cmd = EVENT_CMD_FULLSCREEN_TOGGLE;
break;
#ifdef HAVE_OPENGL
case ID_M_SHADER_PARAMETERS:
shader_dlg_show(owner);
break;
#endif
case ID_M_MOUSE_GRAB:
cmd = EVENT_CMD_GRAB_MOUSE_TOGGLE;
break;

5
gfx/drivers_context/wgl_ctx.cpp
View File

@ -40,8 +40,6 @@
#include "../common/gl_common.h"
#include "../common/win32_common.h"
#include "../drivers_wm/win32_shader_dlg.h"
#ifndef WGL_CONTEXT_MAJOR_VERSION_ARB
#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
#endif
@ -315,9 +313,6 @@ static bool gfx_ctx_wgl_init(void *data)
if (!win32_window_init(&wndclass, true))
return false;
if (!wgl_shader_dlg_init())
RARCH_ERR("[WGL]: wgl_shader_dlg_init() failed.\n");
return true;
}

7
gfx/drivers_wm/win32_shader_dlg.c
View File

@ -351,17 +351,13 @@ static LRESULT CALLBACK ShaderDlgWndProc(HWND hwnd, UINT message,
return DefWindowProc(hwnd, message, wparam, lparam);
}
bool wgl_shader_dlg_init(void)
bool win32_shader_dlg_init(void)
{
static bool inited = false;
const video_driver_t* vid_drv;
int pos_y;
HFONT hFont;
video_driver_get_ptr(&vid_drv);
if(vid_drv != &video_gl)
return false;
if (g_shader_dlg.hwnd)
return true;
@ -373,7 +369,6 @@ bool wgl_shader_dlg_init(void)
comm_ctrl_init.dwSize = sizeof(comm_ctrl_init);
comm_ctrl_init.dwICC = ICC_BAR_CLASSES;
if (!InitCommonControlsEx(&comm_ctrl_init))
return false;

2
gfx/drivers_wm/win32_shader_dlg.h
View File

@ -9,7 +9,7 @@ extern "C" {
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
bool wgl_shader_dlg_init(void);
bool win32_shader_dlg_init(void);
void shader_dlg_show(HWND parent_hwnd);
void shader_dlg_params_reload(void);