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>
This commit is contained in:
Ian Romanick 2012-08-21 15:53:27 -07:00
parent 4a1af434e6
commit 9bdf5bef76
2 changed files with 5 additions and 20 deletions

View File

@ -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;

View File

@ -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: