diff options
Diffstat (limited to 'tests/glean/tfragprog1.h')
| -rw-r--r-- | tests/glean/tfragprog1.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/tests/glean/tfragprog1.h b/tests/glean/tfragprog1.h index b36e7a6f9..37656eb0b 100644 --- a/tests/glean/tfragprog1.h +++ b/tests/glean/tfragprog1.h @@ -1,7 +1,7 @@ // BEGIN_COPYRIGHT -*- glean -*- -// +// // Copyright (C) 1999 Allen Akin 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 @@ -10,11 +10,11 @@ // 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 @@ -23,7 +23,7 @@ // 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 // tfragprog.h: Test GL_ARB_fragment_program extension. @@ -32,10 +32,6 @@ #ifndef __tfragprog_h__ #define __tfragprog_h__ -#include "tmultitest.h" - -namespace GLEAN { - // If DEVEL_MODE==1 we generate a tall window of color swatches, one per // fragment program, which can be eyeballed against a reference image. // Use this if glReadPixels functionality is not working yet. @@ -51,14 +47,18 @@ namespace GLEAN { #endif +#include "tmultitest.h" + +namespace GLEAN { + + class FragmentProgram { public: const char *name; const char *progString; - const GLfloat expectedColor[4]; - const GLfloat expectedZ; - const bool needFogCoord; + GLfloat expectedColor[4]; + GLfloat expectedZ; }; @@ -75,8 +75,6 @@ public: private: GLfloat tolerance[5]; - bool haveFogCoord; - void setup(void); bool equalColors(const GLfloat a[4], const GLfloat b[4]) const; bool equalDepth(GLfloat z0, GLfloat z1) const; @@ -86,7 +84,6 @@ private: const GLfloat actualColor[4] ) const; void reportZFailure(const char *programName, GLfloat expectedZ, GLfloat actualZ) const; - void printDetails(); }; } // namespace GLEAN |