Pushed, thanks. Marek <div class="gmail_quote">On Thu, Mar 31, 2011 at 12:08 AM, Julian Adams <<a href="mailto:joolsa@gmail.com">joolsa@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"> --- tests/all.tests | 1 + tests/fbo/CMakeLists.gl.txt | 1 + tests/fbo/fbo-drawbuffers-blend-add.c | 251 +++++++++++++++++++++++++++++++++ 3 files changed, 253 insertions(+), 0 deletions(-) create mode 100644 tests/fbo/fbo-drawbuffers-blend-add.c diff --git a/tests/all.tests b/tests/all.tests index c2c58ae..eb86ae7 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -130,6 +130,7 @@ add_plain_test(fbo, 'fbo-depthtex') add_plain_test(fbo, 'fbo-depth-sample-compare') add_plain_test(fbo, 'fbo-drawbuffers') add_plain_test(fbo, 'fbo-drawbuffers-arbfp') +add_plain_test(fbo, 'fbo-drawbuffers-blend-add') add_plain_test(fbo, 'fbo-drawbuffers-fragcolor') add_plain_test(fbo, 'fbo-drawbuffers-maxtargets') add_plain_test(fbo, 'fbo-drawbuffers2-blend') diff --git a/tests/fbo/CMakeLists.gl.txt b/tests/fbo/CMakeLists.gl.txt index 819d5cf..999c0c4 100644 --- a/tests/fbo/CMakeLists.gl.txt +++ b/tests/fbo/CMakeLists.gl.txt @@ -36,6 +36,7 @@ add_executable (fbo-clearmipmap fbo-clearmipmap.c) add_executable (fbo-clear-formats fbo-clear-formats.c) add_executable (fbo-drawbuffers fbo-drawbuffers.c) add_executable (fbo-drawbuffers-arbfp fbo-drawbuffers-arbfp.c) +add_executable (fbo-drawbuffers-blend-add fbo-drawbuffers-blend-add.c) add_executable (fbo-drawbuffers-fragcolor fbo-drawbuffers-fragcolor.c) add_executable (fbo-drawbuffers-maxtargets fbo-drawbuffers-maxtargets.c) add_executable (fbo-drawbuffers2-blend fbo-drawbuffers2-blend.c) diff --git a/tests/fbo/fbo-drawbuffers-blend-add.c b/tests/fbo/fbo-drawbuffers-blend-add.c new file mode 100644 index 0000000..d6fce41 --- /dev/null +++ b/tests/fbo/fbo-drawbuffers-blend-add.c @@ -0,0 +1,251 @@ +/* + * Copyright © 2010 Intel Corporation + * + * 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. + * + * Authors: + * Eric Anholt <<a href="mailto:eric@anholt.net">eric@anholt.net</a>> + * Marek Olšák <<a href="mailto:maraeo@gmail.com">maraeo@gmail.com</a>> + * + */ + +/** @file fbo-drawbuffers-blend-add.c + * + * Tests that additive blending is enabled for all render targets with ARB_draw_buffers. + */ + +#include <string.h> +#include "piglit-util.h" + +int piglit_width = 256; +int piglit_height = 256; +int piglit_window_mode = GLUT_RGB | GLUT_ALPHA | GLUT_DOUBLE; + +static GLint max_targets; + +static char *vs_source = + "void main()\n" + "{\n" + " gl_Position = gl_Vertex;\n" + "}\n"; + +static char *fs_source_start = + "void main()\n" + "{\n"; + +static char *fs_source_output = + " gl_FragData[%d].xyzw = vec4(%f, %f, %f, %f);\n"; + +static char *fs_source_end = + "}\n"; + +float output_values[] = { + 0.0, 0.5, 0.0, 0.0, + 0.0, 0.0, 0.5, 0.0, + 0.0, 0.5, 0.5, 0.0, + 0.5, 0.5, 0.0, 0.0, + + 0.0, 0.5, 0.0, 0.5, + 0.0, 0.0, 0.5, 0.5, + 0.0, 0.5, 0.5, 0.5, + 0.5, 0.5, 0.0, 0.5, + + 0.0, 0.25, 0.0, 0.0, + 0.0, 0.0, 0.25, 0.0, + 0.0, 0.25, 0.25, 0.0, + 0.25, 0.25, 0.0, 0.0, + + 0.0, 0.25, 0.0, 0.25, + 0.0, 0.0, 0.25, 0.25, + 0.0, 0.25, 0.25, 0.25, + 0.25, 0.25, 0.0, 0.25}; + +float clear_value = 0.25; + +static GLuint +attach_texture(int i) +{ + GLuint tex; + + glGenTextures(1, &tex); + glBindTexture(GL_TEXTURE_2D, tex); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, + 32, 32, 0, + GL_RGBA, GL_UNSIGNED_BYTE, NULL); + + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + + glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, + GL_COLOR_ATTACHMENT0_EXT + i, + GL_TEXTURE_2D, + tex, + 0); + assert(glGetError() == 0); + + return tex; +} + +static void +generate_and_display_drawbuffers(int count) +{ + GLuint tex[16], fb, fs, vs, prog; + GLenum attachments[16], status; + int i; + + glGenFramebuffersEXT(1, &fb); + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb); + + for (i = 0; i < count; i++) { + tex[i] = attach_texture(i); + attachments[i] = GL_COLOR_ATTACHMENT0 + i; + } + + status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); + if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { + fprintf(stderr, "fbo incomplete (status = 0x%04x)\n", status); + piglit_report_result(PIGLIT_SKIP); + } + + glDrawBuffersARB(count, attachments); + + /* Clear all to 0.25 so we see if the shader rendering happens. */ + glClearColor(clear_value, clear_value, clear_value, clear_value); + glClear(GL_COLOR_BUFFER_BIT); + + /* Build the shader that spams green to all outputs. */ + vs = piglit_compile_shader_text(GL_VERTEX_SHADER, vs_source); + + char fs_output_line[256]; + char fs_full_source[1024]; + + strcpy(fs_full_source, fs_source_start); + + for (i = 0; i < count; i++) { + sprintf(fs_output_line, fs_source_output, i, output_values[i * 4], + output_values[(i * 4) + 1], output_values[(i * 4) + 2], + output_values[(i * 4) + 3]); + + strcat(fs_full_source, fs_output_line); + } + + strcat(fs_full_source, fs_source_end); + + assert(strlen(fs_full_source) + 1 < sizeof(fs_full_source) / sizeof(fs_full_source[0])); + + fs = piglit_compile_shader_text(GL_FRAGMENT_SHADER, fs_full_source); + + prog = piglit_link_simple_program(vs, fs); + glUseProgram(prog); + + glEnable(GL_BLEND); + glBlendFunc(GL_ONE, GL_ONE); + glBlendEquation(GL_FUNC_ADD); + + /* Now render to all the color buffers. */ + piglit_draw_rect(-1, -1, 2, 2); + + glDisable(GL_BLEND); + + /* OK, now draw each of these textures to the winsys framebuffer. */ + glUseProgram(0); + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); + piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + glEnable(GL_TEXTURE_2D); + for (i = 0; i < count; i++) { + glBindTexture(GL_TEXTURE_2D, tex[i]); + piglit_draw_rect_tex(16 * i, 16 * (count - 1), + 16, 16, + 0, 0, + 1, 1); + } + glDisable(GL_TEXTURE_2D); + + for (i = 0; i < count; i++) { + glDeleteTextures(1, &tex[i]); + } + glDeleteFramebuffersEXT(1, &fb); +} + +enum piglit_result +piglit_display(void) +{ + #define N_VECTOR_ITEMS 4 + GLboolean pass = GL_TRUE; + int count, i, j; + float expected[N_VECTOR_ITEMS] = {0}; + + + glClearColor(0.5, 0.5, 0.5, 0.5); + glClear(GL_COLOR_BUFFER_BIT); + + for (count = 1; count <= max_targets; count++) { + generate_and_display_drawbuffers(count); + } + + for (count = 1; count <= max_targets; count++) { + for (i = 0; i < count; i++) { + for (j = 0; j < N_VECTOR_ITEMS; j++) { + expected[j] = output_values[(i * N_VECTOR_ITEMS) + j] + + clear_value; + } + + pass = pass && + piglit_probe_pixel_rgba(16 * i + 8, + 16 * (count - 1) + 8, + expected); + } + } + + glutSwapBuffers(); + + return pass ? PIGLIT_SUCCESS : PIGLIT_FAILURE; +} + +void +piglit_init(int argc, char **argv) +{ + GLint max_attachments; + + printf("The result should be a rows of boxes of differing colors, \n" + "one for each drawbuffer target used (none black).\n"); + + piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE); + + if (!GLEW_VERSION_2_0) { + printf("Requires OpenGL 2.0\n"); + piglit_report_result(PIGLIT_SKIP); + } + + piglit_require_extension("GL_EXT_framebuffer_object"); + piglit_require_extension("GL_ARB_draw_buffers"); + + glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &max_targets); + if (max_targets < 2) + piglit_report_result(PIGLIT_SKIP); + + glGetIntegerv(GL_MAX_COLOR_ATTACHMENTS_EXT, &max_attachments); + if (max_targets > max_attachments) + max_targets = max_attachments; + + if (max_targets > 16) + max_targets = 16; +} -- 1.7.1 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div>