<div dir="ltr">enh = enhanced<div><br></div><div>Suggestions on something more descriptive?</div><div>teximage2?</div><div>bench_teximage?</div><div>teximage_perf?</div><div><br></div><div>Thanks for the feedback.</div></div>
<div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Nov 7, 2013 at 5:49 PM, Brian Paul <span dir="ltr"><<a href="mailto:brianp@vmware.com" target="_blank">brianp@vmware.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="im">On 11/07/2013 02:16 PM, Courtney Goeltzenleuchter wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Needed test to measure texture upload speed under a variety<br>
of modes (mipmap, source format, internal format, size, etc.)<br>
This new test has an interactive run mode like the other Mesa<br>
Perf tests but also includes command line options to make<br>
it automatable.<br>
Fix up code formatting.<br>
<br>
Signed-off-by: Courtney Goeltzenleuchter <courtney@LunarG.com><br>
---<br>
src/perf/CMakeLists.txt | 1 +<br>
src/perf/Makefile.am | 1 +<br>
src/perf/bench_glTexImage2D.sh | 13 ++<br>
src/perf/teximage_enh.README | 10 ++<br>
src/perf/teximage_enh.c | 391 ++++++++++++++++++++++++++++++<u></u>+++++++++++<br>
</blockquote>
<br></div>
What does "enh" mean? Maybe you could find something a bit more obvious?<div><div class="h5"><br>
<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
5 files changed, 416 insertions(+)<br>
create mode 100755 src/perf/bench_glTexImage2D.sh<br>
create mode 100644 src/perf/teximage_enh.README<br>
create mode 100644 src/perf/teximage_enh.c<br>
<br>
diff --git a/src/perf/CMakeLists.txt b/src/perf/CMakeLists.txt<br>
index 68b6875..ded6666 100644<br>
--- a/src/perf/CMakeLists.txt<br>
+++ b/src/perf/CMakeLists.txt<br>
@@ -28,6 +28,7 @@ set (targets<br>
readpixels<br>
swapbuffers<br>
teximage<br>
+ teximage_enh<br>
vbo<br>
vertexrate<br>
)<br>
diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am<br>
index 5363c58..1cc5c43 100644<br>
--- a/src/perf/Makefile.am<br>
+++ b/src/perf/Makefile.am<br>
@@ -51,6 +51,7 @@ bin_PROGRAMS = \<br>
readpixels \<br>
swapbuffers \<br>
teximage \<br>
+ teximage_enh \<br>
vbo \<br>
vertexrate \<br>
glslstateschange<br>
diff --git a/src/perf/bench_glTexImage2D.<u></u>sh b/src/perf/bench_glTexImage2D.<u></u>sh<br>
new file mode 100755<br>
index 0000000..c63a251<br>
--- /dev/null<br>
+++ b/src/perf/bench_glTexImage2D.<u></u>sh<br>
@@ -0,0 +1,13 @@<br>
+#!/bin/bash<br>
+./teximage_enh --width 1024 --height 1024 --type GL_UNSIGNED_BYTE --format GL_RGBA --texelsize 4 --internalformat GL_RGBA --csvstyle full --test TexImage<br>
+./teximage_enh --width 1024 --height 1024 --type GL_UNSIGNED_BYTE --format GL_RGBA --texelsize 4 --internalformat GL_RGB --csvstyle data --test TexImage<br>
+./teximage_enh --width 512 --height 512 --type GL_UNSIGNED_BYTE --format GL_RGBA --texelsize 4 --internalformat GL_RGBA --csvstyle data --test TexImage<br>
+./teximage_enh --width 512 --height 512 --type GL_UNSIGNED_BYTE --format GL_RGBA --texelsize 4 --internalformat GL_RGB --csvstyle data --test TexImage<br>
+./teximage_enh --width 256 --height 256 --type GL_UNSIGNED_BYTE --format GL_RGBA --texelsize 4 --internalformat GL_RGBA --csvstyle data --test TexImage<br>
+./teximage_enh --width 256 --height 256 --type GL_UNSIGNED_BYTE --format GL_RGBA --texelsize 4 --internalformat GL_RGB --csvstyle data --test TexImage<br>
+./teximage_enh --width 1024 --height 1024 --type GL_UNSIGNED_BYTE --format GL_RGBA --texelsize 4 --internalformat GL_RGBA --csvstyle data --test TexImage_Mipmap<br>
+./teximage_enh --width 1024 --height 1024 --type GL_UNSIGNED_BYTE --format GL_RGBA --texelsize 4 --internalformat GL_RGB --csvstyle data --test TexImage_Mipmap<br>
+./teximage_enh --width 512 --height 512 --type GL_UNSIGNED_BYTE --format GL_RGBA --texelsize 4 --internalformat GL_RGBA --csvstyle data --test TexImage_Mipmap<br>
+./teximage_enh --width 512 --height 512 --type GL_UNSIGNED_BYTE --format GL_RGBA --texelsize 4 --internalformat GL_RGB --csvstyle data --test TexImage_Mipmap<br>
+./teximage_enh --width 256 --height 256 --type GL_UNSIGNED_BYTE --format GL_RGBA --texelsize 4 --internalformat GL_RGBA --csvstyle data --test TexImage_Mipmap<br>
+./teximage_enh --width 256 --height 256 --type GL_UNSIGNED_BYTE --format GL_RGBA --texelsize 4 --internalformat GL_RGB --csvstyle data --test TexImage_Mipmap<br>
diff --git a/src/perf/teximage_enh.README b/src/perf/teximage_enh.README<br>
new file mode 100644<br>
index 0000000..44e8aea<br>
--- /dev/null<br>
+++ b/src/perf/teximage_enh.README<br>
@@ -0,0 +1,10 @@<br>
+glTexImage2D benchmark<br>
+ - executable name: teximage_enh<br>
+ - modified files: CMakeLists.txt Makefile.am<br>
+ - new files:<br>
+ teximage_enh.c - code<br>
+ bench_glTexImage2D.sh<br>
+direct run command: ./teximage_enh<br>
+<br>
+script usage: ./test_glTexImage2D.sh<br>
+<br>
diff --git a/src/perf/teximage_enh.c b/src/perf/teximage_enh.c<br>
new file mode 100644<br>
index 0000000..9bb3944<br>
--- /dev/null<br>
+++ b/src/perf/teximage_enh.c<br>
@@ -0,0 +1,391 @@<br>
+/*<br>
+ * Copyright (C) 2009 VMware, Inc. All Rights Reserved.<br>
</blockquote>
<br></div></div>
Maybe add your own LunarG copyright line.<div class="im"><br>
<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ *<br>
+ * Permission is hereby granted, free of charge, to any person obtaining a<br>
+ * copy of this software and associated documentation files (the "Software"),<br>
+ * to deal in the Software without restriction, including without limitation<br>
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,<br>
+ * and/or sell copies of the Software, and to permit persons to whom the<br>
+ * Software is furnished to do so, subject to the following conditions:<br>
+ *<br>
+ * The above copyright notice and this permission notice shall be included<br>
+ * in all copies or substantial portions of the Software.<br>
+ *<br>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS<br>
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,<br>
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL<br>
+ * VMWARE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN<br>
</blockquote>
<br></div>
s/VMWARE/THE AUTHORS/<div class="im"><br>
<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN<br>
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.<br>
+ */<br>
+<br>
</blockquote>
<br></div>
I really only skimmed the rest. If the test does what you need that's fine. But consider a more descriptive name.<br>
<br>
Acked-by: Brian Paul <<a href="mailto:brianp@vmware.com" target="_blank">brianp@vmware.com</a>><br>
<br>
<br>
______________________________<u></u>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/<u></u>mailman/listinfo/mesa-dev</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr">Courtney Goeltzenleuchter<br><div>LunarG</div><div><img src="http://media.lunarg.com/wp-content/themes/LunarG/images/logo.png" width="96" height="65"><br>
</div></div>
</div>