summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nvc0/nvc0_surface.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-09-11 09:45:10 +0100
committerDave Airlie <airlied@redhat.com>2011-10-11 16:13:29 +0100
commit866f9b18c68ede63c00917ec9c3dae3524ca8826 (patch)
treeb07a53b71fe3aeac8deddbabb00ced29bb33e3c9 /src/gallium/drivers/nvc0/nvc0_surface.c
parent6b3e75de7c2dd6be6bf1acd0e996bdb1def702a1 (diff)
gallium: rename ZS stencil type to UINT (v2)
these are never USCALED, always UINT in reality. taken from some work by Christoph Bumiller v2: fixup formatting of table + tabs Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/gallium/drivers/nvc0/nvc0_surface.c')
-rw-r--r--src/gallium/drivers/nvc0/nvc0_surface.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_surface.c b/src/gallium/drivers/nvc0/nvc0_surface.c
index ff07aad00d0..f1302b473bc 100644
--- a/src/gallium/drivers/nvc0/nvc0_surface.c
+++ b/src/gallium/drivers/nvc0/nvc0_surface.c
@@ -478,7 +478,7 @@ nvc0_blitctx_make_fp(struct nvc0_blitctx *blit)
{
static const uint32_t code[] = /* use nvc0dis */
{
- /* 2 coords RGBA in, RGBA out, also for Z32_FLOAT(_S8X24_USCALED)
+ /* 2 coords RGBA in, RGBA out, also for Z32_FLOAT(_S8X24_UINT)
* NOTE:
* NVC0 doesn't like tex 3d on non-3d textures, but there should
* only be 2d and 2d-array MS resources anyway.
@@ -581,11 +581,11 @@ nvc0_blit_zeta_to_colour_format(enum pipe_format format)
{
switch (format) {
case PIPE_FORMAT_Z16_UNORM: return PIPE_FORMAT_R16_UNORM;
- case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
- case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
+ case PIPE_FORMAT_Z24_UNORM_S8_UINT:
+ case PIPE_FORMAT_S8_UINT_Z24_UNORM:
case PIPE_FORMAT_Z24X8_UNORM: return PIPE_FORMAT_R8G8B8A8_UNORM;
case PIPE_FORMAT_Z32_FLOAT: return PIPE_FORMAT_R32_FLOAT;
- case PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED: return PIPE_FORMAT_R32G32_FLOAT;
+ case PIPE_FORMAT_Z32_FLOAT_S8X24_UINT: return PIPE_FORMAT_R32G32_FLOAT;
default:
assert(0);
return PIPE_FORMAT_NONE;
@@ -600,14 +600,14 @@ nvc0_blitctx_get_color_mask_and_fp(struct nvc0_blitctx *blit,
switch (format) {
case PIPE_FORMAT_Z24X8_UNORM:
- case PIPE_FORMAT_Z24_UNORM_S8_USCALED:
+ case PIPE_FORMAT_Z24_UNORM_S8_UINT:
blit->fp_offset = 0x180;
if (mask & PIPE_MASK_Z)
blit->color_mask |= 0x0111;
if (mask & PIPE_MASK_S)
blit->color_mask |= 0x1000;
break;
- case PIPE_FORMAT_S8_USCALED_Z24_UNORM:
+ case PIPE_FORMAT_S8_UINT_Z24_UNORM:
blit->fp_offset = 0x80;
if (mask & PIPE_MASK_Z)
blit->color_mask |= 0x1110;