diff options
| author | Marek Olšák <[email protected]> | 2013-03-01 15:30:39 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-03-11 13:43:36 +0100 |
| commit | 43d3e0cd3d0d5b557223a2330f490de43e5d6a90 (patch) | |
| tree | e806fdefc3b6bb116900515e80ea6fab5decad33 | |
| parent | b21a9d46e4be0c666327569f07b9cddeb4d42d38 (diff) | |
r600g: don't check for R600_ENABLE_S3TC env var
| -rw-r--r-- | src/gallium/drivers/r600/r600_texture.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index acea19d7744..aefc40fca17 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -989,7 +989,7 @@ uint32_t r600_translate_texformat(struct pipe_screen *screen, uint32_t result = 0, word4 = 0, yuv_format = 0; const struct util_format_description *desc; boolean uniform = TRUE; - static int r600_enable_s3tc = -1; + bool enable_s3tc = rscreen->info.drm_minor >= 9; bool is_srgb_valid = FALSE; const unsigned char swizzle_xxxx[4] = {0, 0, 0, 0}; const unsigned char swizzle_yyyy[4] = {1, 1, 1, 1}; @@ -1083,15 +1083,8 @@ uint32_t r600_translate_texformat(struct pipe_screen *screen, break; } - if (r600_enable_s3tc == -1) { - if (rscreen->info.drm_minor >= 9) - r600_enable_s3tc = 1; - else - r600_enable_s3tc = debug_get_bool_option("R600_ENABLE_S3TC", FALSE); - } - if (desc->layout == UTIL_FORMAT_LAYOUT_RGTC) { - if (!r600_enable_s3tc) + if (!enable_s3tc) goto out_unknown; switch (format) { @@ -1116,7 +1109,7 @@ uint32_t r600_translate_texformat(struct pipe_screen *screen, if (desc->layout == UTIL_FORMAT_LAYOUT_S3TC) { - if (!r600_enable_s3tc) + if (!enable_s3tc) goto out_unknown; if (!util_format_s3tc_enabled) { |