diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2012-09-28 15:38:26 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-09-28 15:39:17 -0700 |
| commit | e87c63f2889fcbeb5a8bbd91eda1333d7ed44bf2 (patch) | |
| tree | ce30a98e665d26526b9e566d21e40be5962e03c8 | |
| parent | de958de71b1450952e021af4e729c87406353db6 (diff) | |
i965: brwInitVtbl needs to know the chipset generation
Fixes major regressions since de958de.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vtbl.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 418c8737145..e94df2658ce 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -140,6 +140,11 @@ brwCreateContext(int api, return false; } + /* brwInitVtbl needs to know the chipset generation so that it can set the + * right pointers. + */ + brw->intel.gen = screen->gen; + brwInitVtbl( brw ); brwInitDriverFunctions(screen, &functions); diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c index 9951e7da2cc..ca2e7a9a5ba 100644 --- a/src/mesa/drivers/dri/i965/brw_vtbl.c +++ b/src/mesa/drivers/dri/i965/brw_vtbl.c @@ -249,6 +249,7 @@ void brwInitVtbl( struct brw_context *brw ) brw->intel.vtbl.render_target_supported = brw_render_target_supported; brw->intel.vtbl.is_hiz_depth_format = brw_is_hiz_depth_format; + assert(brw->intel.gen >= 4); if (brw->intel.gen >= 7) { gen7_init_vtable_surface_functions(brw); } else if (brw->intel.gen >= 4) { |