Mesa (master): Revert "r600g: don' t advertise integer textures without GLSL 1.3"

Marek Olšák mareko at kemper.freedesktop.org
Tue Feb 14 14:49:41 UTC 2012


Module: Mesa
Branch: master
Commit: 39b0da9f8d04315c698f8611304d1a66e8505c6c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=39b0da9f8d04315c698f8611304d1a66e8505c6c

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Feb 14 15:48:37 2012 +0100

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, 0 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 42d2e87..b882516 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 4955c82..0d83fa6 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;




More information about the mesa-commit mailing list