Signed-off-by: Christian König <christian.koenig@amd.com>tags/mesa-9.2-rc1
@@ -213,11 +213,11 @@ vl_video_buffer_get_associated_data(struct pipe_video_buffer *vbuf, | |||
} | |||
void | |||
vl_vide_buffer_template(struct pipe_resource *templ, | |||
const struct pipe_video_buffer *tmpl, | |||
enum pipe_format resource_format, | |||
unsigned array_size, unsigned usage, | |||
unsigned plane) | |||
vl_video_buffer_template(struct pipe_resource *templ, | |||
const struct pipe_video_buffer *tmpl, | |||
enum pipe_format resource_format, | |||
unsigned array_size, unsigned usage, | |||
unsigned plane) | |||
{ | |||
memset(templ, 0, sizeof(*templ)); | |||
templ->target = array_size > 1 ? PIPE_TEXTURE_2D_ARRAY : PIPE_TEXTURE_2D; | |||
@@ -444,7 +444,7 @@ vl_video_buffer_create_ex(struct pipe_context *pipe, | |||
memset(resources, 0, sizeof resources); | |||
vl_vide_buffer_template(&res_tmpl, tmpl, resource_formats[0], array_size, usage, 0); | |||
vl_video_buffer_template(&res_tmpl, tmpl, resource_formats[0], array_size, usage, 0); | |||
resources[0] = pipe->screen->resource_create(pipe->screen, &res_tmpl); | |||
if (!resources[0]) | |||
goto error; | |||
@@ -454,7 +454,7 @@ vl_video_buffer_create_ex(struct pipe_context *pipe, | |||
return vl_video_buffer_create_ex2(pipe, tmpl, resources); | |||
} | |||
vl_vide_buffer_template(&res_tmpl, tmpl, resource_formats[1], array_size, usage, 1); | |||
vl_video_buffer_template(&res_tmpl, tmpl, resource_formats[1], array_size, usage, 1); | |||
resources[1] = pipe->screen->resource_create(pipe->screen, &res_tmpl); | |||
if (!resources[1]) | |||
goto error; | |||
@@ -462,7 +462,7 @@ vl_video_buffer_create_ex(struct pipe_context *pipe, | |||
if (resource_formats[2] == PIPE_FORMAT_NONE) | |||
return vl_video_buffer_create_ex2(pipe, tmpl, resources); | |||
vl_vide_buffer_template(&res_tmpl, tmpl, resource_formats[2], array_size, usage, 2); | |||
vl_video_buffer_template(&res_tmpl, tmpl, resource_formats[2], array_size, usage, 2); | |||
resources[2] = pipe->screen->resource_create(pipe->screen, &res_tmpl); | |||
if (!resources[2]) | |||
goto error; |
@@ -95,11 +95,11 @@ vl_video_buffer_get_associated_data(struct pipe_video_buffer *vbuf, | |||
* fill a resource template for the given plane | |||
*/ | |||
void | |||
vl_vide_buffer_template(struct pipe_resource *templ, | |||
const struct pipe_video_buffer *templat, | |||
enum pipe_format resource_format, | |||
unsigned array_size, unsigned usage, | |||
unsigned plane); | |||
vl_video_buffer_template(struct pipe_resource *templ, | |||
const struct pipe_video_buffer *templat, | |||
enum pipe_format resource_format, | |||
unsigned array_size, unsigned usage, | |||
unsigned plane); | |||
/** | |||
* creates a video buffer, can be used as a standard implementation for pipe->create_video_buffer |
@@ -75,7 +75,7 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe, | |||
template.width = align(tmpl->width, VL_MACROBLOCK_WIDTH); | |||
template.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT); | |||
vl_vide_buffer_template(&templ, &template, resource_formats[0], array_size, PIPE_USAGE_STATIC, 0); | |||
vl_video_buffer_template(&templ, &template, resource_formats[0], array_size, PIPE_USAGE_STATIC, 0); | |||
if (ctx->chip_class < EVERGREEN) | |||
templ.flags = R600_RESOURCE_FLAG_TRANSFER; | |||
resources[0] = (struct r600_texture *) | |||
@@ -84,7 +84,7 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe, | |||
goto error; | |||
if (resource_formats[1] != PIPE_FORMAT_NONE) { | |||
vl_vide_buffer_template(&templ, &template, resource_formats[1], array_size, PIPE_USAGE_STATIC, 1); | |||
vl_video_buffer_template(&templ, &template, resource_formats[1], array_size, PIPE_USAGE_STATIC, 1); | |||
if (ctx->chip_class < EVERGREEN) | |||
templ.flags = R600_RESOURCE_FLAG_TRANSFER; | |||
resources[1] = (struct r600_texture *) | |||
@@ -94,7 +94,7 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe, | |||
} | |||
if (resource_formats[2] != PIPE_FORMAT_NONE) { | |||
vl_vide_buffer_template(&templ, &template, resource_formats[2], array_size, PIPE_USAGE_STATIC, 2); | |||
vl_video_buffer_template(&templ, &template, resource_formats[2], array_size, PIPE_USAGE_STATIC, 2); | |||
if (ctx->chip_class < EVERGREEN) | |||
templ.flags = R600_RESOURCE_FLAG_TRANSFER; | |||
resources[2] = (struct r600_texture *) |
@@ -75,7 +75,7 @@ struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe | |||
template.width = align(tmpl->width, VL_MACROBLOCK_WIDTH); | |||
template.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT); | |||
vl_vide_buffer_template(&templ, &template, resource_formats[0], array_size, PIPE_USAGE_STATIC, 0); | |||
vl_video_buffer_template(&templ, &template, resource_formats[0], array_size, PIPE_USAGE_STATIC, 0); | |||
/* TODO: Setting the transfer flag is only a workaround till we get tiling working */ | |||
templ.flags = R600_RESOURCE_FLAG_TRANSFER; | |||
resources[0] = (struct r600_resource_texture *) | |||
@@ -84,7 +84,7 @@ struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe | |||
goto error; | |||
if (resource_formats[1] != PIPE_FORMAT_NONE) { | |||
vl_vide_buffer_template(&templ, &template, resource_formats[1], array_size, PIPE_USAGE_STATIC, 1); | |||
vl_video_buffer_template(&templ, &template, resource_formats[1], array_size, PIPE_USAGE_STATIC, 1); | |||
templ.flags = R600_RESOURCE_FLAG_TRANSFER; | |||
resources[1] = (struct r600_resource_texture *) | |||
pipe->screen->resource_create(pipe->screen, &templ); | |||
@@ -93,7 +93,7 @@ struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe | |||
} | |||
if (resource_formats[2] != PIPE_FORMAT_NONE) { | |||
vl_vide_buffer_template(&templ, &template, resource_formats[2], array_size, PIPE_USAGE_STATIC, 2); | |||
vl_video_buffer_template(&templ, &template, resource_formats[2], array_size, PIPE_USAGE_STATIC, 2); | |||
templ.flags = R600_RESOURCE_FLAG_TRANSFER; | |||
resources[2] = (struct r600_resource_texture *) | |||
pipe->screen->resource_create(pipe->screen, &templ); |