diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-11 16:57:42 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-11 16:57:42 +0000 |
| commit | 84fd90d3e4e24dd9aa5157e7201eba85143c93e6 (patch) | |
| tree | 38b08e0f1d4bd9db62e722195be29248d3694eda /libvo/gl_common.h | |
| parent | 3c88c6d150d804935518d9469bbd2467f3a378c4 (diff) | |
| download | mpv-84fd90d3e4e24dd9aa5157e7201eba85143c93e6.tar.bz2 mpv-84fd90d3e4e24dd9aa5157e7201eba85143c93e6.tar.xz | |
Improving gl2 under windows, moving some functionality to gl_common
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14143 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/gl_common.h')
| -rw-r--r-- | libvo/gl_common.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 2a02643483..da7da0eae7 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -7,7 +7,11 @@ #include <GL/gl.h> #include "video_out.h" -#ifndef GL_WIN32 +#ifdef GL_WIN32 +#include <windows.h> +#include <GL/glext.h> +#include "w32_common.h" +#else #include <X11/Xlib.h> #include <GL/glx.h> #include "x11_common.h" @@ -27,7 +31,10 @@ int glFindFormat(uint32_t format, uint32_t *bpp, GLenum *gl_texfmt, //! new window is set, but the OpenGL context needs to be reinitialized. #define SET_WINDOW_REINIT 1 -#ifndef GL_WIN32 +#ifdef GL_WIN32 +int setGlWindow(int *vinfo, HGLRC *context, HWND win); +void releaseGlContext(int *vinfo, HGLRC *context); +#else int setGlWindow(XVisualInfo **vinfo, GLXContext *context, Window win); void releaseGlContext(XVisualInfo **vinfo, GLXContext *context); #endif |