nv50: add depth texture formats, and a few others, too

[mesa.git] / src / gallium / drivers / nv50 / nv50_state_validate.c

diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c
index 012911f41bd437e57271b3589ce7b86945ea79fc..956a70061541429f19b3ed4c3af155c210987a2c 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_state_validate.c
+++ b/src/gallium/drivers/nv50/nv50_state_validate.c
@@ -23,6 +23,12 @@
 #include "nv50_context.h"
 #include "nouveau/nouveau_stateobj.h"
 
+#define NV50_CBUF_FORMAT_CASE(n) \
+       case PIPE_FORMAT_##n: so_data(so, NV50TCL_RT_FORMAT_##n); break
+
+#define NV50_ZETA_FORMAT_CASE(n) \
+       case PIPE_FORMAT_##n: so_data(so, NV50TCL_ZETA_FORMAT_##n); break
+
 static void
 nv50_state_validate_fb(struct nv50_context *nv50)
 {
@@ -54,15 +60,14 @@ nv50_state_validate_fb(struct nv50_context *nv50)
                so_reloc (so, bo, fb->cbufs[i]->offset, NOUVEAU_BO_VRAM |
                              NOUVEAU_BO_LOW | NOUVEAU_BO_RDWR, 0, 0);
                switch (fb->cbufs[i]->format) {
-               case PIPE_FORMAT_A8R8G8B8_UNORM:
-                       so_data(so, NV50TCL_RT_FORMAT_A8R8G8B8_UNORM);
-                       break;
-               case PIPE_FORMAT_X8R8G8B8_UNORM:
-                       so_data(so, NV50TCL_RT_FORMAT_X8R8G8B8_UNORM);
-                       break;
-               case PIPE_FORMAT_R5G6B5_UNORM:
-                       so_data(so, NV50TCL_RT_FORMAT_R5G6B5_UNORM);
-                       break;
+               NV50_CBUF_FORMAT_CASE(A8R8G8B8_UNORM);
+               NV50_CBUF_FORMAT_CASE(X8R8G8B8_UNORM);
+               NV50_CBUF_FORMAT_CASE(R5G6B5_UNORM);
+               NV50_CBUF_FORMAT_CASE(R16G16B16A16_SNORM);
+               NV50_CBUF_FORMAT_CASE(R16G16B16A16_UNORM);
+               NV50_CBUF_FORMAT_CASE(R32G32B32A32_FLOAT);
+               NV50_CBUF_FORMAT_CASE(R16G16_SNORM);
+               NV50_CBUF_FORMAT_CASE(R16G16_UNORM);
                default:
                        NOUVEAU_ERR("AIIII unknown format %s\n",
                                    pf_name(fb->cbufs[i]->format));
@@ -96,18 +101,10 @@ nv50_state_validate_fb(struct nv50_context *nv50)
                so_reloc (so, bo, fb->zsbuf->offset, NOUVEAU_BO_VRAM |
                              NOUVEAU_BO_LOW | NOUVEAU_BO_RDWR, 0, 0);
                switch (fb->zsbuf->format) {
-               case PIPE_FORMAT_Z32_FLOAT:
-                       so_data(so, NV50TCL_ZETA_FORMAT_Z32_FLOAT);
-                       break;
-               case PIPE_FORMAT_Z24S8_UNORM:
-                       so_data(so, NV50TCL_ZETA_FORMAT_Z24S8_UNORM);
-                       break;
-               case PIPE_FORMAT_X8Z24_UNORM:
-                       so_data(so, NV50TCL_ZETA_FORMAT_X8Z24_UNORM);
-                       break;
-               case PIPE_FORMAT_S8Z24_UNORM:
-                       so_data(so, NV50TCL_ZETA_FORMAT_S8Z24_UNORM);
-                       break;
+               NV50_ZETA_FORMAT_CASE(S8Z24_UNORM);
+               NV50_ZETA_FORMAT_CASE(X8Z24_UNORM);
+               NV50_ZETA_FORMAT_CASE(Z24S8_UNORM);
+               NV50_ZETA_FORMAT_CASE(Z32_FLOAT);
                default:
                        NOUVEAU_ERR("AIIII unknown format %s\n",
                                    pf_name(fb->zsbuf->format));