fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 09:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nv50: separate video logic from noalloc

Browse source 
The upcoming vp3 logic will want the video layout, but allocated by the
miptree.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Ilia Mirkin 2013-08-10 18:53:15 -04:00 • committed by Maarten Lankhorst
parent c1a6f59b20
commit b3f6f127f2
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/nv50/nv50_miptree.c
View file

@ -335,8 +335,10 @@ nv50_miptree_create(struct pipe_screen *pscreen,
if (unlikely(pt->flags & NV50_RESOURCE_FLAG_VIDEO)) {
nv50_miptree_init_layout_video(mt);
/* BO allocation done by client */
return pt;
if (pt->flags & NV50_RESOURCE_FLAG_NOALLOC) {
/* BO allocation done by client */
return pt;
}
} else
if (bo_config.nv50.memtype != 0) {
nv50_miptree_init_layout_tiled(mt);

1
src/gallium/drivers/nv50/nv50_resource.h
View file

@ -17,6 +17,7 @@ void
nv50_screen_init_resource_functions(struct pipe_screen *pscreen);
#define NV50_RESOURCE_FLAG_VIDEO (NOUVEAU_RESOURCE_FLAG_DRV_PRIV << 0)
#define NV50_RESOURCE_FLAG_NOALLOC (NOUVEAU_RESOURCE_FLAG_DRV_PRIV << 1)
#define NV50_TILE_SHIFT_X(m) 6
#define NV50_TILE_SHIFT_Y(m) ((((m) >> 4) & 0xf) + 2)

2
src/gallium/drivers/nv50/nv84_video.c
View file

@ -669,7 +669,7 @@ nv84_video_buffer_create(struct pipe_context *pipe,
templ.format = PIPE_FORMAT_R8_UNORM;
templ.width0 = align(template->width, 2);
templ.height0 = align(template->height, 4) / 2;
templ.flags = NV50_RESOURCE_FLAG_VIDEO;
templ.flags = NV50_RESOURCE_FLAG_VIDEO | NV50_RESOURCE_FLAG_NOALLOC;
templ.array_size = 2;
cfg.nv50.tile_mode = 0x20;