RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

Change OpenGL support to work on unmodified MinGW64

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27879 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-11-02 16:37:45 +00:00
parent 7a3fc5ad5a
commit c9f2a3636c
2 changed files with 31 additions and 4 deletions

4
configure vendored
View File

@ -4179,11 +4179,11 @@ echocheck "OpenGL"
#Note: this test is run even with --enable-gl since we autodetect linker flags #Note: this test is run even with --enable-gl since we autodetect linker flags
if (test "$_x11" = yes || win32) && test "$_gl" != no ; then if (test "$_x11" = yes || win32) && test "$_gl" != no ; then
cat > $TMPC << EOF cat > $TMPC << EOF
#include <GL/gl.h>
#ifdef GL_WIN32 #ifdef GL_WIN32
#include <windows.h> #include <windows.h>
#include <GL/glext.h> #include <GL/gl.h>
#else #else
#include <GL/gl.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <GL/glx.h> #include <GL/glx.h>
#endif #endif

31
libvo/gl_common.h
View File

@ -7,14 +7,14 @@
#include "config.h" #include "config.h"
#include "mp_msg.h" #include "mp_msg.h"
#include <GL/gl.h>
#include "video_out.h" #include "video_out.h"
#ifdef GL_WIN32 #ifdef GL_WIN32
#include <windows.h> #include <windows.h>
#include <GL/glext.h> #include <GL/gl.h>
#include "w32_common.h" #include "w32_common.h"
#else #else
#include <GL/gl.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <GL/glx.h> #include <GL/glx.h>
#include "x11_common.h" #include "x11_common.h"
@ -39,6 +39,15 @@
* (e.g. _NV), _ARB is not used to ease readability. * (e.g. _NV), _ARB is not used to ease readability.
* \{ * \{
*/ */
#ifndef GL_TEXTURE_3D
#define GL_TEXTURE_3D 0x806F
#endif
#ifndef GL_TEXTURE_WRAP_R
#define GL_TEXTURE_WRAP_R 0x8072
#endif
#ifndef GL_CLAMP_TO_EDGE
#define GL_CLAMP_TO_EDGE 0x812F
#endif
#ifndef GL_REGISTER_COMBINERS_NV #ifndef GL_REGISTER_COMBINERS_NV
#define GL_REGISTER_COMBINERS_NV 0x8522 #define GL_REGISTER_COMBINERS_NV 0x8522
#endif #endif
@ -171,12 +180,30 @@
#ifndef GL_UNSIGNED_BYTE_2_3_3_REV #ifndef GL_UNSIGNED_BYTE_2_3_3_REV
#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 #define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
#endif #endif
#ifndef GL_UNSIGNED_SHORT_4_4_4_4
#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
#endif
#ifndef GL_UNSIGNED_SHORT_4_4_4_4_REV
#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
#endif
#ifndef GL_UNSIGNED_SHORT_5_6_5 #ifndef GL_UNSIGNED_SHORT_5_6_5
#define GL_UNSIGNED_SHORT_5_6_5 0x8363 #define GL_UNSIGNED_SHORT_5_6_5 0x8363
#endif #endif
#ifndef GL_UNSIGNED_INT_8_8_8_8
#define GL_UNSIGNED_INT_8_8_8_8 0x8035
#endif
#ifndef GL_UNSIGNED_INT_8_8_8_8_REV
#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
#endif
#ifndef GL_UNSIGNED_SHORT_5_6_5_REV #ifndef GL_UNSIGNED_SHORT_5_6_5_REV
#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 #define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
#endif #endif
#ifndef GL_UNSIGNED_INT_10_10_10_2
#define GL_UNSIGNED_INT_10_10_10_2 0x8036
#endif
#ifndef GL_UNSIGNED_INT_2_10_10_10_REV
#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
#endif
#ifndef GL_UNSIGNED_SHORT_5_5_5_1 #ifndef GL_UNSIGNED_SHORT_5_5_5_1
#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 #define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
#endif #endif