diff options
| author | Ilia Mirkin <[email protected]> | 2014-01-15 02:14:06 -0500 |
|---|---|---|
| committer | Maarten Lankhorst <[email protected]> | 2014-01-27 16:40:42 +0100 |
| commit | c75eeab60936810eb1a2641961b5ecf6f77a2abd (patch) | |
| tree | 4bc38309b427c8ab938df4ab05990e0c02d2a873 /src/gallium/drivers/nouveau/nv50 | |
| parent | 3f264e16e29a870b4b3b605590c718c35bb1a91c (diff) | |
nv50, nvc0: clear out RT on a null cbuf
This is needed since commit 9baa45f78b (st/mesa: bind NULL colorbuffers
as specified by glDrawBuffers).
This implementation is highly based on a larger commit by
Christoph Bumiller <[email protected]> in his gallium-nine
branch.
Signed-off-by: Ilia Mirkin <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nouveau/nv50')
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_defs.xml.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_formats.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_state_validate.c | 30 |
3 files changed, 27 insertions, 5 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_defs.xml.h b/src/gallium/drivers/nouveau/nv50/nv50_defs.xml.h index 2e42843fa56..80de3be9a7d 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_defs.xml.h +++ b/src/gallium/drivers/nouveau/nv50/nv50_defs.xml.h @@ -78,6 +78,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NV50_VSTATUS_BLOCKED 0x00000005 #define NV50_VSTATUS_FAULTED 0x00000006 #define NV50_VSTATUS_PAUSED 0x00000007 +#define NV50_SURFACE_FORMAT_NONE 0x00000000 #define NV50_SURFACE_FORMAT_BITMAP 0x0000001c #define NV50_SURFACE_FORMAT_UNK1D 0x0000001d #define NV50_SURFACE_FORMAT_RGBA32_FLOAT 0x000000c0 diff --git a/src/gallium/drivers/nouveau/nv50/nv50_formats.c b/src/gallium/drivers/nouveau/nv50/nv50_formats.c index 0a7e812ba13..d21905dae5a 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_formats.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_formats.c @@ -71,7 +71,6 @@ # define U_tV U_V #endif -#define NV50_SURFACE_FORMAT_NONE 0 #define NV50_ZETA_FORMAT_NONE 0 /* for vertex buffers: */ diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c b/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c index 86b9a236fb6..bb05f033b81 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_state_validate.c @@ -1,6 +1,19 @@ #include "nv50/nv50_context.h" -#include "os/os_time.h" +#include "nv50/nv50_defs.xml.h" + +static INLINE void +nv50_fb_set_null_rt(struct nouveau_pushbuf *push, unsigned i) +{ + BEGIN_NV04(push, NV50_3D(RT_ADDRESS_HIGH(i)), 4); + PUSH_DATA (push, 0); + PUSH_DATA (push, 0); + PUSH_DATA (push, NV50_SURFACE_FORMAT_NONE); + PUSH_DATA (push, 0); + BEGIN_NV04(push, NV50_3D(RT_HORIZ(i)), 2); + PUSH_DATA (push, 64); + PUSH_DATA (push, 0); +} static void nv50_validate_fb(struct nv50_context *nv50) @@ -20,9 +33,18 @@ nv50_validate_fb(struct nv50_context *nv50) PUSH_DATA (push, fb->height << 16); for (i = 0; i < fb->nr_cbufs; ++i) { - struct nv50_miptree *mt = nv50_miptree(fb->cbufs[i]->texture); - struct nv50_surface *sf = nv50_surface(fb->cbufs[i]); - struct nouveau_bo *bo = mt->base.bo; + struct nv50_miptree *mt; + struct nv50_surface *sf; + struct nouveau_bo *bo; + + if (!fb->cbufs[i]) { + nv50_fb_set_null_rt(push, i); + continue; + } + + mt = nv50_miptree(fb->cbufs[i]->texture); + sf = nv50_surface(fb->cbufs[i]); + bo = mt->base.bo; array_size = MIN2(array_size, sf->depth); if (mt->layout_3d) |