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 42d2e874597928596656ea07231cc893901cb988..b8825163161a9e7581b937557af82c4f8fc24107 100644 (file)
--- 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 4955c82b1206060e34a85f09ab7b77de74864955..0d83fa608fbb66eb47c53cbd6114d67fe1d75f2e 100644 (file)
--- 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;