summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rwxr-xr-xegl_1_4/34GetConfigs.c2
-rwxr-xr-xegl_1_4/3AGetProcAddress.c11
-rwxr-xr-xpackaging/simulator-opengl.spec2
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