glamor: Changes to 'master'
Zhigang Gong
gongzg at kemper.freedesktop.org
Tue Feb 7 22:09:42 PST 2012
configure.ac | 2
src/Makefile.am | 13 ++---
src/glamor.c | 40 ++++++++--------
src/glamor.h | 76 ++++++++++++++++---------------
src/glamor_core.c | 7 +-
src/glamor_egl.c | 117 +++++++++++++++++++++++++++++++------------------
src/glamor_eglmodule.c | 7 +-
src/glamor_fbo.c | 2
src/glamor_fill.c | 5 --
src/glamor_pixmap.c | 3 -
src/glamor_priv.h | 60 ++++++++++++++++++++-----
src/glamor_tile.c | 7 --
src/glamor_utils.h | 56 +++++++++++++++++++++++
13 files changed, 260 insertions(+), 135 deletions(-)
New commits:
commit d9bbe219c1bc2a677aad47a72f31bc942ef70431
Author: Zhigang Gong <zhigang.gong at linux.intel.com>
Date: Fri Feb 3 11:46:01 2012 +0800
glamor_dump_pixmap: Add helper routine to dump pixmap.
For debug purpose only to dump the pixmap's content.
As this function will call glamor_prepare_access/glamor_finish_access
internally. Please use it carefully.
Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>
commit 492578de39def2ee2397e7f8938c12e7b85ea138
Author: Zhigang Gong <zhigang.gong at linux.intel.com>
Date: Fri Feb 3 11:44:51 2012 +0800
glamor_fill/tile: Fixed a tileX/tileY calculation bug.
The previous's calculation is incorrect, now fix it and then
we don't need to fallback at glamor_tile.
Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>
Tested-by: Peng Li <peng.li at intel.com>
commit b982edcfd1ab6b254539fabae7702c54b47249eb
Author: Zhigang Gong <zhigang.gong at linux.intel.com>
Date: Fri Feb 3 11:21:37 2012 +0800
prepare_access: Don't use fbo after it was downloaded.
We add a new gl_fbo status GLAMOR_FBO_DOWNLOADED to indicate
the fbo was already downloaded to CPU. Then latter the access
to this pixmap will be treated as pure CPU access. In glamor,
if we fallback to DDX/fbXXX, then we fallback everything
currently. We don't support to jump into glamor acceleration
layer between a prepare_access/finish_access. Actually, fbCopyPlane
is such a function which may call to acceleration function within
it. Then we must mark the downloaded pixmap to another state
rather than a normal fbo textured pixmap, and then stick to use
it as a in-memory pixmap.
Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>
Tested-by: Peng Li <peng.li at intel.com>
commit b5f8dbbd74d76546b618fc48418df810d27b651b
Author: Zhigang Gong <zhigang.gong at linux.intel.com>
Date: Thu Feb 2 11:21:05 2012 +0800
glamor_eglmodule: Change module name according to normalize naming rule.
As Xorg module loader will normalize module name which will
remove '_' when we put "glamor_egl" to the configure file,
then it will fail to find us.
Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>
commit b5080dcb2dea75f3199c00ec9b2dbdd2c6313abc
Author: Zhigang Gong <zhigang.gong at linux.intel.com>
Date: Thu Feb 2 09:34:42 2012 +0800
Don't call dixSetPrivate directly.
We may change the way to set/get those private data latter.
consolidate to glamor_set_pixmap/screen_private is better
than call those dixSetPrivate directly.
Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>
commit 1bc8bf32ea09fbb614c004ba11e04e85f3b02dd5
Author: Zhigang Gong <zhigang.gong at linux.intel.com>
Date: Tue Jan 31 18:16:58 2012 +0800
Refine CloseScreen and FreeScreen processes.
This commit move the calling to glamor_close_screen from
glamor_egl_free_screen to glamor_egl_close_screen, as this
is the right place to do this.
We should detach screen fbo and destroy the corresponding
KHR image at glamor_egl_close_screen stage. As latter
DDX driver will call DestroyPixmap to destroy screen pixmap,
if the fbo and image are still there but glamor screen private
data pointer has been freed, then it causes segfault.
This commit also introduces a new flag GLAMOR_USE_EGL_SCREEN.
if DDX driver is using EGL layer then should set this bit
when call to glamor_init and then both glamor_close_screen
and glamor_egl_close_screen will be registered correctly,
DDX layer will not need to call these two functions manually.
This way is also the preferred method within Xorg domain.
As interfaces changed, bump the version to 0.3.0.
Signed-off-by: Zhigang Gong <zhigang.gong at linux.intel.com>
Tested-by: Peng Li <peng.li at intel.com>
More information about the xorg-commit
mailing list