Attachment 93636 Details for Bug 57660 – cubemap array patch

[patch] cubemap array patch

0001-nv50-cube-map-array-support.patch (text/plain), 1.86 KB, created by Ilia Mirkin on 2014-02-07 22:48:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ilia Mirkin

Created: 2014-02-07 22:48:43 UTC

Size: 1.86 KB

patch

obsolete

>From 97a93468fa14eb7aae11fbadd63fa0792e359b25 Mon Sep 17 00:00:00 2001
>From: Ilia Mirkin <imirkin@alum.mit.edu>
>Date: Fri, 7 Feb 2014 17:42:58 -0500
>Subject: [PATCH] nv50: cube map array support
>
>---
> src/gallium/drivers/nouveau/nv50/nv50_screen.c | 3 ---
> src/gallium/drivers/nouveau/nv50/nv50_tex.c    | 8 ++++----
> 2 files changed, 4 insertions(+), 7 deletions(-)
>
>diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
>index bb98ab6..81cef73 100644
>--- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
>+++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
>@@ -112,10 +112,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
>    case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE:
>       return 0;
>    case PIPE_CAP_CUBE_MAP_ARRAY:
>-      return 0;
>-      /*
>       return nv50_screen(pscreen)->tesla->oclass >= NVA3_3D_CLASS;
>-      */
>    case PIPE_CAP_TWO_SIDED_STENCIL:
>    case PIPE_CAP_DEPTH_CLIP_DISABLE:
>    case PIPE_CAP_POINT_SPRITE:
>diff --git a/src/gallium/drivers/nouveau/nv50/nv50_tex.c b/src/gallium/drivers/nouveau/nv50/nv50_tex.c
>index 6784821..5cfce3a 100644
>--- a/src/gallium/drivers/nouveau/nv50/nv50_tex.c
>+++ b/src/gallium/drivers/nouveau/nv50/nv50_tex.c
>@@ -115,12 +115,12 @@ nv50_create_texture_view(struct pipe_context *pipe,
> 
>    addr = mt->base.address;
> 
>-   if (mt->base.base.target == PIPE_TEXTURE_1D_ARRAY ||
>-       mt->base.base.target == PIPE_TEXTURE_2D_ARRAY) {
>+   depth = MAX2(mt->base.base.array_size, mt->base.base.depth0);
>+
>+   if (mt->base.base.array_size > 1) {
>+      /* there doesn't seem to be a base layer field in TIC */
>       addr += view->pipe.u.tex.first_layer * mt->layer_stride;
>       depth = view->pipe.u.tex.last_layer - view->pipe.u.tex.first_layer + 1;
>-   } else {
>-      depth = mt->base.base.depth0;
>    }
> 
>    tic[2] = 0x10001000 | NV50_TIC_2_NO_BORDER;
>-- 
>1.8.3.2
>

Actions: View | Splinter Review

Attachments on bug 57660: 70747 | 70799 | 93636

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.