Merge branch '7.8'

Conflicts:

	src/mesa/state_tracker/st_format.c

diff --cc src/mesa/drivers/dri/r300/r300_state.c
Simple merge

diff --cc src/mesa/state_tracker/st_format.c
index 8a366d834e7e552c385b88f2fec01359b8f7cf51,91e386c848ad0da67576d8f65ce1f47cdbd2be22..d7f5b1ea2473a113a94f1baadecb0de042eba15f
--- 1/src/mesa/state_tracker/st_format.c
--- 2/src/mesa/state_tracker/st_format.c
+++ b/src/mesa/state_tracker/st_format.c
@@@ -157,9 -151,13 +157,13 @@@ st_mesa_format_to_pipe_format(gl_forma
     case MESA_FORMAT_Z32:
        return PIPE_FORMAT_Z32_UNORM;
     case MESA_FORMAT_Z24_S8:
 -      return PIPE_FORMAT_S8Z24_UNORM;
 +      return PIPE_FORMAT_S8_USCALED_Z24_UNORM;
     case MESA_FORMAT_S8_Z24:
 -      return PIPE_FORMAT_Z24S8_UNORM;
 +      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