summaryrefslogtreecommitdiff
authorIan Romanick <ian.d.romanick@intel.com>2012-08-21 22:53:27 (GMT)
committer Ian Romanick <ian.d.romanick@intel.com>2013-01-21 16:46:21 (GMT)
commit9bdf5bef762acdc7169eceff8c0eef0efe88cdbe (patch) (side-by-side diff)
treeac7aa453ac09476324064dd7c7401d9b52a6edcd
parent4a1af434e6bfc80fceab2a472e7a79de59aca823 (diff)
downloadmesa-9bdf5bef762acdc7169eceff8c0eef0efe88cdbe.zip
mesa-9bdf5bef762acdc7169eceff8c0eef0efe88cdbe.tar.gz
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>
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xsrc/mesa/drivers/dri/intel/intel_extensions.c2
-rw-r--r--src/mesa/drivers/dri/intel/intel_screen.c23
2 files changed, 5 insertions, 20 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 1562f59..4e7b5da 100755
--- 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 c0b63d3..750cb78 100644
--- 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: