From patchwork Sun Apr 26 06:13:42 2015 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: 47572 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3C1022121F for ; Sun, 26 Apr 2015 06:14:00 +0000 (UTC) Received: by wgin8 with SMTP id n8sf19163576wgi.0 for ; Sat, 25 Apr 2015 23:13:59 -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:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:reply-to; bh=KxLOKDMAkcU9A16kbQgeLQAr81FaSSbsOAGb1LHqoKI=; b=AdERCfoGpyQJQGmADkHHS2CzQrYWp2UXFSk/jTbF8FN1AdItDJDes218sGgHwZvkF7 tihUP4Po1xMde/LJBRsAP8JWjyZWb1u+17W7dB3RXhYP8U0dCwzyrtcMxd1opvo5aRKi jG/LkoTwTQVgCvmIDF1bJz8H7MFBxoUZ0q2A7owbIo680JAHejiTU1sCUJFqALNxRoOO 4Xr4dljozjvTwSP1h9anS9Xo42XLL/6o4Cetk05NaG28SMb8+XA61Rtme0k+zQL7Jnft rah+mrFf8xsxFj2GD3xVXrdxbgNcwGU2GOYcJr7vlyAuYhWF0U+sNjiM5eOftarCaVdS YT+g== X-Gm-Message-State: ALoCoQnAfykcQlhy7HunThrX/LS0CiDgI3kDsJ623Qu0tpUExrBYxyO4e9GqP3EcNff+ucpBakMa X-Received: by 10.112.14.101 with SMTP id o5mr3809057lbc.3.1430028839231; Sat, 25 Apr 2015 23:13:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.4.104 with SMTP id j8ls538125laj.106.gmail; Sat, 25 Apr 2015 23:13:59 -0700 (PDT) X-Received: by 10.152.8.6 with SMTP id n6mr2687602laa.116.1430028838975; Sat, 25 Apr 2015 23:13:58 -0700 (PDT) Received: from mail-la0-x232.google.com (mail-la0-x232.google.com. [2a00:1450:4010:c03::232]) by mx.google.com with ESMTPS id s7si6239679las.80.2015.04.25.23.13.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Apr 2015 23:13:58 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::232 as permitted sender) client-ip=2a00:1450:4010:c03::232; Received: by layy10 with SMTP id y10so59986929lay.0 for ; Sat, 25 Apr 2015 23:13:58 -0700 (PDT) X-Received: by 10.153.6.36 with SMTP id cr4mr5323912lad.56.1430028838488; Sat, 25 Apr 2015 23:13:58 -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.112.67.65 with SMTP id l1csp646620lbt; Sat, 25 Apr 2015 23:13:57 -0700 (PDT) X-Received: by 10.70.35.201 with SMTP id k9mr11153286pdj.128.1430028836081; Sat, 25 Apr 2015 23:13:56 -0700 (PDT) Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id g7si24635315pat.12.2015.04.25.23.13.55; Sat, 25 Apr 2015 23:13:56 -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 C12D36E034; Sat, 25 Apr 2015 23:13:54 -0700 (PDT) X-Original-To: piglit@lists.freedesktop.org Delivered-To: piglit@lists.freedesktop.org Received: from nm27-vm10.bullet.mail.gq1.yahoo.com (nm27-vm10.bullet.mail.gq1.yahoo.com [98.136.216.153]) by gabe.freedesktop.org (Postfix) with ESMTP id 14F626E034 for ; Sat, 25 Apr 2015 23:13:53 -0700 (PDT) Received: from [216.39.60.184] by nm27.bullet.mail.gq1.yahoo.com with NNFMP; 26 Apr 2015 06:13:53 -0000 Received: from [208.71.42.212] by tm20.bullet.mail.gq1.yahoo.com with NNFMP; 26 Apr 2015 06:13:53 -0000 Received: from [127.0.0.1] by smtp223.mail.gq1.yahoo.com with NNFMP; 26 Apr 2015 06:13:53 -0000 X-Yahoo-Newman-Id: 424618.5547.bm@smtp223.mail.gq1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: M4cbFkUVM1nkwV2N8hqOxZrb6bvHPNbuf9v0dIR.lBng5XL Yom8GoIwHaxfyMHOLE53TDoiKzUmgSrX.cNiF6H7Xr61uXMtLPtYaWnrpPD4 2GFBF2QZIM09bvIGzs6bqXTJmMyokFLFkQ3OyLnFhL549.aOlb0VThiIbouY oeaUR4oEgpHV5aFTpi6IEjuvRthO35qfIOkQlz5BEuieFLUKOcqYrv8Ht79G 0VHaSd7.BedQKGg6fpcnu1JlqzQmVR1QPMCPccJ_X25xZTPfaCv99NN6nmpE 2fZwb95qchcG509l3GbjOi.GuhGREZx5Xd.Jxi2x3d9Rd1nEk22VGGhHzVM5 SKTfqJFBHBUTSXDIOC39pj82rvgCB4864URGE7a1BxS_uaub6YCsdvExIxfT bmI4L3Lxr4RNCWCPevzcxlamXcAdbJgG7L76QrtoASaGkKT4Kxdr2v1lMAzy nZrDTyn_d8GJZBpAM1AVzE6dPBLbrKMnEzStuQKE8lsAJUHBID4bltEFclug FpVAhAoKPk9R0knjhLP3IseBqBZDBfoD4V_g- X-Yahoo-SMTP: 9BNlx.aswBAkr0D8mG_whiOP1dyU From: "'Timothy Arceri' via Patchwork Forward" To: piglit@lists.freedesktop.org Date: Sun, 26 Apr 2015 16:13:42 +1000 Message-Id: <1430028822-5574-1-git-send-email-t_arceri@yahoo.com.au> X-Mailer: git-send-email 2.1.0 Subject: [Piglit] [PATCH] varying-packing: add arrays of arrays support X-BeenThere: piglit@lists.freedesktop.org X-Mailman-Version: 2.1.18 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::232 as permitted sender) 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 V3: rebase and test double types V2: renamed variables from 'inner' that should have been 'outer' --- tests/all.py | 4 +- .../glsl-1.10/execution/varying-packing/simple.c | 137 +++++++++++++++------ 2 files changed, 100 insertions(+), 41 deletions(-) diff --git a/tests/all.py b/tests/all.py index 18124b7..85b622f 100755 --- a/tests/all.py +++ b/tests/all.py @@ -1290,7 +1290,7 @@ with profile.group_manager( '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']: g(['varying-packing-simple', type_, arrayspec], 'simple {} {}'.format(type_, arrayspec)) @@ -2062,7 +2062,7 @@ with profile.group_manager( for type in ['double', 'dvec2', 'dvec3', 'dvec4', 'dmat2', 'dmat3', 'dmat4', 'dmat2x3', 'dmat2x4', 'dmat3x2', 'dmat3x4', 'dmat4x2', 'dmat4x3']: - for arrayspec in ['array', 'separate']: + for arrayspec in ['array', 'separate', 'arrays_of_arrays']: g(['varying-packing-simple', type, arrayspec], 'simple {0} {1}'.format(type, arrayspec)) 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 e9935c7..2b1c010 100644 --- a/tests/spec/glsl-1.10/execution/varying-packing/simple.c +++ b/tests/spec/glsl-1.10/execution/varying-packing/simple.c @@ -100,6 +100,8 @@ static void parse_args(int argc, char *argv[], struct piglit_gl_test_config *config); +static const int outer_dim_size = 2; + PIGLIT_GL_TEST_CONFIG_BEGIN config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE; @@ -118,6 +120,13 @@ enum base_type BASE_TYPE_DOUBLE, }; +enum test_array_type +{ + SEPARATE, + ARRAY, + ARRAYS_OF_ARRAYS, +}; + static const char * get_base_type_name(enum base_type t) { @@ -219,7 +228,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; }; /** @@ -228,12 +238,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; @@ -249,6 +259,8 @@ 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"); for (i = 0; i < num_varyings; ++i) { const char *opt_flat_keyword = ""; if (!fp64 && varyings[i].type->base == BASE_TYPE_DOUBLE) { @@ -257,11 +269,17 @@ get_shader(bool is_vs, unsigned glsl_version, int num_varyings, } 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%03u[%u][%u];\n", + opt_flat_keyword, varying_keyword, + varyings[i].type->name, i, + outer_dim_size, + varyings[i].two_dim_array_elems); + } else if (varyings[i].one_dim_array_elems != 0) { text += sprintf(text, "%s%s %s var%03u[%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%03u;\n", opt_flat_keyword, varying_keyword, @@ -282,31 +300,42 @@ 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 outer_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) { + outer_array_loop_bound = outer_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, "failed = failed || "); - text += sprintf(text, "var%03u", 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);\n", - base_type_name, - offset++); + for (j = 0; j < outer_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, "failed = failed || "); + text += sprintf(text, "var%03u", 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);\n", + base_type_name, + offset++); + } } } } @@ -334,7 +363,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; @@ -343,24 +373,43 @@ choose_varyings(struct varying_desc *varyings, = test_type->num_cols * test_type->num_rows * element_size; unsigned num_test_varyings = max_varying_floats / components_in_test_type; + unsigned num_two_dim_test_varyings + = num_test_varyings / outer_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 * outer_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; } @@ -377,6 +426,8 @@ NORETURN 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); } @@ -414,36 +465,44 @@ parse_args(int argc, char *argv[], struct piglit_gl_test_config *config) void piglit_init(int argc, char **argv) { - 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) print_usage_and_exit(argv[0]); + glsl_version = test_type->glsl_version_required; + 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); if (test_type->base == BASE_TYPE_DOUBLE) piglit_require_extension("GL_ARB_gpu_shader_fp64"); 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); + array_type, max_varying_floats); vs = get_shader(true, test_type->glsl_version_required, - num_varyings, varyings); + num_varyings, varyings, array_type); fs = get_shader(false, test_type->glsl_version_required, - num_varyings, varyings); + num_varyings, varyings, array_type); prog = piglit_link_simple_program(vs, fs); i_location = glGetUniformLocation(prog, "i"); free(varyings);