Attachment 40449 Details for Bug 31810 – Slightly simpler version of Piglit test

[patch] Slightly simpler version of Piglit test

0001-Add-a-test-for-a-ARBfp-program-sampling-from-an-alph.patch (text/plain), 4.38 KB, created by Owen Taylor on 2010-11-21 06:53:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Taylor

Created: 2010-11-21 06:53:37 UTC

Size: 4.38 KB

patch

obsolete

>From 84ad0b3abe16021b238ad1b287b0c43a01fd32bd Mon Sep 17 00:00:00 2001
>From: Owen W. Taylor <otaylor@fishsoup.net>
>Date: Sat, 20 Nov 2010 15:55:05 -0500
>Subject: [PATCH] Add a test for a ARBfp program sampling from an alpha texture
>
>The R600 gallium driver is currently failing to correctly sample
>alpha from an alpha-only texture in an ARBfp shader. This adds a
>'fp-formats' test that currently tests only that, but could be
>extended to test sampling from other types of non-RGBA textures.
>---
> tests/shaders/CMakeLists.txt |    1 +
> tests/shaders/fp-formats.c   |   99 ++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 100 insertions(+), 0 deletions(-)
> create mode 100644 tests/shaders/fp-formats.c
>
>diff --git a/tests/shaders/CMakeLists.txt b/tests/shaders/CMakeLists.txt
>index 51e7607..439e617 100644
>--- a/tests/shaders/CMakeLists.txt
>+++ b/tests/shaders/CMakeLists.txt
>@@ -32,6 +32,7 @@ add_executable (fp-abs-02 fp-abs-02.c)
> add_executable (fp-condition_codes-01 fp-condition_codes-01.c)
> add_executable (fp-lit-mask fp-lit-mask.c)
> add_executable (fp-fog fp-fog.c)
>+add_executable (fp-formats fp-formats.c)
> add_executable (fp-fragment-position fp-fragment-position.c)
> add_executable (fp-generic fp-generic.c)
> add_executable (fp-kil fp-kil.c)
>diff --git a/tests/shaders/fp-formats.c b/tests/shaders/fp-formats.c
>new file mode 100644
>index 0000000..ea86088
>--- /dev/null
>+++ b/tests/shaders/fp-formats.c
>@@ -0,0 +1,99 @@
>+/*
>+ * Copyright Â© 2009 Intel Corporation
>+ * Copyright Â© 2010 Red Hat, 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.
>+ */
>+
>+/**
>+ * \file fp-formats.c
>+ * Test fragment programs sampling from different texture formats.
>+ * (currently just alpha-only textures)
>+ */
>+
>+#include "piglit-util.h"
>+#include "piglit-framework.h"
>+
>+int piglit_window_mode = GLUT_DOUBLE;
>+int piglit_width = 100;
>+int piglit_height = 100;
>+
>+/**
>+ * Modulate the primary color with the alpha channel of the texture
>+ */
>+static const char alpha_source[] =
>+	"!!ARBfp1.0\n"
>+        "TEMP texel0;\n"
>+        "TEX texel0,fragment.texcoord[0],texture[0],2D;\n"
>+        "MOV result.color, texel0.abgr;\n"
>+	"END"
>+	;
>+
>+static GLint progs[1];
>+static GLuint textures[1];
>+
>+enum piglit_result
>+piglit_display(void)
>+{
>+	enum piglit_result result = PIGLIT_SUCCESS;
>+
>+	const GLfloat expected[4] = { 0.5, 0.0, 0.0, 0.0 };
>+
>+	glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, progs[0]);
>+
>+	glClear(GL_COLOR_BUFFER_BIT);
>+	glEnable(GL_FRAGMENT_PROGRAM_ARB);
>+
>+	piglit_draw_rect(0, 0, piglit_width, piglit_height);
>+
>+	if (!piglit_probe_pixel_rgb(piglit_width / 2,
>+				    piglit_height / 2,
>+				    expected))
>+	  result = PIGLIT_FAILURE;
>+
>+	glutSwapBuffers();
>+	return result;
>+}
>+
>+
>+void
>+piglit_init(int argc, char **argv)
>+{
>+	const GLfloat alpha_data[] = { 0.5 };
>+
>+	(void) argc;
>+	(void) argv;
>+
>+	piglit_require_fragment_program();
>+	piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
>+
>+	progs[0] = piglit_compile_program(GL_FRAGMENT_PROGRAM_ARB,
>+					  alpha_source);
>+
>+	glGenTextures(1, textures);
>+
>+	glActiveTexture(GL_TEXTURE0);
>+	glBindTexture(GL_TEXTURE_2D, progs[0]);
>+	glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, 1, 1, 0, GL_ALPHA, GL_FLOAT, alpha_data);
>+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
>+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
>+
>+	glClearColor(1.0, 1.0, 1.0, 1.0);
>+}
>-- 
>1.7.3.2
>

Actions: View | Splinter Review

Attachments on bug 31810: 40447 | 40449

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.