diff options
| author | Sangjin Kim <sangjin3.kim@samsung.com> | 2012-09-07 16:37:43 +0900 |
|---|---|---|
| committer | Sangjin Kim <sangjin3.kim@samsung.com> | 2012-09-07 16:37:43 +0900 |
| commit | 3c5625e0d08d765e9c832327203d757210c5c5d8 (patch) | |
| tree | dcf4ac3a663b7787a5ff54f4a0fa7e004ca918cf | |
| parent | bffcebb7116b9468aadbc09cea3a6c4f579ec217 (diff) | |
| download | simulator-opengl-3c5625e0d08d765e9c832327203d757210c5c5d8.tar.gz simulator-opengl-3c5625e0d08d765e9c832327203d757210c5c5d8.tar.bz2 simulator-opengl-3c5625e0d08d765e9c832327203d757210c5c5d8.zip | |
[Title] WebProcess crash bug fix.
[Type] bug fix
[Module] opengl
[Priority]
[CQ#] WEB-1743
[Redmine#]
[Problem] Web Process crash when reload specific webpage.
[Cause]
[Solution]
[TestCase]
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | egl_1_4/34GetConfigs.c | 2 | ||||
| -rwxr-xr-x | egl_1_4/3AGetProcAddress.c | 11 | ||||
| -rwxr-xr-x | packaging/simulator-opengl.spec | 2 |
4 files changed, 12 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 11ae825..09dbf96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +simulator-opengl (0.1.33) unstable; urgency=low + + * WebProcess crash bug fix. + * Git: 112.106.1.251:sdk/simulator-opengl + * Tag: simulator-opengl_0.1.33 + + -- Sangjin Kim <sangjin3.kim@samsung.com> Fri, 07 Sep 2012 16:34:37 +0900 + simulator-opengl (0.1.32) unstable; urgency=low * eglBindAPI bug fix. diff --git a/egl_1_4/34GetConfigs.c b/egl_1_4/34GetConfigs.c index 700980a..19222f1 100755 --- a/egl_1_4/34GetConfigs.c +++ b/egl_1_4/34GetConfigs.c @@ -162,7 +162,7 @@ int EGLAPIENTRY EGLINTER(PrepareConfig)(struct DisplayExtra* pDisplay) { return 0; } pDisplay->pConfigAnswer = pAnswerArea; - assert(nTotalConfig > 0); + //assert(nTotalConfig > 0); return nTotalConfig; } diff --git a/egl_1_4/3AGetProcAddress.c b/egl_1_4/3AGetProcAddress.c index a78660a..80dec6c 100755 --- a/egl_1_4/3AGetProcAddress.c +++ b/egl_1_4/3AGetProcAddress.c @@ -42,21 +42,14 @@ __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const cha return NULL; } } - char *error; - dlerror(); if ((fpAnswer = dlsym(EGLINTER(global).dlEGL, procname)) != NULL) { - if ((error = dlerror()) != NULL) { - fprintf(stderr, "edwin:%s\n", error); - } return fpAnswer; } - if ((error = dlerror()) != NULL) { - fprintf(stderr, "edwin:2:%s\n", error); - } + void** ptrDLL = NULL; char* sofilename; char* libname; - //EGLContext eglContext = eglGetCurrentContext(); + EGLContext eglContext = _eglGetCurrentContext(); if (eglContext != EGL_NO_CONTEXT) { struct ContextExtra* pContext = EGLINTER(LookUpContext)(eglContext); diff --git a/packaging/simulator-opengl.spec b/packaging/simulator-opengl.spec index 2b88302..33bd76f 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.32 +Version: 0.1.33 Release: 1 Group: TO_BE/FILLED_IN License: TO_BE/FILLED_IN |