diff -ur -X excl mythtv-vid-15/libs/libmythtv/openglcontext.cpp mythtv-vid-16/libs/libmythtv/openglcontext.cpp
old
|
new
|
|
729 | 729 | |
730 | 730 | void OpenGLContext::Init2DState(void) |
731 | 731 | { |
| 732 | glPixelStorei(GL_UNPACK_ALIGNMENT, 1); |
732 | 733 | glDisable(GL_BLEND); |
733 | 734 | glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // for gl osd |
734 | 735 | glDisable(GL_DEPTH_TEST); |
diff -ur -X excl mythtv-vid-15/libs/libmythtv/videoout_xv.cpp mythtv-vid-16/libs/libmythtv/videoout_xv.cpp
old
|
new
|
|
221 | 221 | needrepaint = true; |
222 | 222 | } |
223 | 223 | |
224 | | if (gl_videochain) |
| 224 | if (gl_videochain && gl_context) |
225 | 225 | { |
226 | 226 | OpenGLContextLocker ctx_lock(gl_context); |
227 | 227 | gl_videochain->SetVideoRect(display_video_rect, video_rect); |
… |
… |
|
1460 | 1460 | return xvmc_tex; |
1461 | 1461 | } |
1462 | 1462 | |
1463 | | if (osd_renderer == "opengl2") |
| 1463 | if (osd_renderer == "opengl2" && gl_context) |
1464 | 1464 | { |
1465 | 1465 | OpenGLContextLocker ctx_lock(gl_context); |
1466 | 1466 | gl_use_osd_opengl2 = true; |
… |
… |
|
1827 | 1827 | { |
1828 | 1828 | (void) enable; |
1829 | 1829 | |
1830 | | if (!gl_videochain) |
| 1830 | if (!gl_videochain || !gl_context) |
1831 | 1831 | return false; |
1832 | 1832 | |
1833 | 1833 | if (enable && m_deinterlacing && (OpenGL != VideoOutputSubType())) |
… |
… |
|
1868 | 1868 | (void) interlaced; |
1869 | 1869 | (void) overridefilter; |
1870 | 1870 | |
| 1871 | if (!gl_videochain || !gl_context) |
| 1872 | return false; |
| 1873 | |
1871 | 1874 | OpenGLContextLocker ctx_lock(gl_context); |
1872 | 1875 | |
1873 | 1876 | m_deintfiltername = db_vdisp_profile->GetFilteredDeint(overridefilter); |
… |
… |
|
2766 | 2769 | { |
2767 | 2770 | (void) t; |
2768 | 2771 | |
| 2772 | if (!gl_videochain || !gl_context) |
| 2773 | return; |
| 2774 | |
2769 | 2775 | OpenGLContextLocker ctx_lock(gl_context); |
2770 | 2776 | |
2771 | 2777 | if (!buffer) |
… |
… |
|
3153 | 3159 | ShowXvMC(scan); |
3154 | 3160 | else if (VideoOutputSubType() == XVideo) |
3155 | 3161 | ShowXVideo(scan); |
3156 | | else if (VideoOutputSubType() == OpenGL) |
| 3162 | else if (VideoOutputSubType() == OpenGL && gl_context) |
3157 | 3163 | gl_context->SwapBuffers(); |
3158 | 3164 | |
3159 | 3165 | X11S(XSync(XJ_disp, False)); |
… |
… |
|
3760 | 3766 | (void) filterList; |
3761 | 3767 | (void) pipPlayer; |
3762 | 3768 | |
| 3769 | if (!gl_videochain || !gl_context) |
| 3770 | return; |
| 3771 | |
3763 | 3772 | OpenGLContextLocker ctx_lock(gl_context); |
3764 | 3773 | |
3765 | 3774 | bool pauseframe = false; |
… |
… |
|
3869 | 3878 | if (!supported_attributes) |
3870 | 3879 | return -1; |
3871 | 3880 | |
3872 | | if (VideoOutputSubType() == OpenGL) |
| 3881 | if (VideoOutputSubType() == OpenGL && gl_context) |
3873 | 3882 | { |
3874 | 3883 | newValue = min(max(newValue, 0), 100); |
3875 | 3884 | newValue = gl_context->SetPictureAttribute(attribute, newValue); |
… |
… |
|
3931 | 3940 | { |
3932 | 3941 | supported_attributes = kPictureAttributeSupported_None; |
3933 | 3942 | |
3934 | | if (VideoOutputSubType() == OpenGL) |
| 3943 | if (VideoOutputSubType() == OpenGL && gl_context) |
3935 | 3944 | { |
3936 | 3945 | supported_attributes = gl_context->GetSupportedPictureAttributes(); |
3937 | 3946 | } |