Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / src / mesa / drivers / dri / i965 / brw_context.c

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index f428f58c69aa2a35165670c4a609ec9adb9b91fb..328662da82e803f2c64945c388ee95cad4d3ebd6 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -311,7 +311,7 @@ brw_init_driver_functions(struct brw_context *brw,
       functions->GetSamplePosition = gen6_get_sample_position;
 }
 
-static void
+void
 brw_initialize_context_constants(struct brw_context *brw)
 {
    struct gl_context *ctx = &brw->ctx;
@@ -390,7 +390,8 @@ brw_initialize_context_constants(struct brw_context *brw)
    int max_samples;
    const int *msaa_modes = intel_supported_msaa_modes(brw->intelScreen);
    const int clamp_max_samples =
-      driQueryOptioni(&brw->optionCache, "clamp_max_samples");
+      brw->optionCache.info != NULL ?
+         driQueryOptioni(&brw->optionCache, "clamp_max_samples") : -1;
 
    if (clamp_max_samples < 0) {
       max_samples = msaa_modes[0];
@@ -814,6 +815,7 @@ brwCreateContext(gl_api api,
 
    intel_batchbuffer_init(brw);
 
+#if 0
    if (brw->gen >= 6) {
       /* Create a new hardware context.  Using a hardware context means that
        * our GPU state will be saved/restored on context switch, allowing us
@@ -838,6 +840,7 @@ brwCreateContext(gl_api api,
    }
 
    brw_init_state(brw);
+#endif
 
    intelInitExtensions(ctx);
 
@@ -905,8 +908,10 @@ brwCreateContext(gl_api api,
 
    _mesa_compute_version(ctx);
 
+#if 0
    _mesa_initialize_dispatch_tables(ctx);
    _mesa_initialize_vbo_vtxfmt(ctx);
+#endif
 
    if (ctx->Extensions.AMD_performance_monitor) {
       brw_init_performance_monitors(brw);