fix GETPROCADDRESS usage, remove carriage return chars (bug 6430)

1 files changed, 99 insertions, 89 deletions

diff --git a/progs/demos/glslnoise.c b/progs/demos/glslnoise.c
index 463af12897..2adb114e66 100755
--- a/progs/demos/glslnoise.c
+++ b/progs/demos/glslnoise.c
@@ -1,62 +1,62 @@
 /*
  * GLSL noise demo.
- *

- * Michal Krol

+ *
+ * Michal Krol
  * 20 February 2006
- *

+ *
  * Based on the original demo by:
  * Stefan Gustavson (stegu@itn.liu.se) 2004, 2005
- */

-

-#ifdef WIN32

-#include <windows.h>

+ */
+
+#ifdef WIN32
+#include <windows.h>
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <GL/gl.h>

-#include <GL/glut.h>

-#include <GL/glext.h>

-

-#ifdef WIN32

-#define GETPROCADDRESS wglGetProcAddress

-#else

-#define GETPROCADDRESS glutGetProcAddress

-#endif

+#include <GL/gl.h>
+#include <GL/glut.h>
+#include <GL/glext.h>
+
+#ifdef WIN32
+#define GETPROCADDRESS(F) wglGetProcAddress(F)
+#else
+#define GETPROCADDRESS(F) glutGetProcAddress(F)
+#endif
 
 static GLhandleARB fragShader;
-static GLhandleARB vertShader;

-static GLhandleARB program;

-

-static GLint uTime;

-

-static GLfloat u_time = 0.0f;

-
-static PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB = NULL;

-static PFNGLSHADERSOURCEARBPROC glShaderSourceARB = NULL;

-static PFNGLCOMPILESHADERARBPROC glCompileShaderARB = NULL;

-static PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB = NULL;

-static PFNGLATTACHOBJECTARBPROC glAttachObjectARB = NULL;

-static PFNGLLINKPROGRAMARBPROC glLinkProgramARB = NULL;

-static PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB = NULL;

-static PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB = NULL;

+static GLhandleARB vertShader;
+static GLhandleARB program;
+
+static GLint uTime;
+
+static GLfloat u_time = 0.0f;
+
+static PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB = NULL;
+static PFNGLSHADERSOURCEARBPROC glShaderSourceARB = NULL;
+static PFNGLCOMPILESHADERARBPROC glCompileShaderARB = NULL;
+static PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB = NULL;
+static PFNGLATTACHOBJECTARBPROC glAttachObjectARB = NULL;
+static PFNGLLINKPROGRAMARBPROC glLinkProgramARB = NULL;
+static PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB = NULL;
+static PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB = NULL;
 static PFNGLUNIFORM1FARBPROC glUniform1fARB = NULL;
 
 static void Redisplay (void)
 {
-	glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

-

+	glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
 	glUniform1fARB (uTime, u_time);
 
 	glPushMatrix ();
-	glutSolidSphere (2.0, 20, 10);

+	glutSolidSphere (2.0, 20, 10);
 	glPopMatrix ();
 
 	glutSwapBuffers();
 }
 
 static void Idle (void)
-{

+{
 	u_time += 0.1f;
 	glutPostRedisplay ();
 }
@@ -75,9 +75,9 @@ static void Reshape (int width, int height)
 static void Key (unsigned char key, int x, int y)
 {
 	(void) x;
-	(void) y;

+	(void) y;
 
-	switch (key)

+	switch (key)
 	{
 	case 27:
 		exit(0);
@@ -88,69 +88,79 @@ static void Key (unsigned char key, int x, int y)
 
 static void Init (void)
 {
-	static const char *fragShaderText =

+	static const char *fragShaderText =
 		"uniform float time;\n"
-		"void main () {\n"

-		"	gl_FragColor = gl_Color * vec4 ((0.5 + 0.5 * vec3 (noise1 (\n"

-		"		vec4 (4.0 * gl_TexCoord[0].xyz, 0.5 * time)))), 1.0);\n"

+		"void main () {\n"
+		"	gl_FragColor = gl_Color * vec4 ((0.5 + 0.5 * vec3 (noise1 (\n"
+		"		vec4 (4.0 * gl_TexCoord[0].xyz, 0.5 * time)))), 1.0);\n"
 		"}\n"
 	;
 	static const char *vertShaderText =
-		"void main () {\n"

-		"	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n"

-		"	gl_TexCoord[0] = gl_Vertex;\n"

-		"	gl_FrontColor = gl_Color;\n"

+		"void main () {\n"
+		"	gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n"
+		"	gl_TexCoord[0] = gl_Vertex;\n"
+		"	gl_FrontColor = gl_Color;\n"
 		"}\n"
 	;
-

-	if (!glutExtensionSupported ("GL_ARB_fragment_shader"))

+
+	if (!glutExtensionSupported ("GL_ARB_fragment_shader"))
 	{
 		printf ("Sorry, this demo requires GL_ARB_fragment_shader\n");
 		exit(1);
-	}

-	if (!glutExtensionSupported ("GL_ARB_shader_objects"))

-	{

-		printf ("Sorry, this demo requires GL_ARB_shader_objects\n");

-		exit(1);

-	}

-	if (!glutExtensionSupported ("GL_ARB_shading_language_100"))

-	{

-		printf ("Sorry, this demo requires GL_ARB_shading_language_100\n");

-		exit(1);

-	}

-	if (!glutExtensionSupported ("GL_ARB_vertex_shader"))

-	{

-		printf ("Sorry, this demo requires GL_ARB_vertex_shader\n");

-		exit(1);

 	}
+	if (!glutExtensionSupported ("GL_ARB_shader_objects"))
+	{
+		printf ("Sorry, this demo requires GL_ARB_shader_objects\n");
+		exit(1);
+	}
+	if (!glutExtensionSupported ("GL_ARB_shading_language_100"))
+	{
+		printf ("Sorry, this demo requires GL_ARB_shading_language_100\n");
+		exit(1);
+	}
+	if (!glutExtensionSupported ("GL_ARB_vertex_shader"))
+	{
+		printf ("Sorry, this demo requires GL_ARB_vertex_shader\n");
+		exit(1);
+	}
+
+	glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC)
+		GETPROCADDRESS("glCreateShaderObjectARB");
+ 	glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC)
+		GETPROCADDRESS("glShaderSourceARB");
+ 	glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC)
+		GETPROCADDRESS("glCompileShaderARB");
+ 	glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC)
+		GETPROCADDRESS("glCreateProgramObjectARB");
+ 	glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC)
+		GETPROCADDRESS("glAttachObjectARB");
+ 	glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC)
+		GETPROCADDRESS ("glLinkProgramARB");
+ 	glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)
+		GETPROCADDRESS("glUseProgramObjectARB");          
 
-	glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC) wglGetProcAddress ("glCreateShaderObjectARB");

-	glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC) wglGetProcAddress ("glShaderSourceARB");

-	glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC) wglGetProcAddress ("glCompileShaderARB");

-	glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC) wglGetProcAddress ("glCreateProgramObjectARB");

-	glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC) wglGetProcAddress ("glAttachObjectARB");

-	glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC) wglGetProcAddress ("glLinkProgramARB");

-	glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC) wglGetProcAddress ("glUseProgramObjectARB");

-	glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC) GETPROCADDRESS ("glGetUniformLocationARB");

-	glUniform1fARB = (PFNGLUNIFORM1FARBPROC) GETPROCADDRESS ("glUniform1fARB");

-

-	fragShader = glCreateShaderObjectARB (GL_FRAGMENT_SHADER_ARB);

-	glShaderSourceARB (fragShader, 1, &fragShaderText, NULL);

+	glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC)
+		GETPROCADDRESS("glGetUniformLocationARB");
+	glUniform1fARB = (PFNGLUNIFORM1FARBPROC)
+		GETPROCADDRESS("glUniform1fARB");
+
+	fragShader = glCreateShaderObjectARB (GL_FRAGMENT_SHADER_ARB);
+	glShaderSourceARB (fragShader, 1, &fragShaderText, NULL);
 	glCompileShaderARB (fragShader);
-

-	vertShader = glCreateShaderObjectARB (GL_VERTEX_SHADER_ARB);

-	glShaderSourceARB (vertShader, 1, &vertShaderText, NULL);

-	glCompileShaderARB (vertShader);

-

-	program = glCreateProgramObjectARB ();

-	glAttachObjectARB (program, fragShader);

-	glAttachObjectARB (program, vertShader);

-	glLinkProgramARB (program);

-	glUseProgramObjectARB (program);

-

-	uTime = glGetUniformLocationARB (program, "time");

-
-	glClearColor (0.0f, 0.1f, 0.3f, 1.0f);

+
+	vertShader = glCreateShaderObjectARB (GL_VERTEX_SHADER_ARB);
+	glShaderSourceARB (vertShader, 1, &vertShaderText, NULL);
+	glCompileShaderARB (vertShader);
+
+	program = glCreateProgramObjectARB ();
+	glAttachObjectARB (program, fragShader);
+	glAttachObjectARB (program, vertShader);
+	glLinkProgramARB (program);
+	glUseProgramObjectARB (program);
+
+	uTime = glGetUniformLocationARB (program, "time");
+
+	glClearColor (0.0f, 0.1f, 0.3f, 1.0f);
 	glEnable (GL_CULL_FACE);
 	glEnable (GL_DEPTH_TEST);
 
@@ -172,4 +182,4 @@ int main (int argc, char *argv[])
 	glutMainLoop ();
 	return 0;
 }
-

+