diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-03-30 01:35:49 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-03-30 01:35:49 +0200 |
| commit | 6fb364a1717858d8201b2caf234076ce5d4832ac (patch) | |
| tree | d5ba16307b15eeec7f1109bde41cc45c4aab6bcd /src/gallium/state_trackers/egl/x11 | |
| parent | 4e9690f00ca67e42e31367c50f9c216ad10ef553 (diff) | |
gallium: adapt all code to the renamed depth/stencil formats
Diffstat (limited to 'src/gallium/state_trackers/egl/x11')
| -rw-r--r-- | src/gallium/state_trackers/egl/x11/native_dri2.c | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/egl/x11/native_ximage.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/egl/x11/native_dri2.c b/src/gallium/state_trackers/egl/x11/native_dri2.c index 9839979231..8c0553ce0d 100644 --- a/src/gallium/state_trackers/egl/x11/native_dri2.c +++ b/src/gallium/state_trackers/egl/x11/native_dri2.c @@ -558,8 +558,8 @@ choose_depth_stencil_format(const __GLcontextModes *mode, break; case 24: if (mode->stencilBits) { - formats[count++] = PIPE_FORMAT_Z24S8_UNORM; - formats[count++] = PIPE_FORMAT_S8Z24_UNORM; + formats[count++] = PIPE_FORMAT_Z24_UNORM_S8_USCALED; + formats[count++] = PIPE_FORMAT_S8_USCALED_Z24_UNORM; } else { formats[count++] = PIPE_FORMAT_Z24X8_UNORM; diff --git a/src/gallium/state_trackers/egl/x11/native_ximage.c b/src/gallium/state_trackers/egl/x11/native_ximage.c index c6b16354f9..d69011ac5e 100644 --- a/src/gallium/state_trackers/egl/x11/native_ximage.c +++ b/src/gallium/state_trackers/egl/x11/native_ximage.c @@ -526,8 +526,8 @@ ximage_display_get_configs(struct native_display *ndpy, int *num_configs) xconf->base.stencil_format = PIPE_FORMAT_NONE; /* create the second config with depth/stencil buffer */ if (j == 1) { - xconf->base.depth_format = PIPE_FORMAT_Z24S8_UNORM; - xconf->base.stencil_format = PIPE_FORMAT_Z24S8_UNORM; + xconf->base.depth_format = PIPE_FORMAT_Z24_UNORM_S8_USCALED; + xconf->base.stencil_format = PIPE_FORMAT_Z24_UNORM_S8_USCALED; mode->depthBits = 24; mode->stencilBits = 8; mode->haveDepthBuffer = TRUE; |