diff options
| author | Sven Gothel <[email protected]> | 2014-03-11 01:59:41 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-03-11 01:59:41 +0100 |
| commit | 39808869938902c4f1766cd0c5b2c430d810d001 (patch) | |
| tree | ea15ba938b676ba642aa54d158460080829c1b7d | |
| parent | 95690a4224a1235f76675700efacba17db1e9bbd (diff) | |
| parent | ba0dc6462a88ee7512a087deaaca760239915548 (diff) | |
Merge branch 'master' into 2.2-train
| -rw-r--r-- | doc/Platforms.txt | 28 | ||||
| -rw-r--r-- | make/config/jogl/glx-CustomCCode.c | 14 |
2 files changed, 38 insertions, 4 deletions
diff --git a/doc/Platforms.txt b/doc/Platforms.txt index 7fbb65bcf..00200ae91 100644 --- a/doc/Platforms.txt +++ b/doc/Platforms.txt @@ -60,3 +60,31 @@ - PowerVR (ES2) 32bit only (*) Regular tested component / platform + +virtualbox-4.3_4.3.8-92456 + - Host Debian 8 (Jessie) + - Host GPU: NV w/ NV proprietary driver + + - Guest Debian 7 (Wheezy) + - Mesa 8.0.5 LLVM: + - Onscreen: OK + - FBO: OK + - FBO.MSAA: NO (gl-error, failure) + - PBuffer: OK + - Bitmap: OK + + - 3D Accel (Chromium 1.9): + - Onscreen: OK + - FBO: NO + - FBO.MSAA: NO (gl-error, failure) + - PBuffer: NO + - Bitmap: NO + + - Guest Debian 8 (Jessie) + - Mesa 9.2.2 Gallium LLVM + - Onscreen: OK + - FBO: OK + - FBO.MSAA: NO (properly reporting: N/A) + - PBuffer: OK + - Bitmap: OK + diff --git a/make/config/jogl/glx-CustomCCode.c b/make/config/jogl/glx-CustomCCode.c index 3f5cf1121..b077c65ac 100644 --- a/make/config/jogl/glx-CustomCCode.c +++ b/make/config/jogl/glx-CustomCCode.c @@ -141,13 +141,16 @@ Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXChooseFBConfig(JNIEnv *env, jclass _ count = _nitems_ptr[0]; if (NULL == _res) return NULL; - /** Bug 961: Validate returned 'GLXFBConfig *', i.e. remove NULL pointer. */ + /** + * Bug 961: Validate returned 'GLXFBConfig *', i.e. remove NULL pointer. + * Note: sizeof(GLXFBConfig) == sizeof(void*), a.k.a a pointer + */ // fprintf(stderr, "glXChooseFBConfig.0: Count %d\n", count); i=0; while( i < count ) { if( NULL == _res[i] ) { if( 0 < count-i-1 ) { - memmove(_res+i, _res+i+1, count-i-1); + memmove(_res+i, _res+i+1, (count-i-1)*sizeof(GLXFBConfig)); } count--; } else { @@ -188,12 +191,15 @@ Java_jogamp_opengl_x11_glx_GLX_dispatch_1glXGetFBConfigs(JNIEnv *env, jclass _un count = _nelements_ptr[0]; if (NULL == _res) return NULL; - /** Bug 961: Validate returned 'GLXFBConfig *', i.e. remove NULL pointer. */ + /** + * Bug 961: Validate returned 'GLXFBConfig *', i.e. remove NULL pointer. + * Note: sizeof(GLXFBConfig) == sizeof(void*), a.k.a a pointer + */ i=0; while( i < count ) { if( NULL == _res[i] ) { if( 0 < count-i-1 ) { - memmove(_res+i, _res+i+1, count-i-1); + memmove(_res+i, _res+i+1, (count-i-1)*sizeof(GLXFBConfig)); } count--; } else { |