Commit 8edf3ea9 authored by Laurent Aimar's avatar Laurent Aimar

Converted glwin32 to vout display.

parent 1930ef7e
...@@ -16,10 +16,10 @@ SOURCES_direct3d = \ ...@@ -16,10 +16,10 @@ SOURCES_direct3d = \
SOURCES_glwin32 = \ SOURCES_glwin32 = \
glwin32.c \ glwin32.c \
vout.h \ common.h \
events_vo.h \ events.h \
events_vo.c \ events.c \
common_vo.c \ common.c \
$(NULL) $(NULL)
SOURCES_wingdi = \ SOURCES_wingdi = \
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <d3d9.h> #include <d3d9.h>
#endif #endif
#ifdef MODULE_NAME_IS_glwin32 #ifdef MODULE_NAME_IS_glwin32
#include <GL/gl.h> #include "../opengl.h"
#endif #endif
#include "common.h" #include "common.h"
......
...@@ -148,8 +148,11 @@ struct vout_display_sys_t ...@@ -148,8 +148,11 @@ struct vout_display_sys_t
#endif #endif
#ifdef MODULE_NAME_IS_glwin32 #ifdef MODULE_NAME_IS_glwin32
HDC hGLDC; HDC hGLDC;
HGLRC hGLRC; HGLRC hGLRC;
vout_opengl_t gl;
vout_display_opengl_t vgl;
picture_pool_t *pool;
#endif #endif
#ifdef MODULE_NAME_IS_direct3d #ifdef MODULE_NAME_IS_direct3d
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include <d3d9.h> #include <d3d9.h>
#endif #endif
#ifdef MODULE_NAME_IS_glwin32 #ifdef MODULE_NAME_IS_glwin32
#include <GL/gl.h> #include "../opengl.h"
#endif #endif
#include <vlc_keys.h> #include <vlc_keys.h>
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment