From patchwork Tue May 6 01:10:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 'Timothy Arceri' via Patchwork Forward X-Patchwork-Id: 29682 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 19C722055D for ; Tue, 6 May 2014 01:11:14 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id oz11sf5738445veb.10 for ; Mon, 05 May 2014 18:11:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :reply-to:content-type:content-transfer-encoding; bh=3SfnVyqNV+9GdlniMaXMjZIWp6esnGUW0thJ7qmeucc=; b=fb6sEZEBq/5xPmvQeUSmdSFomq26WnTrLVcU5XgPkQyfxELyzF+EvksMXHhbvmi8Dw iE1irEIJ0N2t3WDOWcfoF78TumTzArxXFXe9yGmgEgFfSlEdiht53APW4jWjJt2HYdgM q3XYNxrLM1STQsCNISVE39KRnBX9Gub/ps92TQ0C74uEh2G+ptMHe4uMEBC0kyToAlqc BiYRQO6AUDDrtGcCLBMnZ3kJhSaiX0TIR/RX2RsDD5KGM5bsRaWI9GMvg2AFU8KkNU1t dC6Pcphr/V5TWz4brgSnMPlFhVG5Tpkqq75XW9b4B2N99I76/6f9p9gkKoZG9sunXX0T W95A== X-Gm-Message-State: ALoCoQn0d6txveiYfe2I78fbG1BwNb6gLCEFEaJbETz3bkx6fpyox1jv3AN3CvyXyMMcttQcKyl0 X-Received: by 10.58.107.203 with SMTP id he11mr19489013veb.12.1399338673988; Mon, 05 May 2014 18:11:13 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.35.210 with SMTP id n76ls2754470qgn.15.gmail; Mon, 05 May 2014 18:11:13 -0700 (PDT) X-Received: by 10.221.42.135 with SMTP id ty7mr13075261vcb.14.1399338673801; Mon, 05 May 2014 18:11:13 -0700 (PDT) Received: from mail-vc0-x22b.google.com (mail-vc0-x22b.google.com [2607:f8b0:400c:c03::22b]) by mx.google.com with ESMTPS id uv3si1710517vdc.23.2014.05.05.18.11.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 May 2014 18:11:13 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=2607:f8b0:400c:c03::22b; Received: by mail-vc0-f171.google.com with SMTP id lc6so129242vcb.2 for ; Mon, 05 May 2014 18:11:13 -0700 (PDT) X-Received: by 10.52.227.138 with SMTP id sa10mr13222752vdc.25.1399338673472; Mon, 05 May 2014 18:11:13 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp184353vcb; Mon, 5 May 2014 18:11:13 -0700 (PDT) X-Received: by 10.66.162.74 with SMTP id xy10mr481171pab.4.1399338672634; Mon, 05 May 2014 18:11:12 -0700 (PDT) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id sf3si10299939pac.83.2014.05.05.18.11.12 for ; Mon, 05 May 2014 18:11:12 -0700 (PDT) Received-SPF: none (google.com: piglit-bounces@lists.freedesktop.org does not designate permitted sender hosts) client-ip=131.252.210.177; Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A49156E217; Mon, 5 May 2014 18:11:11 -0700 (PDT) X-Original-To: piglit@lists.freedesktop.org Delivered-To: piglit@lists.freedesktop.org Received: from nm48.bullet.mail.bf1.yahoo.com (nm48.bullet.mail.bf1.yahoo.com [216.109.114.64]) by gabe.freedesktop.org (Postfix) with ESMTP id 6CB6E6E217 for ; Mon, 5 May 2014 18:11:10 -0700 (PDT) Received: from [98.139.212.153] by nm48.bullet.mail.bf1.yahoo.com with NNFMP; 06 May 2014 01:11:09 -0000 Received: from [98.139.211.200] by tm10.bullet.mail.bf1.yahoo.com with NNFMP; 06 May 2014 01:11:09 -0000 Received: from [127.0.0.1] by smtp209.mail.bf1.yahoo.com with NNFMP; 06 May 2014 01:11:09 -0000 X-Yahoo-Newman-Id: 625843.41967.bm@smtp209.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 2Gz3kJoVM1n2hDpwVCTuo3HXJPmHwjqwiEjssF7.00UUE7P CBy9pX6kYzvTgsO5tiR_R.fBBgmZ7_0fWkjCCDiPN38W0kvnE4Z4EpQAj7a_ qb2Qjpho2T1d10iFcaejkpnZPIVBb5MGpoje5d9yFbQ8IlJhoPR14pjMVJld j2xqE3B3uqNehDACE5PoAFhpjU_07_s.TBnZT7jjSUGxgcPR44gpyjc_mREA 26TtSfqiHqszulSK1B_Prx0K7x7vGAVejLhpeegxpsralroxA4cSZ.Y9nbZG MwvSTZs0kQkQS3oiy5ktX6pInGiYU9RuwwnQTMX8s1s.IcXF58WhWfa6uCgA r8CUqxRX2RfvSh_y3pAwcczE76JtaexD.QTtLK_Z9wYOv2CqyntuKc2FHwt_ ERR.cYcivIx8rIdUbI.sxibswMTRBIeiJUpCOLsvHcsXjl50Eh7Am975Cy3. hK6JfPibfhdpnwLsSFhICbeqmAdZdnFQPr.hM6xe2lM22Oyd3WAIurKAQj5y 5DHtU_X7dBpF6Rk2DJLEEJ3fVjBWLDKAITA.gbzuuMA1KyHYAV8PXRby1vZw EZg-- X-Yahoo-SMTP: 9BNlx.aswBAkr0D8mG_whiOP1dyU X-Rocket-Received: from localhost.localdomain (t_arceri@60.240.113.240 with plain [98.138.105.21]) by smtp209.mail.bf1.yahoo.com with SMTP; 05 May 2014 18:11:09 -0700 PDT From: "'Timothy Arceri' via Patchwork Forward" To: piglit@lists.freedesktop.org Date: Tue, 6 May 2014 11:10:46 +1000 Message-Id: <1399338646-1783-1-git-send-email-t_arceri@yahoo.com.au> X-Mailer: git-send-email 1.9.0 Subject: [Piglit] [PATCH] glsl-1.10: extend to test arrays of arrays X-BeenThere: piglit@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: piglit-bounces@lists.freedesktop.org Sender: "Piglit" X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@; dmarc=fail (p=NONE dis=NONE) header.from=yahoo.com.au Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 X-Original-From: Timothy Arceri Reply-To: Timothy Arceri Extends the varying packing tests to support testing arrays of arrays Signed-off-by: Timothy Arceri --- tests/all.py | 2 +- .../glsl-1.10/execution/varying-packing/simple.c | 158 ++++++++++++++------- 2 files changed, 109 insertions(+), 51 deletions(-) diff --git a/tests/all.py b/tests/all.py index 1e1aa3d..b59aaa4 100644 --- a/tests/all.py +++ b/tests/all.py @@ -1159,7 +1159,7 @@ spec['glsl-1.10']['execution']['varying-packing'] = Group() for type in ['int', 'uint', 'float', 'vec2', 'vec3', 'vec4', 'ivec2', 'ivec3', 'ivec4', 'uvec2', 'uvec3', 'uvec4', 'mat2', 'mat3', 'mat4', 'mat2x3', 'mat2x4', 'mat3x2', 'mat3x4', 'mat4x2', 'mat4x3']: - for arrayspec in ['array', 'separate']: + for arrayspec in ['array', 'separate', 'arrays_of_arrays']: cmdline = 'simple {0} {1}'.format(type, arrayspec) spec['glsl-1.10']['execution']['varying-packing'][cmdline] = \ concurrent_test('varying-packing-' + cmdline) diff --git a/tests/spec/glsl-1.10/execution/varying-packing/simple.c b/tests/spec/glsl-1.10/execution/varying-packing/simple.c index f7fd648..4d6cbba 100644 --- a/tests/spec/glsl-1.10/execution/varying-packing/simple.c +++ b/tests/spec/glsl-1.10/execution/varying-packing/simple.c @@ -97,6 +97,8 @@ */ #include "piglit-util-gl-common.h" +static const int inner_dim_size = 2; + PIGLIT_GL_TEST_CONFIG_BEGIN config.supports_gl_compat_version = 10; @@ -115,6 +117,14 @@ enum base_type BASE_TYPE_INT, }; +enum test_array_type +{ + SEPARATE, + ARRAY, + ARRAYS_OF_ARRAYS, +}; + + static const char * get_base_type_name(enum base_type t) { @@ -189,7 +199,8 @@ const struct type_desc *all_types[] = { struct varying_desc { const struct type_desc *type; - unsigned array_elems; + unsigned one_dim_array_elems; + unsigned two_dim_array_elems; }; /** @@ -198,12 +209,12 @@ struct varying_desc */ static GLint get_shader(bool is_vs, unsigned glsl_version, int num_varyings, - struct varying_desc *varyings) + struct varying_desc *varyings, enum test_array_type array_type) { GLuint shader; char *full_text = malloc(1000 * 100 + num_varyings); char *text = full_text; - unsigned i, j, k, l; + unsigned i, j, k, l, m; const char *varying_keyword; unsigned offset = 0; GLenum shader_type = is_vs ? GL_VERTEX_SHADER : GL_FRAGMENT_SHADER; @@ -218,16 +229,24 @@ get_shader(bool is_vs, unsigned glsl_version, int num_varyings, } text += sprintf(text, "#version %u\n", glsl_version); + if (array_type == ARRAYS_OF_ARRAYS) + text += sprintf(text, "#extension GL_ARB_arrays_of_arrays: enable\n"); text += sprintf(text, "uniform int i;\n"); for (i = 0; i < num_varyings; ++i) { const char *opt_flat_keyword = ""; if (varyings[i].type->base != BASE_TYPE_FLOAT) opt_flat_keyword = "flat "; - if (varyings[i].array_elems != 0) { + if (varyings[i].two_dim_array_elems != 0) { + text += sprintf(text, "%s%s %s var%u[%u][%u];\n", + opt_flat_keyword, varying_keyword, + varyings[i].type->name, i, + inner_dim_size, + varyings[i].two_dim_array_elems); + } else if (varyings[i].one_dim_array_elems != 0) { text += sprintf(text, "%s%s %s var%u[%u];\n", opt_flat_keyword, varying_keyword, varyings[i].type->name, i, - varyings[i].array_elems); + varyings[i].one_dim_array_elems); } else { text += sprintf(text, "%s%s %s var%u;\n", opt_flat_keyword, varying_keyword, @@ -243,37 +262,47 @@ get_shader(bool is_vs, unsigned glsl_version, int num_varyings, else text += sprintf(text, " bool failed = false;\n"); for (i = 0; i < num_varyings; ++i) { - unsigned array_loop_bound = varyings[i].array_elems; + unsigned array_loop_bound; + unsigned inner_array_loop_bound = 1; const char *base_type_name = get_base_type_name(varyings[i].type->base); + if (varyings[i].two_dim_array_elems != 0) { + inner_array_loop_bound = inner_dim_size; + array_loop_bound = varyings[i].two_dim_array_elems; + } else + array_loop_bound = varyings[i].one_dim_array_elems; if (array_loop_bound == 0) array_loop_bound = 1; - for (j = 0; j < array_loop_bound; ++j) { - for (k = 0; k < varyings[i].type->num_cols; ++k) { - for (l = 0; l < varyings[i].type->num_rows; ++l) { - text += sprintf(text, " "); - if (!is_vs) - text += sprintf(text, "if ("); - text += sprintf(text, "var%u", i); - if (varyings[i].array_elems) - text += sprintf(text, "[%u]", j); - if (varyings[i].type->num_cols > 1) - text += sprintf(text, "[%u]", k); - if (varyings[i].type->num_rows > 1) - text += sprintf(text, "[%u]", l); - if (is_vs) - text += sprintf(text, " = "); - else - text += sprintf(text, " != "); - text += sprintf(text, "%s(i + %u)", - base_type_name, - offset++); - if (is_vs) { - text += sprintf(text, ";\n"); - } else { - text += sprintf(text, - ")\n" - " failed = true;\n"); + for (j = 0; j < inner_array_loop_bound; ++j) { + for (k = 0; k < array_loop_bound; ++k) { + for (l = 0; l < varyings[i].type->num_cols; ++l) { + for (m = 0; m < varyings[i].type->num_rows; ++m) { + text += sprintf(text, " "); + if (!is_vs) + text += sprintf(text, "if ("); + text += sprintf(text, "var%u", i); + if (varyings[i].two_dim_array_elems) + text += sprintf(text, "[%u]", j); + if (varyings[i].one_dim_array_elems || varyings[i].two_dim_array_elems) + text += sprintf(text, "[%u]", k); + if (varyings[i].type->num_cols > 1) + text += sprintf(text, "[%u]", l); + if (varyings[i].type->num_rows > 1) + text += sprintf(text, "[%u]", m); + if (is_vs) + text += sprintf(text, " = "); + else + text += sprintf(text, " != "); + text += sprintf(text, "%s(i + %u)", + base_type_name, + offset++); + if (is_vs) { + text += sprintf(text, ";\n"); + } else { + text += sprintf(text, + ")\n" + " failed = true;\n"); + } } } } @@ -302,7 +331,8 @@ get_shader(bool is_vs, unsigned glsl_version, int num_varyings, */ static unsigned choose_varyings(struct varying_desc *varyings, - const struct type_desc *test_type, GLboolean test_array, + const struct type_desc *test_type, + enum test_array_type array_type, unsigned max_varying_floats) { unsigned num_varyings = 0; @@ -310,24 +340,43 @@ choose_varyings(struct varying_desc *varyings, = test_type->num_cols * test_type->num_rows; unsigned num_test_varyings = max_varying_floats / components_in_test_type; + unsigned num_two_dim_test_varyings + = num_test_varyings / inner_dim_size; + unsigned num_extra_arrays = 0; unsigned num_extra_varyings = max_varying_floats - num_test_varyings * components_in_test_type; unsigned i; - if (test_array) { + if (array_type == ARRAYS_OF_ARRAYS) { varyings[num_varyings].type = test_type; - varyings[num_varyings].array_elems = num_test_varyings; + varyings[num_varyings].two_dim_array_elems = num_two_dim_test_varyings; + varyings[num_varyings].one_dim_array_elems = 0; + num_extra_arrays + = num_test_varyings - (num_two_dim_test_varyings * inner_dim_size); + ++num_varyings; + if (num_extra_arrays > 0) { + varyings[num_varyings].type = test_type; + varyings[num_varyings].two_dim_array_elems = 0; + varyings[num_varyings].one_dim_array_elems = num_extra_arrays; + ++num_varyings; + } + } else if (array_type == ARRAY) { + varyings[num_varyings].type = test_type; + varyings[num_varyings].two_dim_array_elems = 0; + varyings[num_varyings].one_dim_array_elems = num_test_varyings; ++num_varyings; } else { for (i = 0; i < num_test_varyings; ++i) { varyings[num_varyings].type = test_type; - varyings[num_varyings].array_elems = 0; + varyings[num_varyings].two_dim_array_elems = 0; + varyings[num_varyings].one_dim_array_elems = 0; ++num_varyings; } } for (i = 0; i < num_extra_varyings; ++i) { varyings[num_varyings].type = &float_type; - varyings[num_varyings].array_elems = 0; + varyings[num_varyings].two_dim_array_elems = 0; + varyings[num_varyings].one_dim_array_elems = 0; ++num_varyings; } @@ -344,6 +393,8 @@ print_usage_and_exit(const char *prog_name) printf(" %s\n", all_types[i]->name); printf(" and is one of:\n" " array: test using an array of the above type\n" + " arrays_of_arrays: test using a multidimensional array" + " of the above type\n" " separate: test using separately declared varyings\n"); piglit_report_result(PIGLIT_FAIL); } @@ -353,10 +404,11 @@ piglit_init(int argc, char **argv) { unsigned i; const struct type_desc *test_type; - GLboolean test_array; + enum test_array_type array_type; GLint max_varying_floats; struct varying_desc *varyings; unsigned num_varyings; + unsigned glsl_version; GLuint vs, fs; if (argc != 3) @@ -365,29 +417,35 @@ piglit_init(int argc, char **argv) if (strcmp(argv[1], all_types[i]->name) == 0) break; } - if (all_types[i]) + if (all_types[i]) { test_type = all_types[i]; - else + glsl_version = test_type->glsl_version_required; + } else print_usage_and_exit(argv[0]); if (strcmp(argv[2], "array") == 0) - test_array = GL_TRUE; + array_type = ARRAY; else if (strcmp(argv[2], "separate") == 0) - test_array = GL_FALSE; - else + array_type = SEPARATE; + else if (strcmp(argv[2], "arrays_of_arrays") == 0) { + array_type = ARRAYS_OF_ARRAYS; + piglit_require_extension("GL_ARB_arrays_of_arrays"); + if (glsl_version < 120) + glsl_version = 120; + } else print_usage_and_exit(argv[0]); piglit_require_gl_version(20); - piglit_require_GLSL_version(test_type->glsl_version_required); + piglit_require_GLSL_version(glsl_version); glGetIntegerv(GL_MAX_VARYING_FLOATS, &max_varying_floats); varyings = malloc(sizeof(*varyings) * max_varying_floats); - num_varyings = choose_varyings(varyings, test_type, - test_array, max_varying_floats); + num_varyings = choose_varyings(varyings, test_type, array_type, + max_varying_floats); - vs = get_shader(true, test_type->glsl_version_required, - num_varyings, varyings); - fs = get_shader(false, test_type->glsl_version_required, - num_varyings, varyings); + vs = get_shader(true, glsl_version, + num_varyings, varyings, array_type); + fs = get_shader(false, glsl_version, + num_varyings, varyings, array_type); prog = piglit_link_simple_program(vs, fs); i_location = glGetUniformLocation(prog, "i"); free(varyings);