Mesa (master): nv50,nvc0: add correct storage type for Z32_FLOAT
Christoph Bumiller
chrisbmr at kemper.freedesktop.org
Thu Jul 14 10:51:50 UTC 2011
Module: Mesa
Branch: master
Commit: c011f94b7b4e1e93d5563f4bfd9906fa29e2ffb0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c011f94b7b4e1e93d5563f4bfd9906fa29e2ffb0
Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date: Mon Jul 11 22:49:57 2011 +0200
nv50,nvc0: add correct storage type for Z32_FLOAT
---
src/gallium/drivers/nv50/nv50_miptree.c | 3 +++
src/gallium/drivers/nvc0/nvc0_miptree.c | 6 ++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c
index 0a1fcbc..fcb9ca3 100644
--- a/src/gallium/drivers/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nv50/nv50_miptree.c
@@ -56,6 +56,9 @@ nv50_mt_choose_storage_type(struct nv50_miptree *mt, boolean compressed)
case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
tile_flags = 0x22800 + (ms << 8);
break;
+ case PIPE_FORMAT_Z32_FLOAT:
+ tile_flags = 0x4000 + (ms << 8);
+ break;
case PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED:
tile_flags = 0x6000 + (ms << 8);
break;
diff --git a/src/gallium/drivers/nvc0/nvc0_miptree.c b/src/gallium/drivers/nvc0/nvc0_miptree.c
index 5da73df..8b8e2cf 100644
--- a/src/gallium/drivers/nvc0/nvc0_miptree.c
+++ b/src/gallium/drivers/nvc0/nvc0_miptree.c
@@ -89,6 +89,12 @@ nvc0_mt_choose_storage_type(struct nv50_miptree *mt, boolean compressed)
else
tile_flags = 0x1100;
break;
+ case PIPE_FORMAT_Z32_FLOAT:
+ if (compressed)
+ tile_flags = 0x8600 + (ms << 8);
+ else
+ tile_flags = 0x7b00;
+ break;
case PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED:
if (compressed)
tile_flags = 0xce00 + (ms << 8);
More information about the mesa-commit
mailing list