diff options
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/enums.h | 2 | ||||
-rw-r--r-- | src/mesa/main/tests/enum_strings.cpp | 32 |
2 files changed, 0 insertions, 34 deletions
diff --git a/src/mesa/main/enums.h b/src/mesa/main/enums.h index 556c1db99dc..36c053d4bc5 100644 --- a/src/mesa/main/enums.h +++ b/src/mesa/main/enums.h @@ -44,6 +44,4 @@ extern const char *_mesa_lookup_enum_by_nr( int nr ); */ const char *_mesa_lookup_prim_by_nr( unsigned nr ); -extern int _mesa_lookup_enum_by_name( const char *symbol ); - #endif diff --git a/src/mesa/main/tests/enum_strings.cpp b/src/mesa/main/tests/enum_strings.cpp index 1dae60f7fca..c8df8195644 100644 --- a/src/mesa/main/tests/enum_strings.cpp +++ b/src/mesa/main/tests/enum_strings.cpp @@ -34,7 +34,6 @@ struct enum_info { }; extern const struct enum_info everything[]; -extern const struct enum_info alternate_names[]; TEST(EnumStrings, LookUpByNumber) { @@ -44,25 +43,6 @@ TEST(EnumStrings, LookUpByNumber) } } -TEST(EnumStrings, LookUpByName) -{ - for (unsigned i = 0; everything[i].name != NULL; i++) { - EXPECT_EQ(everything[i].value, - _mesa_lookup_enum_by_name(everything[i].name)); - } -} - -TEST(EnumStrings, LookUpByDuplicateName) -{ - /* Some enum values have multiple names. Try to find some values - * by alternate names. - */ - for (unsigned i = 0; alternate_names[i].name != NULL; i++) { - EXPECT_EQ(alternate_names[i].value, - _mesa_lookup_enum_by_name(alternate_names[i].name)); - } -} - TEST(EnumStrings, LookUpUnknownNumber) { EXPECT_STRCASEEQ("0xEEEE", _mesa_lookup_enum_by_nr(0xEEEE)); @@ -1866,15 +1846,3 @@ const struct enum_info everything[] = { { 0x19262, "GL_RASTER_POSITION_UNCLIPPED_IBM" }, { 0, NULL } }; - -const struct enum_info alternate_names[] = { - { 0x8513, "GL_TEXTURE_CUBE_MAP_ARB" }, - { 0x8514, "GL_TEXTURE_BINDING_CUBE_MAP_ARB" }, - { 0x8515, "GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB" }, - { 0x8516, "GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB" }, - { 0x8517, "GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB" }, - { 0x8518, "GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB" }, - { 0x8519, "GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB" }, - { 0x851A, "GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB" }, - { 0, NULL } -}; |