From 39b0da9f8d04315c698f8611304d1a66e8505c6c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 14 Feb 2012 15:48:37 +0100 Subject: [PATCH] Revert "r600g: don't advertise integer textures without GLSL 1.3" This reverts commit 2c06bcb90982280e82a044b8be83be8fdf5a9590. It breaks u_blitter trying to blit compressed textures as uint. --- src/gallium/drivers/r600/evergreen_state.c | 4 ---- src/gallium/drivers/r600/r600_state.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 42d2e874597..b8825163161 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -708,10 +708,6 @@ boolean evergreen_is_format_supported(struct pipe_screen *screen, if (!util_format_is_supported(format, usage)) return FALSE; - if (util_format_is_pure_integer(format) && - screen->get_param(screen, PIPE_CAP_GLSL_FEATURE_LEVEL) < 130) - return FALSE; - /* Multisample */ if (sample_count > 1) return FALSE; diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 4955c82b120..0d83fa608fb 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -660,10 +660,6 @@ boolean r600_is_format_supported(struct pipe_screen *screen, if (!util_format_is_supported(format, usage)) return FALSE; - if (util_format_is_pure_integer(format) && - screen->get_param(screen, PIPE_CAP_GLSL_FEATURE_LEVEL) < 130) - return FALSE; - /* Multisample */ if (sample_count > 1) return FALSE; -- 2.30.2