Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/main/texgetimage.c
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/swrast/s_texrender.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	xorg-server/xkeyboard-config/configure.in

1 files changed, 2 insertions, 3 deletions

diff --git a/mesalib/src/mesa/drivers/common/driverfuncs.c b/mesalib/src/mesa/drivers/common/driverfuncs.c
index 830fcf8a2..4806d5d67 100644
--- a/mesalib/src/mesa/drivers/common/driverfuncs.c
+++ b/mesalib/src/mesa/drivers/common/driverfuncs.c
@@ -40,7 +40,6 @@
 #include "main/texstore.h"

 #include "main/bufferobj.h"

 #include "main/fbobject.h"

-#include "main/texrender.h"

 #include "main/samplerobj.h"

 #include "main/syncobj.h"

 #include "main/texturebarrier.h"

@@ -183,8 +182,8 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
 

    driver->NewFramebuffer = _mesa_new_framebuffer;

    driver->NewRenderbuffer = _mesa_new_soft_renderbuffer;

-   driver->RenderTexture = _mesa_render_texture;

-   driver->FinishRenderTexture = _mesa_finish_render_texture;

+   driver->RenderTexture = _swrast_render_texture;

+   driver->FinishRenderTexture = _swrast_finish_render_texture;

    driver->FramebufferRenderbuffer = _mesa_framebuffer_renderbuffer;

    driver->ValidateFramebuffer = _mesa_validate_framebuffer;