From: Marek Olšák <maraeo@gmail.com>
Date: Tue, 14 Feb 2012 14:48:37 +0000 (+0100)
Subject: Revert "r600g: don't advertise integer textures without GLSL 1.3"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=39b0da9f8d04315c698f8611304d1a66e8505c6c;p=mesa.git

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.
---

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;