From 28e80d7136b5b6ec758890a2d5b325d527d7dda9 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 21 Jun 2013 09:22:39 -0700 Subject: [PATCH] i965: Drop i915 code from intel_screen. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/intel_screen.c | 20 +------------------- src/mesa/drivers/dri/i965/intel_screen.h | 1 - 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 61972dfe461..8d9d2673146 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1165,20 +1165,6 @@ set_max_gl_versions(struct intel_screen *screen) screen->max_gl_es1_version = 11; screen->max_gl_es2_version = 20; break; - case 3: { - screen->max_gl_core_version = 0; - screen->max_gl_es1_version = 11; - screen->max_gl_compat_version = 21; - screen->max_gl_es2_version = 20; - - break; - } - case 2: - screen->max_gl_core_version = 0; - screen->max_gl_compat_version = 13; - screen->max_gl_es1_version = 11; - screen->max_gl_es2_version = 0; - break; default: assert(!"unrecognized intel_screen::gen"); break; @@ -1244,12 +1230,8 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp) intelScreen->gen = 6; } else if (IS_GEN5(intelScreen->deviceID)) { intelScreen->gen = 5; - } else if (IS_965(intelScreen->deviceID)) { - intelScreen->gen = 4; - } else if (IS_9XX(intelScreen->deviceID)) { - intelScreen->gen = 3; } else { - intelScreen->gen = 2; + intelScreen->gen = 4; } intelScreen->hw_has_separate_stencil = intelScreen->gen >= 6; diff --git a/src/mesa/drivers/dri/i965/intel_screen.h b/src/mesa/drivers/dri/i965/intel_screen.h index 188e2c09c99..3b99b8234bc 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.h +++ b/src/mesa/drivers/dri/i965/intel_screen.h @@ -60,7 +60,6 @@ struct intel_screen bool hw_has_llc; bool hw_has_swizzling; - bool no_vbo; dri_bufmgr *bufmgr; /** -- 2.30.2