From patchwork Fri Jan 11 19:48:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14000 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3354B23E27 for ; Fri, 11 Jan 2013 19:48:51 +0000 (UTC) Received: from mail-vb0-f45.google.com (mail-vb0-f45.google.com [209.85.212.45]) by fiordland.canonical.com (Postfix) with ESMTP id D17D1A19B57 for ; Fri, 11 Jan 2013 19:48:50 +0000 (UTC) Received: by mail-vb0-f45.google.com with SMTP id p1so1798614vbi.4 for ; Fri, 11 Jan 2013 11:48:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=Sl76yqMK+qc62Kvn0KlD9FYED/NZ1C24/4ouH4QiKXw=; b=C8Egdg15W5d0XzyWiv7hxOjqY8ycC97RcrrjFUHhV1yC2V97ZS7S6aufXlI2evFtM2 r5ciZzFImPhFwOanGbpZGhOt1tnwkrYeO4keE1uU3+K+WkYJy9jW16PZb1IOp5vmbrwf gKexH3bk+46zLaIBGAaNS0KNdDpLb1IpGlxMgo+PkN8C6FJ+Oh4aJjckMRQyU7gFct7j RTQitfeFCOnv57d+eeTiFowPW6jg2oJmo9TJFtHJoCAfCm6gKJfnI8PjrfkIvC3nLaqs DKtYDxY5CbzOPae0LCbILtBMblQcAgAeDNqbvueWShY4aJIxapE/7u3pDB5IGwmmKSej zS9w== X-Received: by 10.58.74.168 with SMTP id u8mr2159113vev.59.1357933730313; Fri, 11 Jan 2013 11:48:50 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp129039veb; Fri, 11 Jan 2013 11:48:49 -0800 (PST) X-Received: by 10.50.40.225 with SMTP id a1mr340325igl.7.1357933729381; Fri, 11 Jan 2013 11:48:49 -0800 (PST) Received: from mail-ie0-f179.google.com (mail-ie0-f179.google.com [209.85.223.179]) by mx.google.com with ESMTPS id bq4si2024045icc.77.2013.01.11.11.48.49 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jan 2013 11:48:49 -0800 (PST) Received-SPF: neutral (google.com: 209.85.223.179 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=209.85.223.179; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.223.179 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) smtp.mail=tom.gall@linaro.org Received: by mail-ie0-f179.google.com with SMTP id k14so2780837iea.24 for ; Fri, 11 Jan 2013 11:48:48 -0800 (PST) X-Received: by 10.50.104.228 with SMTP id gh4mr316504igb.22.1357933728851; Fri, 11 Jan 2013 11:48:48 -0800 (PST) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPS id ex10sm276081igc.15.2013.01.11.11.48.46 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jan 2013 11:48:47 -0800 (PST) From: Tom Gall To: patches@linaro.org Cc: Tom Gall Subject: [PATCH 1/3] shader_runner.py: fix gles2 support Date: Fri, 11 Jan 2013 13:48:38 -0600 Message-Id: <1357933720-23420-1-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQl/KjNbWxihbfKA4OBXdR3+EA8h9rjO9wTJ/SA8g/0DhHUo5N3LukAfUq3tu+MtlMrerP1v Fix shader_test.py so it uses shader_runner_gles2 when running a shader test with GL 2.0 es in the [required] section. Reviewed-by: Chad Versace Signed-off-by: Tom Gall --- framework/shader_test.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/framework/shader_test.py b/framework/shader_test.py index ea637cf..335a6c1 100755 --- a/framework/shader_test.py +++ b/framework/shader_test.py @@ -224,9 +224,7 @@ class ShaderTest(PlainExecTest): if self.__gl_api == ShaderTest.API_GL: runner = "shader_runner" elif self.__gl_api == ShaderTest.API_GLES2: - # Tentatively, let's use the gles3 shader runner to run gles2 - # tests. - runner = "shader_runner_gles3" + runner = "shader_runner_gles2" elif self.__gl_api == ShaderTest.API_GLES3: runner = "shader_runner_gles3" else: