diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 21:19:53 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 21:19:53 +0300 |
| commit | eee666c3b57870b7610acc846858814ce8498385 (patch) | |
| tree | 9e7f4493f176783f02da0a40e8df11175fdcbf16 /libvo | |
| parent | 17dce6e0c8e76c49f2e7567149a0febccb88c4f5 (diff) | |
| parent | bcdf7c0b3dc61a09e0cd83d553bd21dc0f266d04 (diff) | |
| download | mpv-eee666c3b57870b7610acc846858814ce8498385.tar.bz2 mpv-eee666c3b57870b7610acc846858814ce8498385.tar.xz | |
Merge svn changes up to r31133
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/gl_common.h | 4 | ||||
| -rw-r--r-- | libvo/vo_gl.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 534bc908c1..65741c899b 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -30,20 +30,16 @@ #ifdef CONFIG_GL_WIN32 #include <windows.h> -#include <GL/gl.h> #include "w32_common.h" #endif #ifdef CONFIG_GL_X11 -#include <GL/gl.h> #include <X11/Xlib.h> #include <GL/glx.h> #include "x11_common.h" // This old-vo wrapper macro would conflict with the struct member #undef update_xinerama_info #endif -#ifdef CONFIG_GL_SDL #include <GL/gl.h> -#endif // workaround for some gl.h headers #ifndef GLAPIENTRY diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 00c0d62167..cf796a9661 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -280,7 +280,7 @@ static void update_yuvconv(void) { texture_width, texture_height); } if (custom_tex) { - FILE *f = fopen(custom_tex, "r"); + FILE *f = fopen(custom_tex, "rb"); if (!f) mp_msg(MSGT_VO, MSGL_WARN, "[gl] Could not read customtex %s\n", custom_tex); @@ -493,9 +493,10 @@ static void autodetectGlExtensions(void) { const char *extensions = mpglGetString(GL_EXTENSIONS); const char *vendor = mpglGetString(GL_VENDOR); const char *version = mpglGetString(GL_VERSION); + const char *renderer = mpglGetString(GL_RENDERER); int is_ati = vendor && strstr(vendor, "ATI") != NULL; int ati_broken_pbo = 0; - mp_msg(MSGT_VO, MSGL_V, "[gl] Running on OpenGL by '%s', versions '%s'\n", vendor, version); + mp_msg(MSGT_VO, MSGL_V, "[gl] Running on OpenGL '%s' by '%s', version '%s'\n", renderer, vendor, version); if (is_ati && strncmp(version, "2.1.", 4) == 0) { int ver = atoi(version + 4); mp_msg(MSGT_VO, MSGL_V, "[gl] Detected ATI driver version: %i\n", ver); |