fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 22:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/va: handle default post process regions

Browse source 
Avoid referencing NULL pointers.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Julien Isorce <j.isorce@samsung.com>
Tested-by: Julien Isorce <j.isorce@samsung.com>
This commit is contained in:
Christian König 2015-12-07 20:21:57 +01:00
parent f6dd31c1cf
commit 8b52fa71ac
1 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/gallium/state_trackers/va/postproc.c
View file

@ -29,9 +29,26 @@
#include "va_private.h"
static const VARectangle *
vlVaRegionDefault(const VARectangle *region, struct pipe_video_buffer *buf,
VARectangle *def)
{
if (region)
return region;
def->x = 0;
def->y = 0;
def->width = buf->width;
def->height = buf->height;
return def;
}
VAStatus
vlVaHandleVAProcPipelineParameterBufferType(vlVaDriver *drv, vlVaContext *context, vlVaBuffer *buf)
{
VARectangle def_src_region, def_dst_region;
const VARectangle *src_region, *dst_region;
struct u_rect src_rect;
struct u_rect dst_rect;
vlVaSurface *src_surface;
@ -64,15 +81,18 @@ vlVaHandleVAProcPipelineParameterBufferType(vlVaDriver *drv, vlVaContext *contex
psurf = surfaces[0];
src_rect.x0 = pipeline_param->surface_region->x;
src_rect.y0 = pipeline_param->surface_region->y;
src_rect.x1 = pipeline_param->surface_region->x + pipeline_param->surface_region->width;
src_rect.y1 = pipeline_param->surface_region->y + pipeline_param->surface_region->height;
src_region = vlVaRegionDefault(pipeline_param->surface_region, src_surface->buffer, &def_src_region);
dst_region = vlVaRegionDefault(pipeline_param->output_region, context->target, &def_dst_region);
dst_rect.x0 = pipeline_param->output_region->x;
dst_rect.y0 = pipeline_param->output_region->y;
dst_rect.x1 = pipeline_param->output_region->x + pipeline_param->output_region->width;
dst_rect.y1 = pipeline_param->output_region->y + pipeline_param->output_region->height;
src_rect.x0 = src_region->x;
src_rect.y0 = src_region->y;
src_rect.x1 = src_region->x + src_region->width;
src_rect.y1 = src_region->y + src_region->height;
dst_rect.x0 = dst_region->x;
dst_rect.y0 = dst_region->y;
dst_rect.x1 = dst_region->x + dst_region->width;
dst_rect.y1 = dst_region->y + dst_region->height;
vl_compositor_clear_layers(&drv->cstate);
vl_compositor_set_buffer_layer(&drv->cstate, &drv->compositor, 0, src_surface->buffer, &src_rect, NULL, VL_COMPOSITOR_WEAVE);