diff options
| author | Sangjin Kim <sangjin3.kim@samsung.com> | 2012-09-07 18:18:29 +0900 |
|---|---|---|
| committer | Sangjin Kim <sangjin3.kim@samsung.com> | 2012-09-07 18:18:29 +0900 |
| commit | 7a766bf66498defb8e7477c6c402e23f1d04451b (patch) | |
| tree | 1c121e1fe16ed746c32a864cf8e52e3422dfc969 | |
| parent | 3c5625e0d08d765e9c832327203d757210c5c5d8 (diff) | |
| download | simulator-opengl-7a766bf66498defb8e7477c6c402e23f1d04451b.tar.gz simulator-opengl-7a766bf66498defb8e7477c6c402e23f1d04451b.tar.bz2 simulator-opengl-7a766bf66498defb8e7477c6c402e23f1d04451b.zip | |
[Title] pixmap detection bug fix.submit/master/20120920.1512032.0_alphamaster
[Type] bug fix
[Module] opengl
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | libGL/client_glx.c | 5 | ||||
| -rwxr-xr-x | packaging/simulator-opengl.spec | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 09dbf96..279d383 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +simulator-opengl (0.1.34) unstable; urgency=low + + * pixmap detection check. + * Git: 112.106.1.251:sdk/simulator-opengl + * Tag: simulator-opengl_0.1.34 + + -- Sangjin3.kim <sangjin3.kim@samsung.com> Fri, 07 Sep 2012 18:15:52 +0900 + simulator-opengl (0.1.33) unstable; urgency=low * WebProcess crash bug fix. diff --git a/libGL/client_glx.c b/libGL/client_glx.c index 77a9c76..dd23ea1 100755 --- a/libGL/client_glx.c +++ b/libGL/client_glx.c @@ -511,9 +511,12 @@ static void _get_window_info(Display *dpy, Window win, WindowInfoStruct* info) #ifndef XCB_EVENT_ERROR_BAD_MATCH #define XCB_EVENT_ERROR_BAD_MATCH 8 +#define XCB_EVENT_ERROR_BAD_WINDOW 3 #endif /* BAD_MATCH indicate the drawable is PIXMAP instead of window */ - if ( !attr && error->error_code != XCB_EVENT_ERROR_BAD_MATCH ) + if ( !attr && + error->error_code != XCB_EVENT_ERROR_BAD_MATCH && + error->error_code != XCB_EVENT_ERROR_BAD_WINDOW ) { info->width = 0; info->height= 0; diff --git a/packaging/simulator-opengl.spec b/packaging/simulator-opengl.spec index 33bd76f..5bdce88 100755 --- a/packaging/simulator-opengl.spec +++ b/packaging/simulator-opengl.spec @@ -1,7 +1,7 @@ #sbs-git:slp/sdk/simulator-opengl Name: simulator-opengl Summary: opengl-es acceleration module for emulator -Version: 0.1.33 +Version: 0.1.34 Release: 1 Group: TO_BE/FILLED_IN License: TO_BE/FILLED_IN |