diff options
| author | Sven Gothel <[email protected]> | 2014-10-10 03:37:21 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-10-10 03:39:27 +0200 |
| commit | b24687d46b2374967ea874f54707610138cad477 (patch) | |
| tree | e46fa3f5c5337e54e40267418d7710fed93f9222 /make | |
| parent | 60e7b83b283cc733b0c914b1f6851a23edbab3c5 (diff) | |
Bug 1093 - NEWT PointerIcon swizzled on X11 and OSX; WindowIcon swizzled on OSX ([R] -> [B])
Following mistakes were made in native PixelFormat
for PointerIcon and WindowIcon:
PointerIcon:
X11: RGBA8888 -> BGRA8888
OSX: BGRA8888 -> RGBA8888
WindowIcon:
OSX: BGRA8888 -> RGBA8888
Test case: TestWindowAndPointerIconNEWT
(requires visual validation)
+++
Summary:
PointerIcon:
BGRA8888: X11, Win32
RGBA8888: OSX
WindowIcon:
BGRA8888: X11, Win32
RGBA8888: OSX
+++
Reported by 'LT'
<http://forum.jogamp.org/Mac-OSX-newt-pointer-and-window-icon-displays-incorrectly-tp4033294.html>
Conflicts:
make/scripts/tests-win.bat
Diffstat (limited to 'make')
| -rw-r--r-- | make/resources/assets-test/arrow-blue-alpha-64x64.png | bin | 0 -> 2327 bytes | |||
| -rw-r--r-- | make/resources/assets-test/arrow-red-alpha-64x64.png | bin | 0 -> 2331 bytes | |||
| -rw-r--r-- | make/resources/assets-test/red-16x16.png | bin | 0 -> 168 bytes | |||
| -rw-r--r-- | make/resources/assets-test/red-32x32.png | bin | 0 -> 383 bytes | |||
| -rwxr-xr-x | make/scripts/tests-win.bat | 5 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 1 |
6 files changed, 4 insertions, 2 deletions
diff --git a/make/resources/assets-test/arrow-blue-alpha-64x64.png b/make/resources/assets-test/arrow-blue-alpha-64x64.png Binary files differnew file mode 100644 index 000000000..ec29db526 --- /dev/null +++ b/make/resources/assets-test/arrow-blue-alpha-64x64.png diff --git a/make/resources/assets-test/arrow-red-alpha-64x64.png b/make/resources/assets-test/arrow-red-alpha-64x64.png Binary files differnew file mode 100644 index 000000000..b8775aec0 --- /dev/null +++ b/make/resources/assets-test/arrow-red-alpha-64x64.png diff --git a/make/resources/assets-test/red-16x16.png b/make/resources/assets-test/red-16x16.png Binary files differnew file mode 100644 index 000000000..7468390f3 --- /dev/null +++ b/make/resources/assets-test/red-16x16.png diff --git a/make/resources/assets-test/red-32x32.png b/make/resources/assets-test/red-32x32.png Binary files differnew file mode 100644 index 000000000..da2b44d84 --- /dev/null +++ b/make/resources/assets-test/red-32x32.png diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat index 6bf2d97f0..2f67f4386 100755 --- a/make/scripts/tests-win.bat +++ b/make/scripts/tests-win.bat @@ -10,7 +10,7 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestGe REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT -vsync -time 4000 -x 10 -y 10 -width 100 -height 100 -screen 0 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT -vsync -time 40000 -width 100 -height 100 -screen 0 %* -REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT -time 5000 +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelsAWT %* @@ -82,7 +82,7 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLContextDr REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLContextDrawableSwitch11NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug00NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLDebug01NEWT %* -scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLException01NEWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLException01NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGPUMemSec01NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestMapBuffer01NEWT @@ -194,6 +194,7 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.glsl.TestShaderCompil REM scripts\java-win.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol01AWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol03NewtAWT %* +scripts\java-win.bat com.jogamp.opengl.test.junit.newt.TestWindowAndPointerIconNEWT %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT02GLn %* diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 9356f8e2e..ef5e5bcf3 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -587,6 +587,7 @@ testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLandscapeES2NewtCan #testnoawt com.jogamp.opengl.test.junit.newt.TestWindows01NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT $* +testnoawt com.jogamp.opengl.test.junit.newt.TestWindowAndPointerIconNEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows03NEWTAnimResize $* |
