KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gallium dri compile and a merge conflict

This commit is contained in:
Kristian Høgsberg 2011-11-02 12:01:23 -04:00
parent 292c21bfdc
commit d14a107158
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/state_trackers/dri/drm/dri2.c
View File

@ -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,
};

1
src/gallium/state_trackers/dri/sw/dri_drawable.c Symbolic link
View File

@ -0,0 +1 @@
../common/dri_drawable.c

1
src/gallium/targets/Makefile.dri
View File

@ -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