diff options
author | wm4 <wm4@nowhere> | 2016-05-20 23:21:43 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-05-20 23:21:43 +0200 |
commit | 79afa347cc8eb0a52e3acc11598eb6d497b938d5 (patch) | |
tree | 9565afc271982691b054a609245305af91e10900 | |
parent | 3deedef195b148e09edf9d4f628b1ca3979e1cc2 (diff) | |
download | mpv-79afa347cc8eb0a52e3acc11598eb6d497b938d5.tar.bz2 mpv-79afa347cc8eb0a52e3acc11598eb6d497b938d5.tar.xz |
vo_opengl: remove non-working rgb/rgba FBO formats
Following commit 84ccebd9, the internal helpers don't allow GL_RGB and
GL_RGBA as internal formats for FBO attachments anymore.
While OpenGL itself is perfectly fine with it, I don't see much of a
reason to bother, and mixing sized and unsized internal formats is
confusing anyway.
Just remove these formats.
-rw-r--r-- | DOCS/interface-changes.rst | 2 | ||||
-rw-r--r-- | DOCS/man/vo.rst | 2 | ||||
-rw-r--r-- | video/out/opengl/video.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 58197d7a70..39f560d93f 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -32,6 +32,8 @@ Interface changes as booleans when using the mpv_node functions in the client API, the "native" property accessors in Lua, and the JSON API. They can be set as such as well. + - the VO opengl fbo-format sub-option does not accept "rgb" or "rgba" + anymore --- mpv 0.17.0 --- - deprecate "track-list/N/audio-channels" property (use "track-list/N/demux-channel-count" instead) diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index c5d7513f4d..d8c0925744 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -974,7 +974,7 @@ Available video output drivers are: ``fbo-format=<fmt>`` Selects the internal format of textures used for FBOs. The format can influence performance and quality of the video output. - ``fmt`` can be one of: rgb, rgba, rgb8, rgb10, rgb10_a2, rgb16, rgb16f, + ``fmt`` can be one of: rgb8, rgb10, rgb10_a2, rgb16, rgb16f, rgb32f, rgba12, rgba16, rgba16f, rgba32f. Default: ``auto``, which maps to rgba16 on desktop GL, and rgba16f or rgb10_a2 on GLES (e.g. ANGLE), unless GL_EXT_texture_norm16 is diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c index 1396571a62..bebe1373d6 100644 --- a/video/out/opengl/video.c +++ b/video/out/opengl/video.c @@ -401,9 +401,7 @@ const struct m_sub_options gl_video_conf = { OPT_FLOATRANGE("sigmoid-center", sigmoid_center, 0, 0.0, 1.0), OPT_FLOATRANGE("sigmoid-slope", sigmoid_slope, 0, 1.0, 20.0), OPT_CHOICE("fbo-format", fbo_format, 0, - ({"rgb", GL_RGB}, - {"rgba", GL_RGBA}, - {"rgb8", GL_RGB8}, + ({"rgb8", GL_RGB8}, {"rgba8", GL_RGBA8}, {"rgb10", GL_RGB10}, {"rgb10_a2", GL_RGB10_A2}, |