i965: Enable floating-point textures always

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 1562f59d86d4428e9c484c11d1b1fcead5e7ec48..4e7b5da7accdaac1b67139f6b7f3eb0ecab5b225 100755 (executable)
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -135,11 +135,9 @@ intelInitExtensions(struct gl_context *ctx)
       ctx->Extensions.ARB_seamless_cube_map = true;
       ctx->Extensions.ARB_shader_bit_encoding = true;
       ctx->Extensions.ARB_shader_texture_lod = true;
-#ifdef TEXTURE_FLOAT_ENABLED
       ctx->Extensions.ARB_texture_float = true;
       ctx->Extensions.EXT_texture_shared_exponent = true;
       ctx->Extensions.EXT_packed_float = true;
-#endif
       ctx->Extensions.ARB_texture_compression_rgtc = true;
       ctx->Extensions.ARB_texture_rg = true;
       ctx->Extensions.ARB_vertex_type_2_10_10_10_rev = true;

diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index c0b63d3c1d35230daff2d65540a97b3e8b1d582d..750cb78832c85579858d14c2d976af0682015782 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -1039,15 +1039,9 @@ intel_screen_make_configs(__DRIscreen *dri_screen)
 static void
 set_max_gl_versions(struct intel_screen *screen)
 {
-#ifdef TEXTURE_FLOAT_ENABLED
-   bool has_texture_float = true;
-#else
-   bool has_texture_float = false;
-#endif
-
    switch (screen->gen) {
    case 7:
-      if (has_texture_float && screen->kernel_has_gen7_sol_reset) {
+      if (screen->kernel_has_gen7_sol_reset) {
          screen->max_gl_core_version = 31;
          screen->max_gl_compat_version = 30;
          screen->max_gl_es1_version = 11;
@@ -1060,17 +1054,10 @@ set_max_gl_versions(struct intel_screen *screen)
       }
       break;
    case 6:
-      if (has_texture_float) {
-         screen->max_gl_core_version = 31;
-         screen->max_gl_compat_version = 30;
-         screen->max_gl_es1_version = 11;
-         screen->max_gl_es2_version = 20;
-      } else {
-         screen->max_gl_core_version = 0;
-         screen->max_gl_compat_version = 21;
-         screen->max_gl_es1_version = 11;
-         screen->max_gl_es2_version = 20;
-      }
+      screen->max_gl_core_version = 31;
+      screen->max_gl_compat_version = 30;
+      screen->max_gl_es1_version = 11;
+      screen->max_gl_es2_version = 20;
       break;
    case 5:
    case 4: