i965: Drop i915 code from intel_screen.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 61972dfe4614236345663fab6ffdd6a8a8509717..8d9d267314687ca4f81ba5de0f1fb34a2abd3c0f 100644 (file)
--- 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 188e2c09c99b1f67d22accab238952f1dea99f49..3b99b8234bc6f3d1c01d68730c48282bf4711167 100644 (file)
--- 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;
 
    /**