Revert "compositor-drm: Video performance dropped with in_fence feature"
This reverts commit aa502f16b2a27accf22efb49cff5a2a5e028e14b.
Change-Id: Id09161516cb30dbced5cd3c8b3e09282fa0128d4
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index 16feccc..de5755a 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -2597,14 +2597,8 @@
int ret = 0;
int in_fence_fd = -1;
- if(output->gbm_surface){
- if(gl_renderer->sync_post(output->base.compositor) == 0) {
- gbm_surface_set_sync_post(output->gbm_surface, 0);
- in_fence_fd = gbm_surface_get_in_fence_fd(output->gbm_surface);
- } else {
- gbm_surface_set_sync_post(output->gbm_surface, 1);
- }
- }
+ if(output->gbm_surface)
+ in_fence_fd = gbm_surface_get_in_fence_fd(output->gbm_surface);
if (state->dpms != output->state_cur->dpms)
*flags |= DRM_MODE_ATOMIC_ALLOW_MODESET;
diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
index 2177e65..450b8d7 100644
--- a/libweston/gl-renderer.c
+++ b/libweston/gl-renderer.c
@@ -197,7 +197,6 @@
struct weston_renderer base;
int fragment_shader_debug;
int fan_debug;
- int sync_post;
struct weston_binding *fragment_binding;
struct weston_binding *fan_binding;
@@ -2309,7 +2308,6 @@
gs->height = buffer->height;
gs->buffer_type = BUFFER_TYPE_EGL;
gs->y_inverted = buffer->y_inverted;
- gr->sync_post = 1;
}
static void
@@ -2550,8 +2548,6 @@
gr = get_renderer(gs->surface->compositor);
- gr->sync_post = 0;
-
surface_state_destroy(gs, gr);
}
@@ -3449,7 +3445,6 @@
gl_renderer_surface_get_content_size;
gr->base.surface_copy_content = gl_renderer_surface_copy_content;
gr->egl_display = NULL;
- gr->sync_post = 0;
/* extension_suffix is supported */
if (supports) {
@@ -3784,12 +3779,6 @@
return 0;
}
-int gl_renderer_sync_post(struct weston_compositor *ec)
-{
- struct gl_renderer *gr = get_renderer(ec);
- return gr->sync_post;
-}
-
WL_EXPORT struct gl_renderer_interface gl_renderer_interface = {
.opaque_attribs = gl_renderer_opaque_attribs,
.alpha_attribs = gl_renderer_alpha_attribs,
@@ -3800,6 +3789,5 @@
.output_destroy = gl_renderer_output_destroy,
.output_surface = gl_renderer_output_surface,
.output_set_border = gl_renderer_output_set_border,
- .print_egl_error_state = gl_renderer_print_egl_error_state,
- .sync_post = gl_renderer_sync_post
+ .print_egl_error_state = gl_renderer_print_egl_error_state
};
diff --git a/libweston/gl-renderer.h b/libweston/gl-renderer.h
index 0faf229..b47ea07 100644
--- a/libweston/gl-renderer.h
+++ b/libweston/gl-renderer.h
@@ -114,7 +114,5 @@
int32_t tex_width, unsigned char *data);
void (*print_egl_error_state)(void);
-
- int (*sync_post)(struct weston_compositor *ec);
};
