summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nv50/nv50_state_validate.c
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-03-02 17:26:40 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-03-02 17:26:40 +0000
commitaaa2d548ed46636f6558494dc035f40bff445deb (patch)
treee9e900bcda036391bf6d0496adaa886e190006ea /src/gallium/drivers/nv50/nv50_state_validate.c
parent2998cad9ce0c2c60078a28e6a0f3f3bbda3a6535 (diff)
nouveau: Rename pipe formats.
These format uses were being hiden by pre-processor magic and were missed in the previous search'n'replace.
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_state_validate.c')
-rw-r--r--src/gallium/drivers/nv50/nv50_state_validate.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c
index a91b31015e..63dfd8cb29 100644
--- a/src/gallium/drivers/nv50/nv50_state_validate.c
+++ b/src/gallium/drivers/nv50/nv50_state_validate.c
@@ -71,9 +71,9 @@ 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) {
- NV50_CBUF_FORMAT_CASE(A8R8G8B8_UNORM);
- NV50_CBUF_FORMAT_CASE(X8R8G8B8_UNORM);
- NV50_CBUF_FORMAT_CASE(R5G6B5_UNORM);
+ NV50_CBUF_FORMAT_CASE(B8G8R8A8_UNORM);
+ NV50_CBUF_FORMAT_CASE(B8G8R8X8_UNORM);
+ NV50_CBUF_FORMAT_CASE(B5G6R5_UNORM);
NV50_CBUF_FORMAT_CASE(R16G16B16A16_SNORM);
NV50_CBUF_FORMAT_CASE(R16G16B16A16_UNORM);
NV50_CBUF_FORMAT_CASE(R32G32B32A32_FLOAT);
@@ -112,9 +112,9 @@ 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) {
- NV50_ZETA_FORMAT_CASE(S8Z24_UNORM);
- NV50_ZETA_FORMAT_CASE(X8Z24_UNORM);
NV50_ZETA_FORMAT_CASE(Z24S8_UNORM);
+ NV50_ZETA_FORMAT_CASE(Z24X8_UNORM);
+ NV50_ZETA_FORMAT_CASE(S8Z24_UNORM);
NV50_ZETA_FORMAT_CASE(Z32_FLOAT);
default:
NOUVEAU_ERR("AIIII unknown format %s\n",