diff options
| author | Ilia Mirkin <[email protected]> | 2013-08-10 18:53:15 -0400 |
|---|---|---|
| committer | Maarten Lankhorst <[email protected]> | 2013-08-16 09:48:26 +0200 |
| commit | b3f6f127f28737d034dcf1c12a9b66b88750e93b (patch) | |
| tree | 7e2d07f4bab422a15c0eb54f47297b46fbabd293 /src/gallium/drivers/nv50/nv50_miptree.c | |
| parent | c1a6f59b20dab380b77ad1375062f9987cad9183 (diff) | |
nv50: separate video logic from noalloc
The upcoming vp3 logic will want the video layout, but allocated by the
miptree.
Signed-off-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_miptree.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_miptree.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c index 28be76872f0..461710e1130 100644 --- a/src/gallium/drivers/nv50/nv50_miptree.c +++ b/src/gallium/drivers/nv50/nv50_miptree.c @@ -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); |