diff options
| author | Zack Rusin <zackr@vmware.com> | 2010-03-31 22:16:09 -0400 |
|---|---|---|
| committer | Zack Rusin <zackr@vmware.com> | 2010-03-31 22:16:09 -0400 |
| commit | b6d052e4fd83d923776320cf5fef66abcd4bf3d0 (patch) | |
| tree | f68676e2c833965424ea82ef466ce83f8be25310 /src/gallium/drivers/nv50/nv50_surface.c | |
| parent | ae5487d4276007e466b6a7c783d6fb740f9539c5 (diff) | |
| parent | 2fb655d1dbb3f8425aeff1597271262661ef206b (diff) | |
Merge remote branch 'origin/master' into gallium_draw_llvm
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_surface.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_surface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c index 6467c48a32..7a9dada531 100644 --- a/src/gallium/drivers/nv50/nv50_surface.c +++ b/src/gallium/drivers/nv50/nv50_surface.c @@ -60,8 +60,8 @@ nv50_format(enum pipe_format format) /* only because we require src format == dst format: */ case PIPE_FORMAT_R16G16_SNORM: case PIPE_FORMAT_R16G16_UNORM: - case PIPE_FORMAT_S8Z24_UNORM: - case PIPE_FORMAT_Z24S8_UNORM: + case PIPE_FORMAT_S8_USCALED_Z24_UNORM: + case PIPE_FORMAT_Z24_UNORM_S8_USCALED: return NV50_2D_DST_FORMAT_A8R8G8B8_UNORM; case PIPE_FORMAT_L8A8_UNORM: case PIPE_FORMAT_B4G4R4A4_UNORM: |