diff options
Diffstat (limited to 'video/out/vo_opengl.c')
| -rw-r--r-- | video/out/vo_opengl.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index 9403d7472e..759cb96ba7 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -1237,26 +1237,6 @@ static void flip_page(struct vo *vo) p->frames_rendered++; } -static int draw_slice(struct vo *vo, uint8_t *src[], int stride[], int w, int h, - int x, int y) -{ - struct gl_priv *p = vo->priv; - GL *gl = p->gl; - - p->mpi_flipped = stride[0] < 0; - - for (int n = 0; n < p->plane_count; n++) { - gl->ActiveTexture(GL_TEXTURE0 + n); - gl->BindTexture(GL_TEXTURE_2D, p->planes[n].gl_texture); - int xs = p->planes[n].shift_x, ys = p->planes[n].shift_y; - glUploadTex(gl, GL_TEXTURE_2D, p->gl_format, p->gl_type, src[n], - stride[n], x >> xs, y >> ys, w >> xs, h >> ys, 0); - } - gl->ActiveTexture(GL_TEXTURE0); - - return 0; -} - static uint32_t get_image(struct vo *vo, mp_image_t *mpi) { struct gl_priv *p = vo->priv; @@ -1308,8 +1288,6 @@ static void draw_image(struct vo *vo, mp_image_t *mpi) mp_image_t mpi2 = *mpi; int w = mpi->w, h = mpi->h; - if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) - goto skip_upload; mpi2.flags = 0; mpi2.type = MP_IMGTYPE_TEMP; mpi2.width = mpi2.w; @@ -1347,7 +1325,7 @@ static void draw_image(struct vo *vo, mp_image_t *mpi) } gl->ActiveTexture(GL_TEXTURE0); gl->BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); -skip_upload: + do_render(p); } @@ -2259,7 +2237,6 @@ const struct vo_driver video_out_opengl = { .config = config, .control = control, .draw_image = draw_image, - .draw_slice = draw_slice, .draw_osd = draw_osd, .flip_page = flip_page, .check_events = check_events, @@ -2278,7 +2255,6 @@ const struct vo_driver video_out_opengl_hq = { .config = config, .control = control, .draw_image = draw_image, - .draw_slice = draw_slice, .draw_osd = draw_osd, .flip_page = flip_page, .check_events = check_events, |