Get GLBench passing on Arm Mesa softpipe.
Reduce test run count for long tests, instead of returning failure.
Stop the texture update test from needlessly retaining pixel array allocations.
Fix EGL context leak that led to out of memory failures.
Return failure when context initialization fails.
Add softpipe reference images.
TEST=GLBench now passes on Arm softpipe. Still passes on i915.
Change-Id: I0b79676c1833d2a82cd625bf822985415692153a
Reviewed-on: https://gerrit.chromium.org/gerrit/24407
Tested-by: Stuart Abercrombie <sabercrombie@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Commit-Ready: Stuart Abercrombie <sabercrombie@chromium.org>
diff --git a/client/deps/glbench-images/glbench_reference_images/index.html b/client/deps/glbench-images/glbench_reference_images/index.html
index ef69af2..a8f2406 100644
--- a/client/deps/glbench-images/glbench_reference_images/index.html
+++ b/client/deps/glbench-images/glbench_reference_images/index.html
@@ -20,6 +20,7 @@
mpixels_sec_fill_tex_nearest.pixmd5-dfe2a7b942b3d7fe83ba2da0ec08c513.png
mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-1e13ac02fa3ec0bacf12d5310c85f7d4.png
mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-45ca1f1cd1d89c4cb16ba5309c17ba3a.png
+mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-602cdedbee8d9db08b8a7aeab4c66286.png
mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-7a2c4c002abaa554796abbf4dc1cc91f.png
mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-83a9d632417b137d106db2c55cb77dfa.png
mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-8498b4fdf5faed06b0603f258cd09519.png
@@ -31,12 +32,14 @@
mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-4ceecd9d30a116539b2143f61acdfead.png
mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-b89219be6f42124caa755c5c7a599688.png
mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-c6ab57f8ef16fdcb1548a0e6612d76d4.png
+mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-ceeec2dfe4a4496e59b6d485e26372f0.png
mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-ede1a247172d2ef1dc24d1ceeb05c9f6.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-12808458f0dc11adee0ee505e83d6dbb.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-1ebdb98ee694ad00321b1cbd6b7dfb84.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-22861fd4bee6638cc0947ecf6b46dfaa.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-7c24c3d02541ce4f20e94d5fb6aa9807.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-a33b21a342da3907847dd6879c64644f.png
+mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-aee9d8544f1efd20e7eea8df3d45046e.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-d602f36ad48be597993b502648d56963.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-e0641b849e4a0b9870483e3c11ab27a1.png
mpixels_sec_fill_tex_trilinear_nearest_05.pixmd5-9b4332127e1c291bb333abba96631aeb.png
@@ -48,64 +51,88 @@
mpixels_sec_pixel_read.pixmd5-20dbc406b95e214a799a6a7f9c700d2f.png
mpixels_sec_pixel_read.pixmd5-ad9e896c6cc8bbb6260b438477c8803f.png
mpixels_sec_varyings_shader_1.pixmd5-3d8b0ef1718bd994f22731dfb6c8563e.png
+mpixels_sec_varyings_shader_1.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
mpixels_sec_varyings_shader_1.pixmd5-ee747b5aa2bc646091b04b877992a498.png
mpixels_sec_varyings_shader_1.pixmd5-fe5a5fdd2a421e208de531615ce58dc9.png
mpixels_sec_varyings_shader_2.pixmd5-3d8b0ef1718bd994f22731dfb6c8563e.png
+mpixels_sec_varyings_shader_2.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
mpixels_sec_varyings_shader_2.pixmd5-ee747b5aa2bc646091b04b877992a498.png
mpixels_sec_varyings_shader_2.pixmd5-fe5a5fdd2a421e208de531615ce58dc9.png
mpixels_sec_varyings_shader_4.pixmd5-3d8b0ef1718bd994f22731dfb6c8563e.png
+mpixels_sec_varyings_shader_4.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
mpixels_sec_varyings_shader_4.pixmd5-ee747b5aa2bc646091b04b877992a498.png
mpixels_sec_varyings_shader_4.pixmd5-fe5a5fdd2a421e208de531615ce58dc9.png
mpixels_sec_varyings_shader_8.pixmd5-3d8b0ef1718bd994f22731dfb6c8563e.png
+mpixels_sec_varyings_shader_8.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
mpixels_sec_varyings_shader_8.pixmd5-ee747b5aa2bc646091b04b877992a498.png
mpixels_sec_varyings_shader_8.pixmd5-fe5a5fdd2a421e208de531615ce58dc9.png
+mpixels_sec_yuv_shader_1.pixmd5-3b484c230d869d7664f5cddc1f7aab03.png
mpixels_sec_yuv_shader_1.pixmd5-5b4ef5f496d92150b89611cf83154669.png
mpixels_sec_yuv_shader_1.pixmd5-7d0d40c7e69493aa075b8be42e4580aa.png
mpixels_sec_yuv_shader_1.pixmd5-fd3f7643cc8facf3b1382c77ad7b1a41.png
mpixels_sec_yuv_shader_2.pixmd5-2251de4723d8fef7f8347e098739099e.png
mpixels_sec_yuv_shader_2.pixmd5-255d5dd5d72aa708db418201b927f133.png
+mpixels_sec_yuv_shader_2.pixmd5-a44a13911d3e1acbc942fa481061e109.png
mpixels_sec_yuv_shader_2.pixmd5-ad9e896c6cc8bbb6260b438477c8803f.png
mpixels_sec_yuv_shader_2.pixmd5-aebca66f973282a4a94f80fae27ae8af.png
mpixels_sec_yuv_shader_2.pixmd5-fd3f7643cc8facf3b1382c77ad7b1a41.png
mpixels_sec_yuv_shader_3.pixmd5-3807713b85ebdb581e2ead613a51bc69.png
+mpixels_sec_yuv_shader_3.pixmd5-950fc271747830b06b949cc5e0702153.png
mpixels_sec_yuv_shader_3.pixmd5-9f7d2ebedd765397825f988ae6508f7c.png
mpixels_sec_yuv_shader_3.pixmd5-ad9e896c6cc8bbb6260b438477c8803f.png
mpixels_sec_yuv_shader_3.pixmd5-fd3f7643cc8facf3b1382c77ad7b1a41.png
mpixels_sec_yuv_shader_4.pixmd5-3807713b85ebdb581e2ead613a51bc69.png
+mpixels_sec_yuv_shader_4.pixmd5-950fc271747830b06b949cc5e0702153.png
mpixels_sec_yuv_shader_4.pixmd5-9f7d2ebedd765397825f988ae6508f7c.png
mpixels_sec_yuv_shader_4.pixmd5-ad9e896c6cc8bbb6260b438477c8803f.png
mpixels_sec_yuv_shader_4.pixmd5-fd3f7643cc8facf3b1382c77ad7b1a41.png
mtexel_sec_texture_update_teximage2d_1024.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_1024.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_1024.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_128.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_128.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_128.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_1536.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_1536.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_1536.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_2048.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_2048.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_2048.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_256.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_256.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_256.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_32.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_32.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_32.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_512.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_512.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_512.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_768.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_768.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_768.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_1024.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_1024.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_1024.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_128.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_128.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_128.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_1536.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_1536.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_1536.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_2048.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_2048.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_2048.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_256.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_256.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_256.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_32.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_32.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_32.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_512.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_512.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_512.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_768.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_768.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_768.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtri_sec_triangle_setup_all_culled.pixmd5-20dbc406b95e214a799a6a7f9c700d2f.png
mtri_sec_triangle_setup_half_culled.pixmd5-b0531b06529da2b52d28ad95a217f142.png
diff --git a/client/deps/glbench-images/glbench_reference_images/mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-602cdedbee8d9db08b8a7aeab4c66286.png b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-602cdedbee8d9db08b8a7aeab4c66286.png
new file mode 100644
index 0000000..844e0ed
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-602cdedbee8d9db08b8a7aeab4c66286.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-ceeec2dfe4a4496e59b6d485e26372f0.png b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-ceeec2dfe4a4496e59b6d485e26372f0.png
new file mode 100644
index 0000000..313dfbc
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-ceeec2dfe4a4496e59b6d485e26372f0.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-aee9d8544f1efd20e7eea8df3d45046e.png b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-aee9d8544f1efd20e7eea8df3d45046e.png
new file mode 100644
index 0000000..eca92f0
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-aee9d8544f1efd20e7eea8df3d45046e.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mpixels_sec_varyings_shader_1.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_varyings_shader_1.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
new file mode 100644
index 0000000..7542fa0
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_varyings_shader_1.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mpixels_sec_varyings_shader_2.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_varyings_shader_2.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
new file mode 100644
index 0000000..7542fa0
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_varyings_shader_2.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mpixels_sec_varyings_shader_4.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_varyings_shader_4.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
new file mode 100644
index 0000000..7542fa0
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_varyings_shader_4.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mpixels_sec_varyings_shader_8.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_varyings_shader_8.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
new file mode 100644
index 0000000..7542fa0
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_varyings_shader_8.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mpixels_sec_yuv_shader_1.pixmd5-3b484c230d869d7664f5cddc1f7aab03.png b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_yuv_shader_1.pixmd5-3b484c230d869d7664f5cddc1f7aab03.png
new file mode 100644
index 0000000..fbcc54d
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_yuv_shader_1.pixmd5-3b484c230d869d7664f5cddc1f7aab03.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mpixels_sec_yuv_shader_2.pixmd5-a44a13911d3e1acbc942fa481061e109.png b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_yuv_shader_2.pixmd5-a44a13911d3e1acbc942fa481061e109.png
new file mode 100644
index 0000000..1cf79a9
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_yuv_shader_2.pixmd5-a44a13911d3e1acbc942fa481061e109.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mpixels_sec_yuv_shader_3.pixmd5-950fc271747830b06b949cc5e0702153.png b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_yuv_shader_3.pixmd5-950fc271747830b06b949cc5e0702153.png
new file mode 100644
index 0000000..59df565
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_yuv_shader_3.pixmd5-950fc271747830b06b949cc5e0702153.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mpixels_sec_yuv_shader_4.pixmd5-950fc271747830b06b949cc5e0702153.png b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_yuv_shader_4.pixmd5-950fc271747830b06b949cc5e0702153.png
new file mode 100644
index 0000000..59df565
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mpixels_sec_yuv_shader_4.pixmd5-950fc271747830b06b949cc5e0702153.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_1024.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_1024.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_1024.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_128.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_128.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_128.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_1536.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_1536.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_1536.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_2048.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_2048.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_2048.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_256.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_256.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_256.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_32.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_32.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_32.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_512.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_512.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_512.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_768.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_768.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_teximage2d_768.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_1024.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_1024.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_1024.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_128.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_128.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_128.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_1536.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_1536.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_1536.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_2048.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_2048.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_2048.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_256.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_256.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_256.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_32.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_32.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_32.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_512.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_512.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_512.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_768.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_768.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
new file mode 100644
index 0000000..d352d2f
--- /dev/null
+++ b/client/deps/glbench-images/glbench_reference_images/mtexel_sec_texture_update_texsubimage2d_768.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
Binary files differ
diff --git a/client/deps/glbench/glbench_reference_images.txt b/client/deps/glbench/glbench_reference_images.txt
index ef69af2..a8f2406 100644
--- a/client/deps/glbench/glbench_reference_images.txt
+++ b/client/deps/glbench/glbench_reference_images.txt
@@ -20,6 +20,7 @@
mpixels_sec_fill_tex_nearest.pixmd5-dfe2a7b942b3d7fe83ba2da0ec08c513.png
mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-1e13ac02fa3ec0bacf12d5310c85f7d4.png
mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-45ca1f1cd1d89c4cb16ba5309c17ba3a.png
+mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-602cdedbee8d9db08b8a7aeab4c66286.png
mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-7a2c4c002abaa554796abbf4dc1cc91f.png
mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-83a9d632417b137d106db2c55cb77dfa.png
mpixels_sec_fill_tex_trilinear_linear_01.pixmd5-8498b4fdf5faed06b0603f258cd09519.png
@@ -31,12 +32,14 @@
mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-4ceecd9d30a116539b2143f61acdfead.png
mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-b89219be6f42124caa755c5c7a599688.png
mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-c6ab57f8ef16fdcb1548a0e6612d76d4.png
+mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-ceeec2dfe4a4496e59b6d485e26372f0.png
mpixels_sec_fill_tex_trilinear_linear_04.pixmd5-ede1a247172d2ef1dc24d1ceeb05c9f6.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-12808458f0dc11adee0ee505e83d6dbb.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-1ebdb98ee694ad00321b1cbd6b7dfb84.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-22861fd4bee6638cc0947ecf6b46dfaa.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-7c24c3d02541ce4f20e94d5fb6aa9807.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-a33b21a342da3907847dd6879c64644f.png
+mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-aee9d8544f1efd20e7eea8df3d45046e.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-d602f36ad48be597993b502648d56963.png
mpixels_sec_fill_tex_trilinear_linear_05.pixmd5-e0641b849e4a0b9870483e3c11ab27a1.png
mpixels_sec_fill_tex_trilinear_nearest_05.pixmd5-9b4332127e1c291bb333abba96631aeb.png
@@ -48,64 +51,88 @@
mpixels_sec_pixel_read.pixmd5-20dbc406b95e214a799a6a7f9c700d2f.png
mpixels_sec_pixel_read.pixmd5-ad9e896c6cc8bbb6260b438477c8803f.png
mpixels_sec_varyings_shader_1.pixmd5-3d8b0ef1718bd994f22731dfb6c8563e.png
+mpixels_sec_varyings_shader_1.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
mpixels_sec_varyings_shader_1.pixmd5-ee747b5aa2bc646091b04b877992a498.png
mpixels_sec_varyings_shader_1.pixmd5-fe5a5fdd2a421e208de531615ce58dc9.png
mpixels_sec_varyings_shader_2.pixmd5-3d8b0ef1718bd994f22731dfb6c8563e.png
+mpixels_sec_varyings_shader_2.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
mpixels_sec_varyings_shader_2.pixmd5-ee747b5aa2bc646091b04b877992a498.png
mpixels_sec_varyings_shader_2.pixmd5-fe5a5fdd2a421e208de531615ce58dc9.png
mpixels_sec_varyings_shader_4.pixmd5-3d8b0ef1718bd994f22731dfb6c8563e.png
+mpixels_sec_varyings_shader_4.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
mpixels_sec_varyings_shader_4.pixmd5-ee747b5aa2bc646091b04b877992a498.png
mpixels_sec_varyings_shader_4.pixmd5-fe5a5fdd2a421e208de531615ce58dc9.png
mpixels_sec_varyings_shader_8.pixmd5-3d8b0ef1718bd994f22731dfb6c8563e.png
+mpixels_sec_varyings_shader_8.pixmd5-ae8f3baa86cc8a23b53e6932f812bad1.png
mpixels_sec_varyings_shader_8.pixmd5-ee747b5aa2bc646091b04b877992a498.png
mpixels_sec_varyings_shader_8.pixmd5-fe5a5fdd2a421e208de531615ce58dc9.png
+mpixels_sec_yuv_shader_1.pixmd5-3b484c230d869d7664f5cddc1f7aab03.png
mpixels_sec_yuv_shader_1.pixmd5-5b4ef5f496d92150b89611cf83154669.png
mpixels_sec_yuv_shader_1.pixmd5-7d0d40c7e69493aa075b8be42e4580aa.png
mpixels_sec_yuv_shader_1.pixmd5-fd3f7643cc8facf3b1382c77ad7b1a41.png
mpixels_sec_yuv_shader_2.pixmd5-2251de4723d8fef7f8347e098739099e.png
mpixels_sec_yuv_shader_2.pixmd5-255d5dd5d72aa708db418201b927f133.png
+mpixels_sec_yuv_shader_2.pixmd5-a44a13911d3e1acbc942fa481061e109.png
mpixels_sec_yuv_shader_2.pixmd5-ad9e896c6cc8bbb6260b438477c8803f.png
mpixels_sec_yuv_shader_2.pixmd5-aebca66f973282a4a94f80fae27ae8af.png
mpixels_sec_yuv_shader_2.pixmd5-fd3f7643cc8facf3b1382c77ad7b1a41.png
mpixels_sec_yuv_shader_3.pixmd5-3807713b85ebdb581e2ead613a51bc69.png
+mpixels_sec_yuv_shader_3.pixmd5-950fc271747830b06b949cc5e0702153.png
mpixels_sec_yuv_shader_3.pixmd5-9f7d2ebedd765397825f988ae6508f7c.png
mpixels_sec_yuv_shader_3.pixmd5-ad9e896c6cc8bbb6260b438477c8803f.png
mpixels_sec_yuv_shader_3.pixmd5-fd3f7643cc8facf3b1382c77ad7b1a41.png
mpixels_sec_yuv_shader_4.pixmd5-3807713b85ebdb581e2ead613a51bc69.png
+mpixels_sec_yuv_shader_4.pixmd5-950fc271747830b06b949cc5e0702153.png
mpixels_sec_yuv_shader_4.pixmd5-9f7d2ebedd765397825f988ae6508f7c.png
mpixels_sec_yuv_shader_4.pixmd5-ad9e896c6cc8bbb6260b438477c8803f.png
mpixels_sec_yuv_shader_4.pixmd5-fd3f7643cc8facf3b1382c77ad7b1a41.png
mtexel_sec_texture_update_teximage2d_1024.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_1024.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_1024.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_128.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_128.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_128.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_1536.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_1536.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_1536.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_2048.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_2048.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_2048.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_256.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_256.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_256.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_32.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_32.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_32.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_512.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_512.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_512.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_teximage2d_768.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_teximage2d_768.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_teximage2d_768.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_1024.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_1024.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_1024.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_128.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_128.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_128.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_1536.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_1536.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_1536.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_2048.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_2048.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_2048.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_256.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_256.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_256.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_32.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_32.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_32.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_512.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_512.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_512.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtexel_sec_texture_update_texsubimage2d_768.pixmd5-58393fe6eb2b83f0b93457cf0a37c36a.png
+mtexel_sec_texture_update_texsubimage2d_768.pixmd5-5c5fb1de09030a81c58e83661dae6ffa.png
mtexel_sec_texture_update_texsubimage2d_768.pixmd5-dc80ecaa40fe56f7b564a75038776d66.png
mtri_sec_triangle_setup_all_culled.pixmd5-20dbc406b95e214a799a6a7f9c700d2f.png
mtri_sec_triangle_setup_half_culled.pixmd5-b0531b06529da2b52d28ad95a217f142.png
diff --git a/client/deps/glbench/src/egl_stuff.cc b/client/deps/glbench/src/egl_stuff.cc
index 146728f..ac67974 100644
--- a/client/deps/glbench/src/egl_stuff.cc
+++ b/client/deps/glbench/src/egl_stuff.cc
@@ -10,9 +10,9 @@
EGLDisplay g_egl_display = EGL_NO_DISPLAY;
-static EGLConfig egl_config = NULL;
-static EGLSurface egl_surface = NULL;
-static EGLContext egl_context = NULL;
+static EGLConfig g_egl_config = NULL;
+static EGLSurface g_egl_surface = NULL;
+static EGLContext g_egl_context = NULL;
// TODO(ihf): This is a f'ugly macro. Rework this one day.
#define CHECK_EGL() do { \
@@ -25,14 +25,14 @@
EGLNativeWindowType native_window =
static_cast<EGLNativeWindowType>(g_xlib_window);
- egl_surface = eglCreateWindowSurface(g_egl_display, egl_config,
+ g_egl_surface = eglCreateWindowSurface(g_egl_display, g_egl_config,
native_window, NULL);
CHECK_EGL();
return true;
}
XVisualInfo* GetXVisual() {
- if (!egl_config) {
+ if (!g_egl_config) {
EGLint attribs[] = {
EGL_RED_SIZE, 1,
EGL_GREEN_SIZE, 1,
@@ -57,7 +57,7 @@
eglGetConfigs(g_egl_display, NULL, 0, &num_configs);
CHECK_EGL();
- eglChooseConfig(g_egl_display, attribs, &egl_config, 1, &num_configs);
+ eglChooseConfig(g_egl_display, attribs, &g_egl_config, 1, &num_configs);
CHECK_EGL();
}
@@ -66,7 +66,7 @@
// resolved.
#if 0
EGLint visual_id;
- eglGetConfigAttrib(g_egl_display, egl_config, EGL_NATIVE_VISUAL_ID,
+ eglGetConfigAttrib(g_egl_display, g_egl_config, EGL_NATIVE_VISUAL_ID,
&visual_id);
CHECK_EGL();
XVisualInfo vinfo_template;
@@ -89,31 +89,31 @@
EGL_CONTEXT_CLIENT_VERSION, 2,
EGL_NONE
};
- EGLContext egl_context = eglCreateContext(g_egl_display, egl_config,
+ g_egl_context = eglCreateContext(g_egl_display, g_egl_config,
NULL, attribs);
CHECK_EGL();
- eglMakeCurrent(g_egl_display, egl_surface, egl_surface, egl_context);
+ eglMakeCurrent(g_egl_display, g_egl_surface, g_egl_surface, g_egl_context);
CHECK_EGL();
- eglQuerySurface(g_egl_display, egl_surface, EGL_WIDTH, &g_width);
- eglQuerySurface(g_egl_display, egl_surface, EGL_HEIGHT, &g_height);
+ eglQuerySurface(g_egl_display, g_egl_surface, EGL_WIDTH, &g_width);
+ eglQuerySurface(g_egl_display, g_egl_surface, EGL_HEIGHT, &g_height);
return true;
}
void DestroyContext() {
eglMakeCurrent(g_egl_display, NULL, NULL, NULL);
- eglDestroyContext(g_egl_display, egl_context);
+ eglDestroyContext(g_egl_display, g_egl_context);
}
void TerminateGL() {
- eglDestroySurface(g_egl_display, egl_surface);
+ eglDestroySurface(g_egl_display, g_egl_surface);
eglTerminate(g_egl_display);
}
void SwapBuffers() {
- eglSwapBuffers(g_egl_display, egl_surface);
+ eglSwapBuffers(g_egl_display, g_egl_surface);
}
bool SwapInterval(int interval) {
diff --git a/client/deps/glbench/src/main.cc b/client/deps/glbench/src/main.cc
index 3a95b21..f8f99b7 100644
--- a/client/deps/glbench/src/main.cc
+++ b/client/deps/glbench/src/main.cc
@@ -95,7 +95,10 @@
for (unsigned int i = 0; i < arraysize(tests); i++) {
if (!test_is_enabled(tests[i], enabled_tests))
continue;
- InitContext();
+ if (!InitContext()) {
+ printf("InitContext failed\n");
+ return 1;
+ }
tests[i]->Run();
DestroyContext();
}
diff --git a/client/deps/glbench/src/testbase.cc b/client/deps/glbench/src/testbase.cc
index 83c43a8..f748fce 100644
--- a/client/deps/glbench/src/testbase.cc
+++ b/client/deps/glbench/src/testbase.cc
@@ -30,7 +30,8 @@
return time2 - time1;
}
-#define MAX_ITERATION_DURATION_MS 1000000
+// Maximum iteration time of 0.1s for regression approach
+#define MAX_ITERATION_DURATION_US 100000
// Benchmark some draw commands, by running it many times.
// We want to measure the marginal cost, so we try more and more
@@ -39,8 +40,15 @@
// a few samples.
bool Bench(TestBase* test, float *slope, int64_t *bias) {
// Do one iteration in case the driver needs to set up states.
- if (TimeTest(test, 1) > MAX_ITERATION_DURATION_MS)
- return false;
+ uint64_t initial_time = TimeTest(test, 1);
+ if (initial_time > MAX_ITERATION_DURATION_US) {
+ // The test is too slow to do the regression,
+ // so just return a single result.
+ *slope = static_cast<float>(TimeTest(test, 1));
+ *bias = 0;
+ return true;
+ }
+
int64_t count = 0;
int64_t sum_x = 0;
int64_t sum_y = 0;
@@ -131,7 +139,7 @@
coefficient * (inverse ? 1.f / slope : slope),
name_png);
} else {
- printf("# Warning: %s is scales nonlinear, returning zero.\n",
+ printf("# Warning: %s scales non-linearly, returning zero.\n",
testname);
printf("%-45s= 0 []\n", testname);
}
diff --git a/client/deps/glbench/src/textureupdatetest.cc b/client/deps/glbench/src/textureupdatetest.cc
index 0781cb6..06c0dc4 100644
--- a/client/deps/glbench/src/textureupdatetest.cc
+++ b/client/deps/glbench/src/textureupdatetest.cc
@@ -130,10 +130,10 @@
for (unsigned int f = 0; f < arraysize(flavors); f++) {
flavor_ = flavors[f];
int sizes[] = {32, 128, 256, 512, 768, 1024, 1536, 2048};
- for (unsigned int i = 0; i < arraysize(sizes); i++) {
+ for (unsigned int j = 0; j < arraysize(sizes); j++) {
std::string name = "mtexel_sec_" + flavor_names[f] + "_" +
- base::IntToString(sizes[i]);
- width_ = height_ = sizes[i];
+ base::IntToString(sizes[j]);
+ width_ = height_ = sizes[j];
for (int i = 0; i < kNumberOfTextures; ++i) {
pixels_[i].reset(new char[width_ * height_]);
memset(pixels_[i].get(), 255, width_ * height_);
@@ -142,6 +142,9 @@
}
}
+ for (int i = 0; i < kNumberOfTextures; ++i) {
+ pixels_[i].reset();
+ }
glDeleteTextures(1, &texname);
glDeleteProgram(program_);
return true;
