Module: Mesa Branch: master Commit: d14a1071582c9a802f0b37556665b79f38f7eaae URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d14a1071582c9a802f0b37556665b79f38f7eaae
Author: Kristian Høgsberg <[email protected]> Date: Wed Nov 2 12:01:23 2011 -0400 Fix gallium dri compile and a merge conflict --- src/gallium/state_trackers/dri/drm/dri2.c | 8 -------- src/gallium/state_trackers/dri/sw/dri_drawable.c | 1 + src/gallium/targets/Makefile.dri | 1 - 3 files changed, 1 insertions(+), 9 deletions(-) diff --git a/src/gallium/state_trackers/dri/drm/dri2.c b/src/gallium/state_trackers/dri/drm/dri2.c index a62a084..357cc49 100644 --- a/src/gallium/state_trackers/dri/drm/dri2.c +++ b/src/gallium/state_trackers/dri/drm/dri2.c @@ -701,7 +701,6 @@ dri2_create_buffer(__DRIscreen * sPriv, * DRI versions differ in their implementation of init_screen and swap_buffers. */ const struct __DriverAPIRec driDriverAPI = { - .InitScreen = NULL, .InitScreen2 = dri2_init_screen, .DestroyScreen = dri_destroy_screen, .CreateContext = dri_create_context, @@ -711,13 +710,6 @@ const struct __DriverAPIRec driDriverAPI = { .MakeCurrent = dri_make_current, .UnbindContext = dri_unbind_context, - .GetSwapInfo = NULL, - .GetDrawableMSC = NULL, - .WaitForMSC = NULL, - - .SwapBuffers = NULL, - .CopySubBuffer = NULL, - .AllocateBuffer = dri2_allocate_buffer, .ReleaseBuffer = dri2_release_buffer, }; diff --git a/src/gallium/state_trackers/dri/sw/dri_drawable.c b/src/gallium/state_trackers/dri/sw/dri_drawable.c new file mode 120000 index 0000000..0fc19be --- /dev/null +++ b/src/gallium/state_trackers/dri/sw/dri_drawable.c @@ -0,0 +1 @@ +../common/dri_drawable.c \ No newline at end of file diff --git a/src/gallium/targets/Makefile.dri b/src/gallium/targets/Makefile.dri index eb2d66c..e828d4f 100644 --- a/src/gallium/targets/Makefile.dri +++ b/src/gallium/targets/Makefile.dri @@ -12,7 +12,6 @@ MESA_MODULES = \ COMMON_GALLIUM_SOURCES = \ $(TOP)/src/mesa/drivers/dri/common/utils.c \ - $(TOP)/src/mesa/drivers/dri/common/vblank.c \ $(TOP)/src/mesa/drivers/dri/common/dri_util.c \ $(TOP)/src/mesa/drivers/dri/common/xmlconfig.c _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
