st/mesa: optimize DEPTH_STENCIL copies using fragment shader

[mesa.git] / src / mesa / main / texcompress_astc.cpp

diff --git a/src/mesa/main/texcompress_astc.cpp b/src/mesa/main/texcompress_astc.cpp
index 23540c47017ebb59b340c4edd495d722fb6235b0..583e582a4b6378c07d1562bbd8e9b9081a38863a 100644 (file)
--- a/src/mesa/main/texcompress_astc.cpp
+++ b/src/mesa/main/texcompress_astc.cpp
@@ -37,6 +37,7 @@
 #include "macros.h"
 #include "util/half_float.h"
 #include <stdio.h>
+#include <cstdlib>  // for abort() on windows
 
 static bool VERBOSE_DECODE = false;
 static bool VERBOSE_WRITE = false;
@@ -1830,7 +1831,7 @@ _mesa_unpack_astc_2d_ldr(uint8_t *dst_row,
                          mesa_format format)
 {
    assert(_mesa_is_format_astc_2d(format));
-   bool srgb = _mesa_get_format_color_encoding(format) == GL_SRGB;
+   bool srgb = _mesa_is_format_srgb(format);
 
    unsigned blk_w, blk_h;
    _mesa_get_format_block_size(format, &blk_w, &blk_h);