Mercurial > mplayer.hg
comparison libvo/vo_gl2.c @ 18584:212999db0203
Avoid crash with e.g. -vo gl2:yuv=2 when no fragment program functions are available
Fix "ported" from vo_gl.c
| author | reimar |
|---|---|
| date | Mon, 05 Jun 2006 20:21:25 +0000 |
| parents | d75953576ae4 |
| children | 106a0c366002 |
comparison
equal
deleted
inserted
replaced
| 18583:b6444dfda51b | 18584:212999db0203 |
|---|---|
| 763 glBindTexture(GL_TEXTURE_2D, lookupTex); | 763 glBindTexture(GL_TEXTURE_2D, lookupTex); |
| 764 ActiveTexture(GL_TEXTURE0); | 764 ActiveTexture(GL_TEXTURE0); |
| 765 glBindTexture(GL_TEXTURE_2D, 0); | 765 glBindTexture(GL_TEXTURE_2D, 0); |
| 766 case YUV_CONVERSION_FRAGMENT_POW: | 766 case YUV_CONVERSION_FRAGMENT_POW: |
| 767 case YUV_CONVERSION_FRAGMENT: | 767 case YUV_CONVERSION_FRAGMENT: |
| 768 if (!GenPrograms || !BindProgram) { | |
| 769 mp_msg(MSGT_VO, MSGL_ERR, "[gl] fragment program functions missing!\n"); | |
| 770 break; | |
| 771 } | |
| 768 GenPrograms(1, &fragprog); | 772 GenPrograms(1, &fragprog); |
| 769 BindProgram(GL_FRAGMENT_PROGRAM, fragprog); | 773 BindProgram(GL_FRAGMENT_PROGRAM, fragprog); |
| 770 break; | 774 break; |
| 771 } | 775 } |
| 772 glSetupYUVConversion(GL_TEXTURE_2D, use_yuv, 0.0, 1.0, 0.0, 1.0, 1.0, 1.0, 1.0); | 776 glSetupYUVConversion(GL_TEXTURE_2D, use_yuv, 0.0, 1.0, 0.0, 1.0, 1.0, 1.0, 1.0); |