From patchwork Fri Feb 8 05:45:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14693 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 1D067241D2 for ; Fri, 8 Feb 2013 05:45:45 +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 A609EA18368 for ; Fri, 8 Feb 2013 05:45:44 +0000 (UTC) Received: by mail-ve0-f177.google.com with SMTP id m1so3017052ves.8 for ; Thu, 07 Feb 2013 21:45:44 -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 :mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=8/jcEK/iKWE3VYBv2dX5aKlmOaC1JTgR8fSF9/NxOoU=; b=YWd3++GBLWh+kwsIubNdO0Qbcq15G6AU5c9lDLn/v7PBhcQWFPQxNsaplAsRK+FywB Ts+GjTUvFBjQR0XIq6BB87rULNkbQ8C63gB9fc855N72VVI6ivGbdxT2xHE6ppDPxTye 19EugYQdc4j7CXrGwghtpmQMuVszlRuaiJ/z9I2r5gEsPpDQUxDXeXSh48cLrOoOzRM2 nH7GpSFLNrBScfXJEO5iqNznonYF70p5pqy5X+SwcV4CauJT1FRZht+vnCA5a/zd49hS bpJriAbiWEWY/EwHl2QjNuNYYNHJ8qHtivfv1cXzQSavUct4Ok3nM8iG++35zzQIl1IC lIwQ== X-Received: by 10.52.27.50 with SMTP id q18mr4576759vdg.20.1360302344086; Thu, 07 Feb 2013 21:45:44 -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.252.8 with SMTP id zo8csp129144vec; Thu, 7 Feb 2013 21:45:43 -0800 (PST) X-Received: by 10.50.180.228 with SMTP id dr4mr99912igc.17.1360302342778; Thu, 07 Feb 2013 21:45:42 -0800 (PST) Received: from mail-ia0-x233.google.com (mail-ia0-x233.google.com [2607:f8b0:4001:c02::233]) by mx.google.com with ESMTPS id w10si32854046icv.40.2013.02.07.21.45.42 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Feb 2013 21:45:42 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:4001:c02::233 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c02::233; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c02::233 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-ia0-f179.google.com with SMTP id x24so3838186iak.10 for ; Thu, 07 Feb 2013 21:45:41 -0800 (PST) X-Received: by 10.50.216.200 with SMTP id os8mr177773igc.74.1360302341685; Thu, 07 Feb 2013 21:45:41 -0800 (PST) Received: from localhost.localdomain ([70.35.96.184]) by mx.google.com with ESMTPS id xd4sm13781249igb.3.2013.02.07.21.45.40 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Feb 2013 21:45:40 -0800 (PST) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: =?UTF-8?q?=5BPATCH=201/2=5D=20port=20ttexrect=2Ecpp=20to=20piglit=20from=20glean?= Date: Thu, 7 Feb 2013 23:45:19 -0600 Message-Id: <1360302320-3058-1-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnZbjxzcWSDaD9WOS+yhKP5lQLs9REWIK/TurGwEb7lTBoyFTkDHsNoHyhul5W7vktvXmyw This ported test goes into tests/spec/arb_texture_rectangle. It tests the ARB_texture_rectangle extension. Create a 255x127 texture of varying colors and bind it as a GL_ARB_texture_recangle target. Draw that rectangle to the window, and check that the texture was drawn correctly. The common failure to be caught with this test is not adjusting the non-normalized coordinates on hardware that expects normalized coordinates. To all.tests, add new texrect_simple_arb_texrect v2: add PIGLIT_GL_VISUAL_DOUBLE to the window_visual, move various setup bits to piglit_init and add forgotten all.tests change. v3: use piglit_present_results, and piglit_probe_image_rgb Signed-off-by: Tom Gall --- tests/all.tests | 1 + tests/spec/CMakeLists.txt | 1 + tests/spec/arb_texture_rectangle/CMakeLists.gl.txt | 13 ++ tests/spec/arb_texture_rectangle/CMakeLists.txt | 1 + tests/spec/arb_texture_rectangle/texrect-simple.c | 127 ++++++++++++++++++++ 5 files changed, 143 insertions(+) create mode 100644 tests/spec/arb_texture_rectangle/CMakeLists.gl.txt create mode 100644 tests/spec/arb_texture_rectangle/CMakeLists.txt create mode 100644 tests/spec/arb_texture_rectangle/texrect-simple.c diff --git a/tests/all.tests b/tests/all.tests index 3e2d3f8..9b9be9f 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -1128,6 +1128,7 @@ arb_texture_rectangle['copyteximage RECT'] = PlainExecTest(['copyteximage', '-au add_concurrent_test(arb_texture_rectangle, '1-1-linear-texture') add_plain_test(arb_texture_rectangle, 'texrect-many') add_concurrent_test(arb_texture_rectangle, 'getteximage-targets RECT') +add_plain_test(arb_texture_rectangle, 'texrect_simple_arb_texrect') arb_texture_storage = Group() spec['ARB_texture_storage'] = arb_texture_storage diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt index df87181..1b72040 100644 --- a/tests/spec/CMakeLists.txt +++ b/tests/spec/CMakeLists.txt @@ -24,6 +24,7 @@ add_subdirectory (arb_texture_buffer_object) add_subdirectory (arb_texture_compression) add_subdirectory (arb_texture_cube_map_array) add_subdirectory (arb_texture_float) +add_subdirectory (arb_texture_rectangle) add_subdirectory (arb_texture_storage) add_subdirectory (arb_timer_query) add_subdirectory (arb_transform_feedback2) diff --git a/tests/spec/arb_texture_rectangle/CMakeLists.gl.txt b/tests/spec/arb_texture_rectangle/CMakeLists.gl.txt new file mode 100644 index 0000000..d84a850 --- /dev/null +++ b/tests/spec/arb_texture_rectangle/CMakeLists.gl.txt @@ -0,0 +1,13 @@ +include_directories( + ${GLEXT_INCLUDE_DIR} + ${OPENGL_INCLUDE_PATH} + ${piglit_SOURCE_DIR}/tests/mesa/util +) + +link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} +) + +piglit_add_executable (texrect_simple_arb_texrect texrect-simple.c) diff --git a/tests/spec/arb_texture_rectangle/CMakeLists.txt b/tests/spec/arb_texture_rectangle/CMakeLists.txt new file mode 100644 index 0000000..144a306 --- /dev/null +++ b/tests/spec/arb_texture_rectangle/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() diff --git a/tests/spec/arb_texture_rectangle/texrect-simple.c b/tests/spec/arb_texture_rectangle/texrect-simple.c new file mode 100644 index 0000000..1b6d66b --- /dev/null +++ b/tests/spec/arb_texture_rectangle/texrect-simple.c @@ -0,0 +1,127 @@ +/* Copyright © 2013 Linaro Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +/** + * Ported from glean ttexrect.cpp into piglit. + * Test the ARB_texture_rectangle extension + * Create a 255x127 texture of varying colors and bind it as a + * GL_ARB_texture_recangle target. Draw that rectangle to the window, and + * check that the texture was drawn correctly. The common failure to be + * caught with this test is not adjusting the non-normalized coordinates on + * hardware that expects normalized coordinates. + * \author: Eric Anholt (original) + * \author: Tom Gall (port) + */ +#include "piglit-util-gl-common.h" + +#define TEXTURE_WIDTH 255 +#define TEXTURE_HEIGHT 127 +#define WINDOW_SIZE 256 + +float image[TEXTURE_WIDTH * TEXTURE_HEIGHT * 3]; + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_compat_version = 10; + config.window_width = WINDOW_SIZE; + config.window_height = WINDOW_SIZE; + config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DEPTH + | PIGLIT_GL_VISUAL_DOUBLE; + +PIGLIT_GL_TEST_CONFIG_END + + +enum piglit_result +piglit_display(void) +{ + enum piglit_result final_result = PIGLIT_PASS; + + /* Draw our texture to the window such that each texel should map + * to the corresponding pixel of the window. + */ + glBegin(GL_POLYGON); + glTexCoord2f(0, 0); + glVertex2f(0, 0); + + glTexCoord2f(TEXTURE_WIDTH, 0); + glVertex2f(TEXTURE_WIDTH, 0); + + glTexCoord2f(TEXTURE_WIDTH, TEXTURE_HEIGHT); + glVertex2f(TEXTURE_WIDTH, TEXTURE_HEIGHT); + + glTexCoord2f(0, TEXTURE_HEIGHT); + glVertex2f(0, TEXTURE_HEIGHT); + glEnd(); + + /* returns 0 when the images don't match and 1 when they do) */ + final_result = !(piglit_probe_image_rgb(0, 0, TEXTURE_WIDTH, TEXTURE_HEIGHT, + (const float *) &image)); + + piglit_present_results(); + + piglit_report_result(final_result); + return final_result; +} + + +void +piglit_init(int argc, char *argv[]) +{ + int x,y,i; + + /* Set up a texture that it's color ramps with red to black top to + * bottom and green to black left to right. + */ + for (y = 0; y < TEXTURE_HEIGHT; y++) { + for (x = 0; x < TEXTURE_WIDTH; x++) { + i = (y * TEXTURE_WIDTH + x) * 3; + + image[i + 0] = (float)x / (TEXTURE_WIDTH - 1); + image[i + 1] = 1.0 - ((float) y / (TEXTURE_HEIGHT - 1)); + image[i + 2] = 0.0; + } + } + + glClearColor(0.0, 0.0, 0.0, 0.0); + glClear(GL_COLOR_BUFFER_BIT); + + glShadeModel(GL_FLAT); + + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(0, WINDOW_SIZE, 0, WINDOW_SIZE, -1, 1); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + glViewport(0, 0, WINDOW_SIZE, WINDOW_SIZE); + + glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGB, + TEXTURE_WIDTH, TEXTURE_HEIGHT, 0, GL_RGB, GL_FLOAT, image); + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, + GL_NEAREST); + glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, + GL_NEAREST); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + glEnable(GL_TEXTURE_RECTANGLE_ARB); + + glDrawBuffer(GL_BACK); + glReadBuffer(GL_BACK); +}