Merge branch 'devel/dri3' into devel/tizen 48/28248/1
authorRoman Marchenko <r.marchenko@samsung.com>
Tue, 30 Sep 2014 13:37:07 +0000 (16:37 +0300)
committerRoman Marchenko <r.marchenko@samsung.com>
Wed, 1 Oct 2014 07:26:56 +0000 (10:26 +0300)
commit879e6cdc04bfe6102a5ed7409666c2d1530c8754
treedf26ddf6f6ea939c8d0efb2d7f6e7ddfc4225344
parenta1c9338b042747315b1b2ae60ceede928f3eb3a9
parent4bf20658bcae03148d8342c1f847013d66fc7fe7
Merge branch 'devel/dri3' into devel/tizen

Conflicts:
src/crtcconfig/sec_crtc.c

Note that Present extension might don't work with "xdbg".
So for using Present you should disable "xdbg" (remove "#define USE_XDBG 1" in "sec.h")
or set the latest version of "xdbg" from tizen.org server

Change-Id: If6f68410d97b87555486187797c0d193771be0a7
Signed-off-by: Roman Marchenko <r.marchenko@samsung.com>
src/Makefile.am
src/accel/sec_dri2.c
src/crtcconfig/sec_display.c
src/crtcconfig/sec_display.h
src/sec.c
src/sec.h
src/util/sec_util.h