[Piglit] [PATCH 08/12] Remove texture env combine4 Glean test
--- tests/all.py | 1 - tests/glean/CMakeLists.gl.txt | 1 - tests/glean/ttexcombine4.cpp | 415 -- tests/glean/ttexcombine4.h| 88 - 4 files changed, 505 deletions(-) delete mode 100644 tests/glean/ttexcombine4.cpp delete mode 100644 tests/glean/ttexcombine4.h diff --git a/tests/all.py b/tests/all.py index 28be0ab..33fd671 100644 --- a/tests/all.py +++ b/tests/all.py @@ -384,7 +384,6 @@ with profile.test_list.group_manager(GleanTest, 'glean') as g: g('shaderAPI') g('texCube') g('texgen') -g('texCombine4') g('texture_srgb') g('texUnits') g('vertArrayBGRA') diff --git a/tests/glean/CMakeLists.gl.txt b/tests/glean/CMakeLists.gl.txt index b91ed6e..569faaf 100644 --- a/tests/glean/CMakeLists.gl.txt +++ b/tests/glean/CMakeLists.gl.txt @@ -36,7 +36,6 @@ piglit_add_executable (glean tmultitest.cpp tpixelformats.cpp tshaderapi.cpp - ttexcombine4.cpp ttexcube.cpp ttexgen.cpp ttexture_srgb.cpp diff --git a/tests/glean/ttexcombine4.cpp b/tests/glean/ttexcombine4.cpp deleted file mode 100644 index ac2257f..000 --- a/tests/glean/ttexcombine4.cpp +++ /dev/null @@ -1,415 +0,0 @@ -// BEGIN_COPYRIGHT -*- glean -*- -// -// Copyright (C) 2009 VMware, Inc. All Rights Reserved. -// -// 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 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 VMWARE 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. -// -// END_COPYRIGHT - - -// Test GL_NV_texture_env_combine4 -// Generate some random combiner state and colors, compute the expected -// color, then render with the combiner state and compare the results. -// Only one texture unit is tested and not all possible combiner terms -// are exercised. -// -// Brian Paul -// 23 Jan 2009 - - -#define GL_GLEXT_PROTOTYPES - -#include -#include -#include -#include "ttexcombine4.h" - - -namespace GLEAN { - -TexCombine4Result::TexCombine4Result() -{ - pass = true; -} - - -// generate random combiner state -void -TexCombine4Test::generate_state(struct combine_state ) -{ - int i; - - if (rand.next() > 0.5f) - state.CombineMode = GL_ADD; - else - state.CombineMode = GL_ADD_SIGNED_EXT; - - for (i = 0; i < 4; i++) { - int src = int(rand.next() * 4.0); - switch (src) { - case 0: - state.Source[i] = GL_ZERO; - break; - case 1: - state.Source[i] = GL_TEXTURE; - break; - case 2: - state.Source[i] = GL_CONSTANT_EXT; - break; - default: - state.Source[i] = GL_PRIMARY_COLOR_EXT; - break; - } - - if (rand.next() > 0.5f) { - state.OperandRGB[i] = GL_SRC_COLOR; - state.OperandA[i] = GL_SRC_ALPHA; - } - else { - state.OperandRGB[i] = GL_ONE_MINUS_SRC_COLOR; - state.OperandA[i] = GL_ONE_MINUS_SRC_ALPHA; - } - } - - state.PrimaryColor[0] = rand.next(); - state.PrimaryColor[1] = rand.next(); - state.PrimaryColor[2] = rand.next(); - state.PrimaryColor[3] = rand.next(); - - state.ConstantColor[0] = rand.next(); - state.ConstantColor[1] = rand.next(); - state.ConstantColor[2] = rand.next(); - state.ConstantColor[3] = rand.next(); - - state.TextureColor[0] = rand.next(); - state.TextureColor[1] = rand.next(); - state.TextureColor[2] = rand.next(); - state.TextureColor[3] = rand.next(); -} - - -// compute expected final color -void -TexCombine4Test::evaluate_state(const struct combine_state , - GLfloat result[4]) -{ - GLfloat arg[4][4]; - int i; - - // setup terms - for (i = 0; i < 4; i++) { -
[Piglit] [PATCH 08/12] Remove texture env combine4 Glean test
--- tests/all.py | 1 - tests/glean/CMakeLists.gl.txt | 1 - tests/glean/ttexcombine4.cpp | 415 -- tests/glean/ttexcombine4.h| 88 - 4 files changed, 505 deletions(-) delete mode 100644 tests/glean/ttexcombine4.cpp delete mode 100644 tests/glean/ttexcombine4.h diff --git a/tests/all.py b/tests/all.py index 84ca8b2..9130844 100644 --- a/tests/all.py +++ b/tests/all.py @@ -305,7 +305,6 @@ with profile.test_list.group_manager(GleanTest, 'glean') as g: g('shaderAPI') g('texCube') g('texgen') -g('texCombine4') g('texture_srgb') g('texUnits') g('vertArrayBGRA') diff --git a/tests/glean/CMakeLists.gl.txt b/tests/glean/CMakeLists.gl.txt index b91ed6e..569faaf 100644 --- a/tests/glean/CMakeLists.gl.txt +++ b/tests/glean/CMakeLists.gl.txt @@ -36,7 +36,6 @@ piglit_add_executable (glean tmultitest.cpp tpixelformats.cpp tshaderapi.cpp - ttexcombine4.cpp ttexcube.cpp ttexgen.cpp ttexture_srgb.cpp diff --git a/tests/glean/ttexcombine4.cpp b/tests/glean/ttexcombine4.cpp deleted file mode 100644 index ac2257f..000 --- a/tests/glean/ttexcombine4.cpp +++ /dev/null @@ -1,415 +0,0 @@ -// BEGIN_COPYRIGHT -*- glean -*- -// -// Copyright (C) 2009 VMware, Inc. All Rights Reserved. -// -// 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 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 VMWARE 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. -// -// END_COPYRIGHT - - -// Test GL_NV_texture_env_combine4 -// Generate some random combiner state and colors, compute the expected -// color, then render with the combiner state and compare the results. -// Only one texture unit is tested and not all possible combiner terms -// are exercised. -// -// Brian Paul -// 23 Jan 2009 - - -#define GL_GLEXT_PROTOTYPES - -#include -#include -#include -#include "ttexcombine4.h" - - -namespace GLEAN { - -TexCombine4Result::TexCombine4Result() -{ - pass = true; -} - - -// generate random combiner state -void -TexCombine4Test::generate_state(struct combine_state ) -{ - int i; - - if (rand.next() > 0.5f) - state.CombineMode = GL_ADD; - else - state.CombineMode = GL_ADD_SIGNED_EXT; - - for (i = 0; i < 4; i++) { - int src = int(rand.next() * 4.0); - switch (src) { - case 0: - state.Source[i] = GL_ZERO; - break; - case 1: - state.Source[i] = GL_TEXTURE; - break; - case 2: - state.Source[i] = GL_CONSTANT_EXT; - break; - default: - state.Source[i] = GL_PRIMARY_COLOR_EXT; - break; - } - - if (rand.next() > 0.5f) { - state.OperandRGB[i] = GL_SRC_COLOR; - state.OperandA[i] = GL_SRC_ALPHA; - } - else { - state.OperandRGB[i] = GL_ONE_MINUS_SRC_COLOR; - state.OperandA[i] = GL_ONE_MINUS_SRC_ALPHA; - } - } - - state.PrimaryColor[0] = rand.next(); - state.PrimaryColor[1] = rand.next(); - state.PrimaryColor[2] = rand.next(); - state.PrimaryColor[3] = rand.next(); - - state.ConstantColor[0] = rand.next(); - state.ConstantColor[1] = rand.next(); - state.ConstantColor[2] = rand.next(); - state.ConstantColor[3] = rand.next(); - - state.TextureColor[0] = rand.next(); - state.TextureColor[1] = rand.next(); - state.TextureColor[2] = rand.next(); - state.TextureColor[3] = rand.next(); -} - - -// compute expected final color -void -TexCombine4Test::evaluate_state(const struct combine_state , - GLfloat result[4]) -{ - GLfloat arg[4][4]; - int i; - - // setup terms - for (i = 0; i < 4; i++) { -