diff options
author | Sven Gothel <[email protected]> | 2008-11-27 06:57:50 +0000 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2008-11-27 06:57:50 +0000 |
commit | 93531a87d4ec985e6088fd8c63b75457c09d8c0e (patch) | |
tree | 02214d138f65353fe2f293cb7d3c6d4e40880a42 | |
parent | 6c6663bf9e424ef88eddd333a1a379b3059662f8 (diff) |
KD Fix: Use EGL AttributeList directly
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1809 232f8b59-042b-4e1e-8c03-345bb8c30851
-rwxr-xr-x | make/jogl_wince6_vs9/gluegen-rt/gluegen-rt.vcproj | 28 | ||||
-rwxr-xr-x | make/jogl_wince6_vs9/jogl_es1/jogl_es1.vcproj | 28 | ||||
-rwxr-xr-x | make/jogl_wince6_vs9/jogl_es2/jogl_es2.vcproj | 28 | ||||
-rwxr-xr-x | make/jogl_wince6_vs9/newt/newt.vcproj | 48 | ||||
-rwxr-xr-x | make/lib/wince/arm/nvap/libEGL.lib | bin | 9314 -> 0 bytes | |||
-rwxr-xr-x | src/classes/com/sun/javafx/newt/kd/KDWindow.java | 4 | ||||
-rw-r--r-- | src/classes/com/sun/opengl/impl/egl/EGLConfig.java | 5 | ||||
-rwxr-xr-x | src/classes/com/sun/opengl/impl/egl/EGLContext.java | 2 | ||||
-rwxr-xr-x | src/native/newt/KDWindow.c | 48 |
9 files changed, 89 insertions, 102 deletions
diff --git a/make/jogl_wince6_vs9/gluegen-rt/gluegen-rt.vcproj b/make/jogl_wince6_vs9/gluegen-rt/gluegen-rt.vcproj index 1ec4372c8..f38f5cf90 100755 --- a/make/jogl_wince6_vs9/gluegen-rt/gluegen-rt.vcproj +++ b/make/jogl_wince6_vs9/gluegen-rt/gluegen-rt.vcproj @@ -63,7 +63,7 @@ AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -150,7 +150,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -237,7 +237,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -324,7 +324,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -411,7 +411,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -498,7 +498,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -585,7 +585,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -672,7 +672,7 @@ Optimization="2" AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -760,7 +760,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -848,7 +848,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -936,7 +936,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -1024,7 +1024,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -1112,7 +1112,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -1200,7 +1200,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;GLUEGENRT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" diff --git a/make/jogl_wince6_vs9/jogl_es1/jogl_es1.vcproj b/make/jogl_wince6_vs9/jogl_es1/jogl_es1.vcproj index b61d1873f..3644ffd1d 100755 --- a/make/jogl_wince6_vs9/jogl_es1/jogl_es1.vcproj +++ b/make/jogl_wince6_vs9/jogl_es1/jogl_es1.vcproj @@ -62,7 +62,7 @@ AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,,..\..\..\make\stub_includes\egl,..\..\..\make\stub_includes\opengl,..\..\..\build\gensrc\native\newt\Windows" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -149,7 +149,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -236,7 +236,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -323,7 +323,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -410,7 +410,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -497,7 +497,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -584,7 +584,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -671,7 +671,7 @@ Optimization="2" AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,,..\..\..\make\stub_includes\egl,..\..\..\make\stub_includes\opengl,..\..\..\build\gensrc\native\newt\Windows" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -760,7 +760,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -848,7 +848,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -936,7 +936,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -1024,7 +1024,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -1112,7 +1112,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -1200,7 +1200,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES1_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" diff --git a/make/jogl_wince6_vs9/jogl_es2/jogl_es2.vcproj b/make/jogl_wince6_vs9/jogl_es2/jogl_es2.vcproj index 9adeb4905..6af4d5acc 100755 --- a/make/jogl_wince6_vs9/jogl_es2/jogl_es2.vcproj +++ b/make/jogl_wince6_vs9/jogl_es2/jogl_es2.vcproj @@ -62,7 +62,7 @@ AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,,..\..\..\make\stub_includes\egl,..\..\..\make\stub_includes\opengl,..\..\..\build\gensrc\native\newt\Windows" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -150,7 +150,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -237,7 +237,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -324,7 +324,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -411,7 +411,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -498,7 +498,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -585,7 +585,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -672,7 +672,7 @@ Optimization="2" AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,,..\..\..\make\stub_includes\egl,..\..\..\make\stub_includes\opengl,..\..\..\build\gensrc\native\newt\Windows" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -761,7 +761,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -849,7 +849,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -937,7 +937,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -1025,7 +1025,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -1113,7 +1113,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -1201,7 +1201,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;JOGL_ES2_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" diff --git a/make/jogl_wince6_vs9/newt/newt.vcproj b/make/jogl_wince6_vs9/newt/newt.vcproj index e683ec2ec..cb89b1366 100755 --- a/make/jogl_wince6_vs9/newt/newt.vcproj +++ b/make/jogl_wince6_vs9/newt/newt.vcproj @@ -63,7 +63,7 @@ AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,..\..\..\build\gensrc\native\newt\Windows,..\..\..\build\gensrc\native\newt\KD,..\..\..\make\stub_includes\egl" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -82,7 +82,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libKD.lib libEGL.lib" + AdditionalDependencies="libKD.lib" AdditionalLibraryDirectories="../../../make/lib/wince/arm/nvap" AdditionalOptions=" /subsystem:windowsce,5.00" OutputFile="$(OutDir)/newt.dll" @@ -152,7 +152,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -171,7 +171,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libKD.lib libEGL.lib" + AdditionalDependencies="libKD.lib" AdditionalLibraryDirectories="../../../make/lib/wince/arm/nvap" AdditionalOptions=" /subsystem:windowsce,5.00" OutputFile="$(OutDir)/newt.dll" @@ -241,7 +241,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -260,7 +260,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libKD.lib libEGL.lib" + AdditionalDependencies="libKD.lib" AdditionalLibraryDirectories="../../../make/lib/wince/arm/nvap" AdditionalOptions=" /subsystem:windowsce,5.00" OutputFile="$(OutDir)/newt.dll" @@ -330,7 +330,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -349,7 +349,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libKD.lib libEGL.lib" + AdditionalDependencies="libKD.lib" AdditionalLibraryDirectories="../../../make/lib/wince/arm/nvap" AdditionalOptions=" /subsystem:windowsce,5.00 /machine:MIPS" OutputFile="$(OutDir)/newt.dll" @@ -419,7 +419,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -438,7 +438,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libKD.lib libEGL.lib" + AdditionalDependencies="libKD.lib" AdditionalLibraryDirectories="../../../make/lib/wince/arm/nvap" AdditionalOptions=" /subsystem:windowsce,5.00 /machine:MIPS" OutputFile="$(OutDir)/newt.dll" @@ -508,7 +508,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -527,7 +527,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libKD.lib libEGL.lib" + AdditionalDependencies="libKD.lib" AdditionalLibraryDirectories="../../../make/lib/wince/arm/nvap" AdditionalOptions=" /subsystem:windowsce,5.00 /machine:MIPSFPU" OutputFile="$(OutDir)/newt.dll" @@ -597,7 +597,7 @@ Optimization="0" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;DEBUG;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" MinimalRebuild="true" - RuntimeLibrary="1" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -616,7 +616,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libKD.lib libEGL.lib" + AdditionalDependencies="libKD.lib" AdditionalLibraryDirectories="../../../make/lib/wince/arm/nvap" AdditionalOptions=" /subsystem:windowsce,5.00 /machine:MIPSFPU" OutputFile="$(OutDir)/newt.dll" @@ -686,7 +686,7 @@ Optimization="2" AdditionalIncludeDirectories="..\..\..\..\CVM\cdc\src\share\javavm\export,..\..\..\..\CVM\cdc\src\share,..\..\..\..\CVM\cdc\src\win32,..\..\..\..\CVM\cdc\src\win32-arm,..\..\..\build\gensrc\native\newt\Windows,..\..\..\build\gensrc\native\newt\KD,..\..\..\make\stub_includes\egl" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -705,7 +705,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libKD.lib libEGL.lib" + AdditionalDependencies="libKD.lib" AdditionalLibraryDirectories="../../../make/lib/wince/arm/nvap" AdditionalOptions=" /subsystem:windowsce,5.00" OutputFile="$(OutDir)/newt.dll" @@ -776,7 +776,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -795,7 +795,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libKD.lib libEGL.lib" + AdditionalDependencies="libKD.lib" AdditionalLibraryDirectories="../../../make/lib/wince/arm/nvap" AdditionalOptions=" /subsystem:windowsce,5.00" OutputFile="$(OutDir)/newt.dll" @@ -866,7 +866,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -885,7 +885,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libKD.lib libEGL.lib" + AdditionalDependencies="libKD.lib" AdditionalLibraryDirectories="../../../make/lib/wince/arm/nvap" AdditionalOptions=" /subsystem:windowsce,5.00" OutputFile="$(OutDir)/newt.dll" @@ -956,7 +956,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -1044,7 +1044,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -1132,7 +1132,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -1220,7 +1220,7 @@ ExecutionBucket="7" Optimization="2" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;_WINDOWS;_USRDLL;NEWT_EXPORTS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE" - RuntimeLibrary="0" + RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" diff --git a/make/lib/wince/arm/nvap/libEGL.lib b/make/lib/wince/arm/nvap/libEGL.lib Binary files differdeleted file mode 100755 index 46d781770..000000000 --- a/make/lib/wince/arm/nvap/libEGL.lib +++ /dev/null diff --git a/src/classes/com/sun/javafx/newt/kd/KDWindow.java b/src/classes/com/sun/javafx/newt/kd/KDWindow.java index ebd8edc36..b7b9f6686 100755 --- a/src/classes/com/sun/javafx/newt/kd/KDWindow.java +++ b/src/classes/com/sun/javafx/newt/kd/KDWindow.java @@ -76,7 +76,7 @@ public class KDWindow extends Window { windowHandle = 0; windowID = ++_windowID; - eglWindowHandle = CreateWindow(windowID, getDisplayHandle(), visualID, eglRenderableType); + eglWindowHandle = CreateWindow(windowID, getDisplayHandle(), config.getAttributeList()); if (eglWindowHandle == 0) { throw new RuntimeException("Error creating egl window: "+eglWindowHandle); } @@ -140,7 +140,7 @@ public class KDWindow extends Window { // private static native boolean initIDs(); - private native long CreateWindow(int owner, long displayHandle, long eglConfig, int eglRenderableType); + private native long CreateWindow(int owner, long displayHandle, int[] attributes); private native long RealizeWindow(long eglWindowHandle); private native int CloseWindow(long eglWindowHandle); private native void setVisible0(long eglWindowHandle, boolean visible); diff --git a/src/classes/com/sun/opengl/impl/egl/EGLConfig.java b/src/classes/com/sun/opengl/impl/egl/EGLConfig.java index 49c1a895f..4948b3a0c 100644 --- a/src/classes/com/sun/opengl/impl/egl/EGLConfig.java +++ b/src/classes/com/sun/opengl/impl/egl/EGLConfig.java @@ -54,6 +54,10 @@ public class EGLConfig { return capabilities; } + public int[] getAttributeList() { + return glCapabilities2AttribList(capabilities); + } + public EGLConfig(long display, int configID) { int[] attrs = new int[] { EGL.EGL_RENDERABLE_TYPE, -1, @@ -163,6 +167,5 @@ public class EGLConfig { private _EGLConfig _config; private int configID; private GLCapabilities capabilities; - } diff --git a/src/classes/com/sun/opengl/impl/egl/EGLContext.java b/src/classes/com/sun/opengl/impl/egl/EGLContext.java index 8ba07bc51..40ab077a6 100755 --- a/src/classes/com/sun/opengl/impl/egl/EGLContext.java +++ b/src/classes/com/sun/opengl/impl/egl/EGLContext.java @@ -182,7 +182,7 @@ public class EGLContext extends GLContextImpl { protected void create() throws GLException { long display = drawable.getDisplay(); _EGLConfig config = drawable.getEGLConfig().getNativeConfig(); - long shareWith = 0; + long shareWith = EGL.EGL_NO_CONTEXT; if (display == 0) { throw new GLException("Error: attempted to create an OpenGL context without a display connection"); diff --git a/src/native/newt/KDWindow.c b/src/native/newt/KDWindow.c index d5fe7bdf5..211db7ce7 100755 --- a/src/native/newt/KDWindow.c +++ b/src/native/newt/KDWindow.c @@ -51,7 +51,6 @@ #include <inttypes.h> #endif -#include <EGL/egl.h> #include <KD/kd.h> #include <KD/NV_extwindowprops.h> @@ -110,22 +109,11 @@ JNIEXPORT jboolean JNICALL Java_com_sun_javafx_newt_kd_KDWindow_initIDs } JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_kd_KDWindow_CreateWindow - (JNIEnv *env, jobject obj, jint owner, jlong display, jlong eglConfig, jint eglRenderableType) + (JNIEnv *env, jobject obj, jint owner, jlong display, jintArray jAttrs) { - EGLint configAttribs[] = { - EGL_RED_SIZE, 1, - EGL_GREEN_SIZE, 1, - EGL_BLUE_SIZE, 1, - EGL_ALPHA_SIZE, EGL_DONT_CARE, - EGL_DEPTH_SIZE, 1, - EGL_STENCIL_SIZE, EGL_DONT_CARE, - EGL_SURFACE_TYPE, EGL_WINDOW_BIT, - EGL_RENDERABLE_TYPE, -1, - EGL_NONE - }; - int i; + jint * attrs = NULL; + jsize attrsLen; EGLDisplay dpy = (EGLDisplay)(intptr_t)display; - EGLConfig cfg = (EGLConfig)(intptr_t)eglConfig; KDWindow *window = 0; DBG_PRINT( "[CreateWindow]: owner %d\n", owner); @@ -135,25 +123,21 @@ JNIEXPORT jlong JNICALL Java_com_sun_javafx_newt_kd_KDWindow_CreateWindow return 0; } - i=1; - eglGetConfigAttrib(dpy, cfg, EGL_RED_SIZE, &configAttribs[i]); - i+=2; - eglGetConfigAttrib(dpy, cfg, EGL_GREEN_SIZE, &configAttribs[i]); - i+=2; - eglGetConfigAttrib(dpy, cfg, EGL_BLUE_SIZE, &configAttribs[i]); - i+=2; - eglGetConfigAttrib(dpy, cfg, EGL_ALPHA_SIZE, &configAttribs[i]); - i+=2; - eglGetConfigAttrib(dpy, cfg, EGL_DEPTH_SIZE, &configAttribs[i]); - i+=2; - configAttribs[i] = EGL_WINDOW_BIT; - i+=2; - eglGetConfigAttrib(dpy, cfg, EGL_STENCIL_SIZE, &configAttribs[i]); - i+=2; - configAttribs[i] = eglRenderableType; + attrsLen = (*env)->GetArrayLength(env, jAttrs); + if(0==attrsLen) { + fprintf(stderr, "[CreateWindow] attribute array size 0..\n"); + return 0; + } + attrs = (*env)->GetIntArrayElements(env, jAttrs, 0); + if(NULL==attrs) { + fprintf(stderr, "[CreateWindow] attribute array NULL..\n"); + return 0; + } /* passing the KDWindow instance for the eventuserptr */ - window = kdCreateWindow(dpy, configAttribs, (void *)(intptr_t)owner); + window = kdCreateWindow(dpy, attrs, (void *)(intptr_t)owner); + + (*env)->ReleaseIntArrayElements(env, jAttrs, attrs, 0); if(NULL==window) { fprintf(stderr, "[CreateWindow] failed: 0x%X\n", kdGetError()); |