progs/perf: Fix newlines.

1 files changed, 210 insertions, 210 deletions

diff --git a/progs/perf/teximage.c b/progs/perf/teximage.c
index b6d4f644dec..a0ce2604e0d 100644
--- a/progs/perf/teximage.c
+++ b/progs/perf/teximage.c
@@ -1,210 +1,210 @@
-/*

- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * VMWARE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-/**

- * Measure glTexSubImage2D rate

- *

- * Brian Paul

- * 16 Sep 2009

- */

-

-#include "glmain.h"

-#include "common.h"

-

-

-int WinWidth = 100, WinHeight = 100;

-

-static GLuint VBO;

-static GLuint TexObj = 0;

-static GLubyte *TexImage = NULL;

-static GLsizei TexSize;

-static GLenum TexSrcFormat, TexSrcType;

-

-static const GLboolean DrawPoint = GL_TRUE;

-static const GLboolean TexSubImage4 = GL_TRUE;

-

-struct vertex

-{

-   GLfloat x, y, s, t;

-};

-

-static const struct vertex vertices[1] = {

-   { 0.0, 0.0, 0.5, 0.5 },

-};

-

-

-#define VOFFSET(F) ((void *) offsetof(struct vertex, F))

-

-/** Called from test harness/main */

-void

-PerfInit(void)

-{

-   /* setup VBO w/ vertex data */

-   glGenBuffersARB(1, &VBO);

-   glBindBufferARB(GL_ARRAY_BUFFER_ARB, VBO);

-   glBufferDataARB(GL_ARRAY_BUFFER_ARB,

-                   sizeof(vertices), vertices, GL_STATIC_DRAW_ARB);

-   glVertexPointer(2, GL_FLOAT, sizeof(struct vertex), VOFFSET(x));

-   glTexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), VOFFSET(s));

-   glEnableClientState(GL_VERTEX_ARRAY);

-   glEnableClientState(GL_TEXTURE_COORD_ARRAY);

-

-   /* texture */

-   glGenTextures(1, &TexObj);

-   glBindTexture(GL_TEXTURE_2D, TexObj);

-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

-   glEnable(GL_TEXTURE_2D);

-}

-

-

-static void

-UploadTexImage2D(unsigned count)

-{

-   unsigned i;

-   for (i = 0; i < count; i++) {

-      /* XXX is this equivalent to a glTexSubImage call since we're

-       * always specifying the same image size?  That case isn't optimized

-       * in Mesa but may be optimized in other drivers.  Note sure how

-       * much difference that might make.

-       */

-      glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,

-                   TexSize, TexSize, 0,

-                   TexSrcFormat, TexSrcType, TexImage);

-      if (DrawPoint)

-         glDrawArrays(GL_POINTS, 0, 1);

-   }

-   glFinish();

-}

-

-

-static void

-UploadTexSubImage2D(unsigned count)

-{

-   unsigned i;

-   for (i = 0; i < count; i++) {

-      if (TexSubImage4) {

-         GLsizei halfSize = (TexSize == 1) ? 1 : TexSize / 2;

-         GLsizei halfPos = TexSize - halfSize;

-         /* do glTexSubImage2D in four pieces */

-         /* lower-left */

-         glPixelStorei(GL_UNPACK_ROW_LENGTH, TexSize);

-         glTexSubImage2D(GL_TEXTURE_2D, 0,

-                         0, 0, halfSize, halfSize,

-                         TexSrcFormat, TexSrcType, TexImage);

-         /* lower-right */

-         glPixelStorei(GL_UNPACK_SKIP_PIXELS, halfPos);

-         glTexSubImage2D(GL_TEXTURE_2D, 0,

-                         halfPos, 0, halfSize, halfSize,

-                         TexSrcFormat, TexSrcType, TexImage);

-         /* upper-left */

-         glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);

-         glPixelStorei(GL_UNPACK_SKIP_ROWS, halfPos);

-         glTexSubImage2D(GL_TEXTURE_2D, 0,

-                         0, halfPos, halfSize, halfSize,

-                         TexSrcFormat, TexSrcType, TexImage);

-         /* upper-right */

-         glPixelStorei(GL_UNPACK_SKIP_PIXELS, halfPos);

-         glPixelStorei(GL_UNPACK_SKIP_ROWS, halfPos);

-         glTexSubImage2D(GL_TEXTURE_2D, 0,

-                         halfPos, halfPos, halfSize, halfSize,

-                         TexSrcFormat, TexSrcType, TexImage);

-         /* reset the unpacking state */

-         glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);

-         glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);

-         glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);

-      }

-      else {

-         /* replace whole texture image at once */

-         glTexSubImage2D(GL_TEXTURE_2D, 0,

-                         0, 0, TexSize, TexSize,

-                         TexSrcFormat, TexSrcType, TexImage);

-      }

-      if (DrawPoint)

-         glDrawArrays(GL_POINTS, 0, 1);

-   }

-   glFinish();

-}

-

-

-/* XXX any other formats to measure? */

-static const struct {

-   GLenum format, type;

-   const char *name;

-} SrcFormats[] = {

-   { GL_RGBA, GL_UNSIGNED_BYTE, "GL_RGBA/GLubyte" },

-   { GL_BGRA, GL_UNSIGNED_BYTE, "GL_BGRA/GLubyte" },

-   { 0, 0, NULL }

-};

-

-

-

-/** Called from test harness/main */

-void

-PerfDraw(void)

-{

-   GLint maxSize;

-   double rate;

-   GLint fmt, subImage;

-

-   glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxSize);

-

-   /* loop over source data formats */

-   for (fmt = 0; SrcFormats[fmt].format; fmt++) {

-      TexSrcFormat = SrcFormats[fmt].format;

-      TexSrcType = SrcFormats[fmt].type;

-

-      /* loop over glTexImage, glTexSubImage */

-      for (subImage = 0; subImage < 2; subImage++) {

-

-         /* loop over texture sizes */

-         for (TexSize = 16; TexSize <= maxSize; TexSize *= 2) {

-            GLint bytesPerImage;

-            double mbPerSec;

-

-            bytesPerImage = TexSize * TexSize * 4;

-            TexImage = malloc(bytesPerImage);

-

-            if (subImage) {

-               /* create initial, empty texture */

-               glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,

-                            TexSize, TexSize, 0,

-                            TexSrcFormat, TexSrcType, NULL);

-               rate = PerfMeasureRate(UploadTexSubImage2D);

-            }

-            else {

-               rate = PerfMeasureRate(UploadTexImage2D);

-            }

-

-            mbPerSec = rate * bytesPerImage / (1024.0 * 1024.0);

-

-            printf("  glTex%sImage2D(%s %d x %d): "

-                   "%.1f images/sec, %.1f MB/sec\n",

-                   (subImage ? "Sub" : ""),

-                   SrcFormats[fmt].name, TexSize, TexSize, rate, mbPerSec);

-

-            free(TexImage);

-         }

-      }

-   }

-

-   exit(0);

-}

+/*
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * VMWARE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * Measure glTexSubImage2D rate
+ *
+ * Brian Paul
+ * 16 Sep 2009
+ */
+
+#include "glmain.h"
+#include "common.h"
+
+
+int WinWidth = 100, WinHeight = 100;
+
+static GLuint VBO;
+static GLuint TexObj = 0;
+static GLubyte *TexImage = NULL;
+static GLsizei TexSize;
+static GLenum TexSrcFormat, TexSrcType;
+
+static const GLboolean DrawPoint = GL_TRUE;
+static const GLboolean TexSubImage4 = GL_TRUE;
+
+struct vertex
+{
+   GLfloat x, y, s, t;
+};
+
+static const struct vertex vertices[1] = {
+   { 0.0, 0.0, 0.5, 0.5 },
+};
+
+
+#define VOFFSET(F) ((void *) offsetof(struct vertex, F))
+
+/** Called from test harness/main */
+void
+PerfInit(void)
+{
+   /* setup VBO w/ vertex data */
+   glGenBuffersARB(1, &VBO);
+   glBindBufferARB(GL_ARRAY_BUFFER_ARB, VBO);
+   glBufferDataARB(GL_ARRAY_BUFFER_ARB,
+                   sizeof(vertices), vertices, GL_STATIC_DRAW_ARB);
+   glVertexPointer(2, GL_FLOAT, sizeof(struct vertex), VOFFSET(x));
+   glTexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), VOFFSET(s));
+   glEnableClientState(GL_VERTEX_ARRAY);
+   glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+
+   /* texture */
+   glGenTextures(1, &TexObj);
+   glBindTexture(GL_TEXTURE_2D, TexObj);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+   glEnable(GL_TEXTURE_2D);
+}
+
+
+static void
+UploadTexImage2D(unsigned count)
+{
+   unsigned i;
+   for (i = 0; i < count; i++) {
+      /* XXX is this equivalent to a glTexSubImage call since we're
+       * always specifying the same image size?  That case isn't optimized
+       * in Mesa but may be optimized in other drivers.  Note sure how
+       * much difference that might make.
+       */
+      glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
+                   TexSize, TexSize, 0,
+                   TexSrcFormat, TexSrcType, TexImage);
+      if (DrawPoint)
+         glDrawArrays(GL_POINTS, 0, 1);
+   }
+   glFinish();
+}
+
+
+static void
+UploadTexSubImage2D(unsigned count)
+{
+   unsigned i;
+   for (i = 0; i < count; i++) {
+      if (TexSubImage4) {
+         GLsizei halfSize = (TexSize == 1) ? 1 : TexSize / 2;
+         GLsizei halfPos = TexSize - halfSize;
+         /* do glTexSubImage2D in four pieces */
+         /* lower-left */
+         glPixelStorei(GL_UNPACK_ROW_LENGTH, TexSize);
+         glTexSubImage2D(GL_TEXTURE_2D, 0,
+                         0, 0, halfSize, halfSize,
+                         TexSrcFormat, TexSrcType, TexImage);
+         /* lower-right */
+         glPixelStorei(GL_UNPACK_SKIP_PIXELS, halfPos);
+         glTexSubImage2D(GL_TEXTURE_2D, 0,
+                         halfPos, 0, halfSize, halfSize,
+                         TexSrcFormat, TexSrcType, TexImage);
+         /* upper-left */
+         glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+         glPixelStorei(GL_UNPACK_SKIP_ROWS, halfPos);
+         glTexSubImage2D(GL_TEXTURE_2D, 0,
+                         0, halfPos, halfSize, halfSize,
+                         TexSrcFormat, TexSrcType, TexImage);
+         /* upper-right */
+         glPixelStorei(GL_UNPACK_SKIP_PIXELS, halfPos);
+         glPixelStorei(GL_UNPACK_SKIP_ROWS, halfPos);
+         glTexSubImage2D(GL_TEXTURE_2D, 0,
+                         halfPos, halfPos, halfSize, halfSize,
+                         TexSrcFormat, TexSrcType, TexImage);
+         /* reset the unpacking state */
+         glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+         glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+         glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
+      }
+      else {
+         /* replace whole texture image at once */
+         glTexSubImage2D(GL_TEXTURE_2D, 0,
+                         0, 0, TexSize, TexSize,
+                         TexSrcFormat, TexSrcType, TexImage);
+      }
+      if (DrawPoint)
+         glDrawArrays(GL_POINTS, 0, 1);
+   }
+   glFinish();
+}
+
+
+/* XXX any other formats to measure? */
+static const struct {
+   GLenum format, type;
+   const char *name;
+} SrcFormats[] = {
+   { GL_RGBA, GL_UNSIGNED_BYTE, "GL_RGBA/GLubyte" },
+   { GL_BGRA, GL_UNSIGNED_BYTE, "GL_BGRA/GLubyte" },
+   { 0, 0, NULL }
+};
+
+
+
+/** Called from test harness/main */
+void
+PerfDraw(void)
+{
+   GLint maxSize;
+   double rate;
+   GLint fmt, subImage;
+
+   glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxSize);
+
+   /* loop over source data formats */
+   for (fmt = 0; SrcFormats[fmt].format; fmt++) {
+      TexSrcFormat = SrcFormats[fmt].format;
+      TexSrcType = SrcFormats[fmt].type;
+
+      /* loop over glTexImage, glTexSubImage */
+      for (subImage = 0; subImage < 2; subImage++) {
+
+         /* loop over texture sizes */
+         for (TexSize = 16; TexSize <= maxSize; TexSize *= 2) {
+            GLint bytesPerImage;
+            double mbPerSec;
+
+            bytesPerImage = TexSize * TexSize * 4;
+            TexImage = malloc(bytesPerImage);
+
+            if (subImage) {
+               /* create initial, empty texture */
+               glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
+                            TexSize, TexSize, 0,
+                            TexSrcFormat, TexSrcType, NULL);
+               rate = PerfMeasureRate(UploadTexSubImage2D);
+            }
+            else {
+               rate = PerfMeasureRate(UploadTexImage2D);
+            }
+
+            mbPerSec = rate * bytesPerImage / (1024.0 * 1024.0);
+
+            printf("  glTex%sImage2D(%s %d x %d): "
+                   "%.1f images/sec, %.1f MB/sec\n",
+                   (subImage ? "Sub" : ""),
+                   SrcFormats[fmt].name, TexSize, TexSize, rate, mbPerSec);
+
+            free(TexImage);
+         }
+      }
+   }
+
+   exit(0);
+}