diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-22 11:10:19 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-22 11:10:19 -0600 |
| commit | b4a191e351ff1ac1cd27cd7e02d169958a78ca86 (patch) | |
| tree | 2950f02f126fb3dcd63d908b11717f3e0cc2ff25 /src/mesa/state_tracker/st_format.c | |
| parent | 2eea1714fdffbd665a2076c7b8fed7b264a42968 (diff) | |
| parent | b1a9c76b574f4da6b87c5a0750bfbe5bc98d1f4e (diff) | |
Merge branch '7.8'
Conflicts:
src/mesa/state_tracker/st_format.c
Diffstat (limited to 'src/mesa/state_tracker/st_format.c')
| -rw-r--r-- | src/mesa/state_tracker/st_format.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 8a366d834e..d7f5b1ea24 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -160,6 +160,10 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat) return PIPE_FORMAT_S8_USCALED_Z24_UNORM; case MESA_FORMAT_S8_Z24: return PIPE_FORMAT_Z24_UNORM_S8_USCALED; + case MESA_FORMAT_Z24_X8: + return PIPE_FORMAT_X8Z24_UNORM; + case MESA_FORMAT_X8_Z24: + return PIPE_FORMAT_Z24X8_UNORM; case MESA_FORMAT_YCBCR: return PIPE_FORMAT_UYVY; #if FEATURE_texture_s3tc |