Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_types.cpp
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/s_expression.cpp
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c

1 files changed, 0 insertions, 2 deletions

diff --git a/mesalib/src/mesa/drivers/common/driverfuncs.c b/mesalib/src/mesa/drivers/common/driverfuncs.c
index 4806d5d67..a2687d7c3 100644
--- a/mesalib/src/mesa/drivers/common/driverfuncs.c
+++ b/mesalib/src/mesa/drivers/common/driverfuncs.c
@@ -95,8 +95,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->TexSubImage2D = _mesa_store_texsubimage2d;

    driver->TexSubImage3D = _mesa_store_texsubimage3d;

    driver->GetTexImage = _mesa_get_teximage;

-   driver->CopyTexImage1D = _mesa_meta_CopyTexImage1D;

-   driver->CopyTexImage2D = _mesa_meta_CopyTexImage2D;

    driver->CopyTexSubImage1D = _mesa_meta_CopyTexSubImage1D;

    driver->CopyTexSubImage2D = _mesa_meta_CopyTexSubImage2D;

    driver->CopyTexSubImage3D = _mesa_meta_CopyTexSubImage3D;