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

This commit is contained in:
Jason Ekstrand 2015-06-23 18:05:25 -07:00
commit a62edcce4e
807 changed files with 41237 additions and 31088 deletions

View file

@ -719,10 +719,9 @@ anv_compiler_create(struct anv_device *device)
compiler->brw->intelScreen = compiler->screen;
compiler->screen->devinfo = &device->info;
brw_process_intel_debug_variable(compiler->brw);
brw_process_intel_debug_variable(compiler->screen);
if (device->info.gen >= 8 && !(INTEL_DEBUG & DEBUG_VEC4VS))
compiler->brw->scalar_vs = true;
compiler->screen->compiler = brw_compiler_create(compiler, &device->info);
ctx = &compiler->brw->ctx;
_mesa_init_shader_object_functions(&ctx->Driver);
@ -736,7 +735,6 @@ anv_compiler_create(struct anv_device *device)
/* Set dd::NewShader */
brwInitFragProgFuncs(&ctx->Driver);
compiler->screen->compiler = brw_compiler_create(compiler, &device->info);
ctx->_Shader = &compiler->pipeline;
compiler->brw->precompile = false;