}
EXTERN tdm_error
-tdm_display_get_pp_available_properties(tdm_display *dpy, const tdm_prop **props, int *count)
-{
- DISPLAY_FUNC_ENTRY();
-
- TDM_RETURN_VAL_IF_FAIL(props != NULL, TDM_ERROR_INVALID_PARAMETER);
- TDM_RETURN_VAL_IF_FAIL(count != NULL, TDM_ERROR_INVALID_PARAMETER);
-
- pthread_mutex_lock(&private_display->lock);
-
- *props = (const tdm_prop*)private_display->caps_pp.props;
- *count = private_display->caps_pp.prop_count;
-
- pthread_mutex_unlock(&private_display->lock);
-
- return ret;
-}
-
-EXTERN tdm_error
tdm_display_get_capture_capabilities(tdm_display *dpy, tdm_capture_capability *capabilities)
{
DISPLAY_FUNC_ENTRY();
tdm_output_get_subpixel(tdm_output *output, unsigned int *subpixel)
{
OUTPUT_FUNC_ENTRY();
+ TDM_RETURN_VAL_IF_FAIL(subpixel != NULL, TDM_ERROR_INVALID_PARAMETER);
pthread_mutex_lock(&private_display->lock);
- if (subpixel)
- *subpixel = private_output->caps.subpixel;
+ *subpixel = private_output->caps.subpixel;
pthread_mutex_unlock(&private_display->lock);
}
EXTERN tdm_error
+tdm_output_get_pipe(tdm_output *output, unsigned int *pipe)
+{
+ OUTPUT_FUNC_ENTRY();
+ TDM_RETURN_VAL_IF_FAIL(pipe != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+ pthread_mutex_lock(&private_display->lock);
+
+ *pipe = private_output->pipe;
+
+ pthread_mutex_unlock(&private_display->lock);
+
+ return ret;
+}
+
+
+EXTERN tdm_error
tdm_output_set_property(tdm_output *output, unsigned int id, tdm_value value)
{
tdm_func_display *func_display;
_tdm_output_cb_vblank(tdm_output *output, unsigned int sequence,
unsigned int tv_sec, unsigned int tv_usec, void *user_data)
{
- tdm_private_output *private_output = output;
+ tdm_private_output *private_output;
+ tdm_private_display *private_display;
+ tdm_private_display *private_display_backend;
tdm_private_vblank_handler *vblank_handler = user_data;
+ TDM_RETURN_IF_FAIL(vblank_handler);
+ private_output = vblank_handler->private_output;
TDM_RETURN_IF_FAIL(private_output);
- TDM_RETURN_IF_FAIL(vblank_handler);
+
+ private_display = private_output->private_display;
+ LIST_FOR_EACH_ENTRY(private_output, &private_display->output_list, link)
+ {
+ if (private_output->output == output)
+ private_display_backend = private_output->private_display;
+ }
+
+ pthread_mutex_unlock(&private_display_backend->lock);
if (vblank_handler->func)
- vblank_handler->func(private_output, sequence, tv_sec, tv_usec, vblank_handler->user_data);
+ vblank_handler->func(vblank_handler->private_output, sequence, tv_sec, tv_usec, vblank_handler->user_data);
+
+ pthread_mutex_lock(&private_display_backend->lock);
LIST_DEL(&vblank_handler->link);
free(vblank_handler);
_tdm_output_cb_commit(tdm_output *output, unsigned int sequence,
unsigned int tv_sec, unsigned int tv_usec, void *user_data)
{
- tdm_private_output *private_output = output;
+ tdm_private_output *private_output;
+ tdm_private_display *private_display;
+ tdm_private_display *private_display_backend;
tdm_private_commit_handler *commit_handler = user_data;
+ TDM_RETURN_IF_FAIL(commit_handler);
+ private_output = commit_handler->private_output;
TDM_RETURN_IF_FAIL(private_output);
- TDM_RETURN_IF_FAIL(commit_handler);
+
+ private_display = private_output->private_display;
+ LIST_FOR_EACH_ENTRY(private_output, &private_display->output_list, link)
+ {
+ if (private_output->output == output)
+ private_display_backend = private_output->private_display;
+ }
+
+ pthread_mutex_unlock(&private_display_backend->lock);
if (commit_handler->func)
- commit_handler->func(private_output, sequence, tv_sec, tv_usec, commit_handler->user_data);
+ commit_handler->func(commit_handler->private_output, sequence, tv_sec, tv_usec, commit_handler->user_data);
+
+ pthread_mutex_lock(&private_display_backend->lock);
LIST_DEL(&commit_handler->link);
free(commit_handler);
}
LIST_ADD(&vblank_handler->link, &private_output->vblank_handler_list);
+ vblank_handler->private_output = private_output;
vblank_handler->func = func;
vblank_handler->user_data = user_data;
}
LIST_ADD(&commit_handler->link, &private_output->commit_handler_list);
+ commit_handler->private_output = private_output;
commit_handler->func = func;
commit_handler->user_data = user_data;
pthread_mutex_lock(&private_display->lock);
- *props = (const tdm_prop*)private_output->caps.props;
- *count = private_output->caps.prop_count;
+ *props = (const tdm_prop*)private_layer->caps.props;
+ *count = private_layer->caps.prop_count;
pthread_mutex_unlock(&private_display->lock);
func_display = &private_display->func_display;
+ private_layer->usable = 0;
+
if (!func_display->layer_set_info)
{
pthread_mutex_unlock(&private_display->lock);
func_display = &private_display->func_display;
+ private_layer->usable = 0;
+
if (!func_display->layer_set_buffer)
{
pthread_mutex_unlock(&private_display->lock);
return TDM_ERROR_NONE;
}
- //TODO
+ if (private_layer->current_buffer)
+ {
+ /* TODO: need to unref after next buffer is showing on screen */
+ tdm_buffer_unref_backend(private_layer->current_buffer);
+ tdm_buffer_unref(private_layer->current_buffer);
+ }
+
+ private_layer->current_buffer = tdm_buffer_ref(buffer, NULL);
tdm_buffer_ref_backend(buffer);
+
ret = func_display->layer_set_buffer(private_layer->layer,
tdm_buffer_get_surface(buffer));
- tdm_buffer_unref_backend(buffer);
pthread_mutex_unlock(&private_display->lock);
func_display = &private_display->func_display;
+ if (private_layer->current_buffer)
+ {
+ tdm_buffer_unref(private_layer->current_buffer);
+ tdm_buffer_unref_backend(private_layer->current_buffer);
+ private_layer->current_buffer = NULL;
+ }
+
+ private_layer->usable = 1;
+
if (!func_display->layer_unset_buffer)
{
pthread_mutex_unlock(&private_display->lock);
return ret;
}
+EXTERN tdm_error
+tdm_layer_is_usable(tdm_layer *layer, unsigned int *usable)
+{
+ LAYER_FUNC_ENTRY();
+
+ TDM_RETURN_VAL_IF_FAIL(usable != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+ pthread_mutex_lock(&private_display->lock);
+
+ *usable = private_layer->usable;
+
+ pthread_mutex_unlock(&private_display->lock);
+
+ return ret;
+}
+
+
EXTERN tdm_capture*
tdm_layer_create_capture(tdm_layer *layer, tdm_error *error)
{