From patchwork Mon Apr 1 20:21:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 15794 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 A159B23E2C for ; Mon, 1 Apr 2013 20:22:04 +0000 (UTC) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by fiordland.canonical.com (Postfix) with ESMTP id 42A42A183A4 for ; Mon, 1 Apr 2013 20:22:04 +0000 (UTC) Received: by mail-ve0-f177.google.com with SMTP id jw11so2971363veb.8 for ; Mon, 01 Apr 2013 13:22:03 -0700 (PDT) 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=fU64I0UeLnD6tLcVUeNnaIPgdjRqgF677hHrJGwKJ1g=; b=IdT1ZxIPpB1+7wRYl6HGFe293LkC0mLv/hYwVYSw+EsLrxUhYb0eNtcOwjopWasCwI xwmwNox8bWx+MH/fss74/AjCmb/QKr01JYu8MhlnBfnXhlmgYjqv5Z8HhqNz6TrQul2h NcYBh0PoZPVRQEhi8lB3H1auwTWp2bFpx+W7cQYN/Ps+TAztmVMuF4o3fKqpCg94L0rn OMPGEcE5JO+eghH54vJggQCL59ZqxiV092ksi9LNh3OuPIjzkbJ2QrYey4s0ob/pc5W6 QiUDj0mySksE0/Sv38+WIlPxliMpCGG1Erdh+qQ6MeSieWqae7NLMDu3xhH1h3uRp4yu z9uw== X-Received: by 10.52.76.103 with SMTP id j7mr9021500vdw.90.1364847723759; Mon, 01 Apr 2013 13:22:03 -0700 (PDT) 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.59.4.204 with SMTP id cg12csp96145ved; Mon, 1 Apr 2013 13:22:03 -0700 (PDT) X-Received: by 10.236.86.105 with SMTP id v69mr11302245yhe.17.1364847723164; Mon, 01 Apr 2013 13:22:03 -0700 (PDT) Received: from mail-yh0-x22f.google.com (mail-yh0-x22f.google.com [2607:f8b0:4002:c01::22f]) by mx.google.com with ESMTPS id g24si10793210yhe.269.2013.04.01.13.22.02 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Apr 2013 13:22:02 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:4002:c01::22f is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4002:c01::22f; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4002:c01::22f 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-yh0-f47.google.com with SMTP id z12so434001yhz.6 for ; Mon, 01 Apr 2013 13:22:02 -0700 (PDT) X-Received: by 10.236.177.69 with SMTP id c45mr8065912yhm.86.1364847722502; Mon, 01 Apr 2013 13:22:02 -0700 (PDT) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPS id h6sm29602283yhf.19.2013.04.01.13.22.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Apr 2013 13:22:01 -0700 (PDT) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 1/1] shader_runner.c: Fix lod_bias breakage on GLES. Date: Mon, 1 Apr 2013 15:21:51 -0500 Message-Id: <1364847711-28771-1-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQmLSBpXkJRcDsXAsOGQfBwUTQhlUT4xpTbk/jyGg1+QNd6wsp3N+k2/E67ryGGJmLgAIzs1 When lod_bias was added to shader_runner it broke compilation on OpenGL ES. GL_TEXTURE_LOD_BIAS isn't defined as part of OpenGL ES. Added #ifdef PIGLIT_USE_OPENGL to handle_texparameter when the string_match checks for lod_bias. Signed-off-by: Tom Gall --- tests/shaders/shader_runner.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c index 002cf72..22a9f0f 100644 --- a/tests/shaders/shader_runner.c +++ b/tests/shaders/shader_runner.c @@ -1577,11 +1577,13 @@ handle_texparameter(const char *line) parameter_name = "mag"; line += strlen("mag "); strings = mag_filter_modes; +#ifdef PIGLIT_USE_OPENGL } else if (string_match("lod_bias ", line)) { line += strlen("lod_bias "); glTexParameterf(target, GL_TEXTURE_LOD_BIAS, strtod(line, NULL)); return; +#endif } else { fprintf(stderr, "unknown texture parameter in `%s'\n", line); piglit_report_result(PIGLIT_FAIL);