Changed window creation interface in GLUS. Fixed some bugs in GLUS and

Example 14.
McNopper · Aug 18, 2014 · c2af01d · c2af01d
1 parent 25752b1
commit c2af01d
Show file tree

Hide file tree

Showing 113 changed files with 3,123 additions and 2,946 deletions.
diff --git a/Example01/.gitignore b/Example01/.gitignore
@@ -0,0 +1 @@
+/x86__Windows__MinGW_Debug/
diff --git a/Example01/src/main.c b/Example01/src/main.c
@@ -60,6 +60,24 @@ GLUSvoid terminate(GLUSvoid)
  */
 int main(int argc, char* argv[])
 {
+	EGLint eglConfigAttributes[] = {
+	        EGL_RED_SIZE, 8,
+	        EGL_GREEN_SIZE, 8,
+	        EGL_BLUE_SIZE, 8,
+	        EGL_DEPTH_SIZE, 0,
+	        EGL_STENCIL_SIZE, 0,
+	        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+	        EGL_NONE
+	};
+
+    EGLint eglContextAttributes[] = {
+    		EGL_CONTEXT_MAJOR_VERSION, 3,
+    		EGL_CONTEXT_MINOR_VERSION, 2,
+    		EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE, EGL_TRUE,
+    		EGL_CONTEXT_OPENGL_PROFILE_MASK, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+    		EGL_NONE
+    };
+
     glusInitFunc(init);
 
     glusReshapeFunc(reshape);
@@ -68,9 +86,7 @@ int main(int argc, char* argv[])
 
     glusTerminateFunc(terminate);
 
-    glusPrepareContext(3, 2, GLUS_FORWARD_COMPATIBLE_BIT);
-
-    if (!glusCreateWindow("GLUS Example Window", 640, 480, 0, 0, GLUS_FALSE))
+    if (!glusCreateWindow("GLUS Example Window", 640, 480, GLUS_FALSE, GLUS_FALSE, eglConfigAttributes, eglContextAttributes))
     {
         printf("Could not create window!\n");
         return -1;

diff --git a/Example02/.gitignore b/Example02/.gitignore
@@ -0,0 +1 @@
+/x86__Windows__MinGW_Debug/
diff --git a/Example02/src/main.c b/Example02/src/main.c
@@ -129,6 +129,24 @@ GLUSvoid terminate(GLUSvoid)
 
 int main(int argc, char* argv[])
 {
+	EGLint eglConfigAttributes[] = {
+	        EGL_RED_SIZE, 8,
+	        EGL_GREEN_SIZE, 8,
+	        EGL_BLUE_SIZE, 8,
+	        EGL_DEPTH_SIZE, 0,
+	        EGL_STENCIL_SIZE, 0,
+	        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+	        EGL_NONE
+	};
+
+    EGLint eglContextAttributes[] = {
+    		EGL_CONTEXT_MAJOR_VERSION, 3,
+    		EGL_CONTEXT_MINOR_VERSION, 2,
+    		EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE, EGL_TRUE,
+    		EGL_CONTEXT_OPENGL_PROFILE_MASK, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+    		EGL_NONE
+    };
+
     glusInitFunc(init);
 
     glusReshapeFunc(reshape);
@@ -137,9 +155,7 @@ int main(int argc, char* argv[])
 
     glusTerminateFunc(terminate);
 
-    glusPrepareContext(3, 2, GLUS_FORWARD_COMPATIBLE_BIT);
-
-    if (!glusCreateWindow("GLUS Example Window", 640, 480, 0, 0, GLUS_FALSE))
+    if (!glusCreateWindow("GLUS Example Window", 640, 480, GLUS_FALSE, GLUS_FALSE, eglConfigAttributes, eglContextAttributes))
     {
         printf("Could not create window!\n");
         return -1;

diff --git a/Example03/src/main.c b/Example03/src/main.c
@@ -258,6 +258,24 @@ GLUSvoid terminate(GLUSvoid)
 
 int main(int argc, char* argv[])
 {
+	EGLint eglConfigAttributes[] = {
+	        EGL_RED_SIZE, 8,
+	        EGL_GREEN_SIZE, 8,
+	        EGL_BLUE_SIZE, 8,
+	        EGL_DEPTH_SIZE, 0,
+	        EGL_STENCIL_SIZE, 0,
+	        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+	        EGL_NONE
+	};
+
+    EGLint eglContextAttributes[] = {
+    		EGL_CONTEXT_MAJOR_VERSION, 3,
+    		EGL_CONTEXT_MINOR_VERSION, 2,
+    		EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE, EGL_TRUE,
+    		EGL_CONTEXT_OPENGL_PROFILE_MASK, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+    		EGL_NONE
+    };
+
     glusInitFunc(init);
 
     glusReshapeFunc(reshape);
@@ -266,9 +284,7 @@ int main(int argc, char* argv[])
 
     glusTerminateFunc(terminate);
 
-    glusPrepareContext(3, 2, GLUS_FORWARD_COMPATIBLE_BIT);
-
-    if (!glusCreateWindow("GLUS Example Window", 640, 480, 0, 0, GLUS_FALSE))
+    if (!glusCreateWindow("GLUS Example Window", 640, 480, GLUS_FALSE, GLUS_FALSE, eglConfigAttributes, eglContextAttributes))
     {
         printf("Could not create window!\n");
         return -1;

diff --git a/Example04/.gitignore b/Example04/.gitignore
@@ -0,0 +1 @@
+/x86__Windows__MinGW_Debug/
diff --git a/Example04/src/main.c b/Example04/src/main.c
@@ -236,6 +236,24 @@ GLUSvoid terminate(GLUSvoid)
 
 int main(int argc, char* argv[])
 {
+	EGLint eglConfigAttributes[] = {
+	        EGL_RED_SIZE, 8,
+	        EGL_GREEN_SIZE, 8,
+	        EGL_BLUE_SIZE, 8,
+	        EGL_DEPTH_SIZE, 24,
+	        EGL_STENCIL_SIZE, 0,
+	        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+	        EGL_NONE
+	};
+
+    EGLint eglContextAttributes[] = {
+    		EGL_CONTEXT_MAJOR_VERSION, 3,
+    		EGL_CONTEXT_MINOR_VERSION, 2,
+    		EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE, EGL_TRUE,
+    		EGL_CONTEXT_OPENGL_PROFILE_MASK, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+    		EGL_NONE
+    };
+
     glusInitFunc(init);
 
     glusReshapeFunc(reshape);
@@ -244,9 +262,7 @@ int main(int argc, char* argv[])
 
     glusTerminateFunc(terminate);
 
-    glusPrepareContext(3, 2, GLUS_FORWARD_COMPATIBLE_BIT);
-
-    if (!glusCreateWindow("GLUS Example Window", 640, 480, 24, 0, GLUS_FALSE))
+    if (!glusCreateWindow("GLUS Example Window", 640, 480, GLUS_FALSE, GLUS_FALSE, eglConfigAttributes, eglContextAttributes))
     {
         printf("Could not create window!\n");
         return -1;

diff --git a/Example05/src/main.c b/Example05/src/main.c
@@ -285,6 +285,24 @@ GLUSvoid terminate(GLUSvoid)
 
 int main(int argc, char* argv[])
 {
+	EGLint eglConfigAttributes[] = {
+	        EGL_RED_SIZE, 8,
+	        EGL_GREEN_SIZE, 8,
+	        EGL_BLUE_SIZE, 8,
+	        EGL_DEPTH_SIZE, 24,
+	        EGL_STENCIL_SIZE, 0,
+	        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+	        EGL_NONE
+	};
+
+    EGLint eglContextAttributes[] = {
+    		EGL_CONTEXT_MAJOR_VERSION, 3,
+    		EGL_CONTEXT_MINOR_VERSION, 2,
+    		EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE, EGL_TRUE,
+    		EGL_CONTEXT_OPENGL_PROFILE_MASK, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+    		EGL_NONE
+    };
+
     glusInitFunc(init);
 
     glusReshapeFunc(reshape);
@@ -293,9 +311,7 @@ int main(int argc, char* argv[])
 
     glusTerminateFunc(terminate);
 
-    glusPrepareContext(3, 2, GLUS_FORWARD_COMPATIBLE_BIT);
-
-    if (!glusCreateWindow("GLUS Example Window", 640, 480, 24, 0, GLUS_FALSE))
+    if (!glusCreateWindow("GLUS Example Window", 640, 480, GLUS_FALSE, GLUS_FALSE, eglConfigAttributes, eglContextAttributes))
     {
         printf("Could not create window!\n");
         return -1;

diff --git a/Example06/.gitignore b/Example06/.gitignore
@@ -0,0 +1 @@
+/x86__Windows__MinGW_Debug/
diff --git a/Example06/src/main.c b/Example06/src/main.c
@@ -283,6 +283,24 @@ GLUSvoid terminate(GLUSvoid)
 
 int main(int argc, char* argv[])
 {
+	EGLint eglConfigAttributes[] = {
+	        EGL_RED_SIZE, 8,
+	        EGL_GREEN_SIZE, 8,
+	        EGL_BLUE_SIZE, 8,
+	        EGL_DEPTH_SIZE, 24,
+	        EGL_STENCIL_SIZE, 0,
+	        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+	        EGL_NONE
+	};
+
+    EGLint eglContextAttributes[] = {
+    		EGL_CONTEXT_MAJOR_VERSION, 3,
+    		EGL_CONTEXT_MINOR_VERSION, 2,
+    		EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE, EGL_TRUE,
+    		EGL_CONTEXT_OPENGL_PROFILE_MASK, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+    		EGL_NONE
+    };
+
     glusInitFunc(init);
 
     glusReshapeFunc(reshape);
@@ -291,9 +309,7 @@ int main(int argc, char* argv[])
 
     glusTerminateFunc(terminate);
 
-    glusPrepareContext(3, 2, GLUS_FORWARD_COMPATIBLE_BIT);
-
-    if (!glusCreateWindow("GLUS Example Window", 640, 480, 24, 0, GLUS_FALSE))
+    if (!glusCreateWindow("GLUS Example Window", 640, 480, GLUS_FALSE, GLUS_FALSE, eglConfigAttributes, eglContextAttributes))
     {
         printf("Could not create window!\n");
         return -1;

diff --git a/Example07/.gitignore b/Example07/.gitignore
@@ -0,0 +1 @@
+/x86__Windows__MinGW_Debug/
diff --git a/Example07/src/main.c b/Example07/src/main.c
@@ -362,6 +362,24 @@ GLUSvoid terminate(GLUSvoid)
 
 int main(int argc, char* argv[])
 {
+	EGLint eglConfigAttributes[] = {
+	        EGL_RED_SIZE, 8,
+	        EGL_GREEN_SIZE, 8,
+	        EGL_BLUE_SIZE, 8,
+	        EGL_DEPTH_SIZE, 0,
+	        EGL_STENCIL_SIZE, 0,
+	        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+	        EGL_NONE
+	};
+
+    EGLint eglContextAttributes[] = {
+    		EGL_CONTEXT_MAJOR_VERSION, 3,
+    		EGL_CONTEXT_MINOR_VERSION, 2,
+    		EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE, EGL_TRUE,
+    		EGL_CONTEXT_OPENGL_PROFILE_MASK, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+    		EGL_NONE
+    };
+
     glusInitFunc(init);
 
     glusReshapeFunc(reshape);
@@ -370,9 +388,7 @@ int main(int argc, char* argv[])
 
     glusTerminateFunc(terminate);
 
-    glusPrepareContext(3, 2, GLUS_FORWARD_COMPATIBLE_BIT);
-
-    if (!glusCreateWindow("GLUS Example Window", 640, 480, 0, 0, GLUS_FALSE))
+    if (!glusCreateWindow("GLUS Example Window", 640, 480, GLUS_FALSE, GLUS_FALSE, eglConfigAttributes, eglContextAttributes))
     {
         printf("Could not create window!\n");
         return -1;

diff --git a/Example08/src/main.c b/Example08/src/main.c
@@ -301,6 +301,24 @@ GLUSvoid terminate(GLUSvoid)
 
 int main(int argc, char* argv[])
 {
+	EGLint eglConfigAttributes[] = {
+	        EGL_RED_SIZE, 8,
+	        EGL_GREEN_SIZE, 8,
+	        EGL_BLUE_SIZE, 8,
+	        EGL_DEPTH_SIZE, 24,
+	        EGL_STENCIL_SIZE, 0,
+	        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+	        EGL_NONE
+	};
+
+    EGLint eglContextAttributes[] = {
+    		EGL_CONTEXT_MAJOR_VERSION, 3,
+    		EGL_CONTEXT_MINOR_VERSION, 2,
+    		EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE, EGL_TRUE,
+    		EGL_CONTEXT_OPENGL_PROFILE_MASK, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+    		EGL_NONE
+    };
+
     glusInitFunc(init);
 
     glusReshapeFunc(reshape);
@@ -309,9 +327,7 @@ int main(int argc, char* argv[])
 
     glusTerminateFunc(terminate);
 
-    glusPrepareContext(3, 2, GLUS_FORWARD_COMPATIBLE_BIT);
-
-    if (!glusCreateWindow("GLUS Example Window", 640, 480, 24, 0, GLUS_FALSE))
+    if (!glusCreateWindow("GLUS Example Window", 640, 480, GLUS_FALSE, GLUS_FALSE, eglConfigAttributes, eglContextAttributes))
     {
         printf("Could not create window!\n");
         return -1;

diff --git a/Example09/.gitignore b/Example09/.gitignore
@@ -0,0 +1 @@
+/x86__Windows__MinGW_Debug/
diff --git a/Example09/src/main.c b/Example09/src/main.c
@@ -415,6 +415,24 @@ GLUSvoid terminate(GLUSvoid)
 
 int main(int argc, char* argv[])
 {
+	EGLint eglConfigAttributes[] = {
+	        EGL_RED_SIZE, 8,
+	        EGL_GREEN_SIZE, 8,
+	        EGL_BLUE_SIZE, 8,
+	        EGL_DEPTH_SIZE, 0,
+	        EGL_STENCIL_SIZE, 0,
+	        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+	        EGL_NONE
+	};
+
+    EGLint eglContextAttributes[] = {
+    		EGL_CONTEXT_MAJOR_VERSION, 3,
+    		EGL_CONTEXT_MINOR_VERSION, 2,
+    		EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE, EGL_TRUE,
+    		EGL_CONTEXT_OPENGL_PROFILE_MASK, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+    		EGL_NONE
+    };
+
     glusInitFunc(init);
 
     glusReshapeFunc(reshape);
@@ -423,9 +441,7 @@ int main(int argc, char* argv[])
 
     glusTerminateFunc(terminate);
 
-    glusPrepareContext(3, 2, GLUS_FORWARD_COMPATIBLE_BIT);
-
-    if (!glusCreateWindow("GLUS Example Window", 640, 480, 0, 0, GLUS_FALSE))
+    if (!glusCreateWindow("GLUS Example Window", 640, 480, GLUS_FALSE, GLUS_FALSE, eglConfigAttributes, eglContextAttributes))
     {
         printf("Could not create window!\n");
         return -1;

diff --git a/Example10/src/main.c b/Example10/src/main.c
@@ -207,6 +207,24 @@ GLUSvoid terminate(GLUSvoid)
 
 int main(int argc, char* argv[])
 {
+	EGLint eglConfigAttributes[] = {
+	        EGL_RED_SIZE, 8,
+	        EGL_GREEN_SIZE, 8,
+	        EGL_BLUE_SIZE, 8,
+	        EGL_DEPTH_SIZE, 24,
+	        EGL_STENCIL_SIZE, 0,
+	        EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
+	        EGL_NONE
+	};
+
+    EGLint eglContextAttributes[] = {
+    		EGL_CONTEXT_MAJOR_VERSION, 3,
+    		EGL_CONTEXT_MINOR_VERSION, 2,
+    		EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE, EGL_TRUE,
+    		EGL_CONTEXT_OPENGL_PROFILE_MASK, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT,
+    		EGL_NONE
+    };
+
     glusInitFunc(init);
 
     glusReshapeFunc(reshape);
@@ -215,9 +233,7 @@ int main(int argc, char* argv[])
 
     glusTerminateFunc(terminate);
 
-    glusPrepareContext(3, 2, GLUS_FORWARD_COMPATIBLE_BIT);
-
-    if (!glusCreateWindow("GLUS Example Window", 640, 480, 24, 0, GLUS_FALSE))
+    if (!glusCreateWindow("GLUS Example Window", 640, 480, GLUS_FALSE, GLUS_FALSE, eglConfigAttributes, eglContextAttributes))
     {
         printf("Could not create window!\n");
         return -1;

diff --git a/Example11/.gitignore b/Example11/.gitignore
@@ -0,0 +1 @@
+/x86__Windows__MinGW_Debug/