summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/glformats.c
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2019-09-17 14:54:48 -0700
committerEric Anholt <[email protected]>2019-10-17 21:07:29 +0000
commit7be72b24f50f71257453e14cc30d33cd45fae21e (patch)
tree53f38c9d8bde8fbc44bf8c1208da74e1f3eed28f /src/mesa/main/glformats.c
parentdf5fe86232039b4179105c92fbccd6a809388a15 (diff)
mesa: Fix depth/stencil ordering in _mesa_format_from_format_and_type().
The GL spec says the 24-bit component is in the high bits, and format_unpack.c looks at the high 24 bits in the S8Z24 case, not Z24SS8. Avoids a regression in the next commit. Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main/glformats.c')
-rw-r--r--src/mesa/main/glformats.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 7df26189359..3ab06456e8b 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -3737,7 +3737,7 @@ _mesa_format_from_format_and_type(GLenum format, GLenum type)
break;
case GL_UNSIGNED_INT_24_8:
if (format == GL_DEPTH_STENCIL)
- return MESA_FORMAT_Z24_UNORM_S8_UINT;
+ return MESA_FORMAT_S8_UINT_Z24_UNORM;
break;
case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
if (format == GL_DEPTH_STENCIL)