Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b149a59 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "improve a bit the implementation of eglGetProcAddress" into gingerbread

parents 166638b7 7f781d15

opengl/libs/EGL/getProcAddress.cpp

+32 −86
Original line number Original line Diff line number Diff line
@@ -27,9 +27,12 @@ namespace android { 
// ----------------------------------------------------------------------------

// ----------------------------------------------------------------------------





#undef API_ENTRY

#undef API_ENTRY

#undef CALL_GL_API

#undef CALL_GL_EXTENSION_API

#undef GL_EXTENSION

#undef GL_EXTENSION

#undef GL_EXTENSION_NAME

#undef GL_EXTENSION_NAME

#undef GL_EXTENSION_ARRAY

#undef GL_EXTENSION_LIST

#undef GET_TLS





#if defined(__arm__)

#if defined(__arm__)
@@ -78,97 +81,40 @@ namespace android { 




#endif

#endif





GL_EXTENSION(0)

#define GL_EXTENSION_LIST(name) \

GL_EXTENSION(1)

        name(0)   name(1)   name(2)   name(3)   \

GL_EXTENSION(2)

        name(4)   name(5)   name(6)   name(7)   \

GL_EXTENSION(3)

        name(8)   name(9)   name(10)  name(11)  \

GL_EXTENSION(4)

        name(12)  name(13)  name(14)  name(15)  \

GL_EXTENSION(5)

        name(16)  name(17)  name(18)  name(19)  \

GL_EXTENSION(6)

        name(20)  name(21)  name(22)  name(23)  \

GL_EXTENSION(7)

        name(24)  name(25)  name(26)  name(27)  \

GL_EXTENSION(8)

        name(28)  name(29)  name(30)  name(31)  \

GL_EXTENSION(9)

        name(32)  name(33)  name(34)  name(35)  \

GL_EXTENSION(10)

        name(36)  name(37)  name(38)  name(39)  \

GL_EXTENSION(11)

        name(40)  name(41)  name(42)  name(43)  \

GL_EXTENSION(12)

        name(44)  name(45)  name(46)  name(47)  \

GL_EXTENSION(13)

        name(48)  name(49)  name(50)  name(51)  \

GL_EXTENSION(14)

        name(52)  name(53)  name(54)  name(55)  \

GL_EXTENSION(15)

        name(56)  name(57)  name(58)  name(59)  \



        name(60)  name(61)  name(62)  name(63)

GL_EXTENSION(16)



GL_EXTENSION(17)



GL_EXTENSION(18)

GL_EXTENSION_LIST( GL_EXTENSION )

GL_EXTENSION(19)



GL_EXTENSION(20)

#define GL_EXTENSION_ARRAY(_n)  GL_EXTENSION_NAME(_n),

GL_EXTENSION(21)

GL_EXTENSION(22)

GL_EXTENSION(23)

GL_EXTENSION(24)

GL_EXTENSION(25)

GL_EXTENSION(26)

GL_EXTENSION(27)

GL_EXTENSION(28)

GL_EXTENSION(29)

GL_EXTENSION(30)

GL_EXTENSION(31)



GL_EXTENSION(32)

GL_EXTENSION(33)

GL_EXTENSION(34)

GL_EXTENSION(35)

GL_EXTENSION(36)

GL_EXTENSION(37)

GL_EXTENSION(38)

GL_EXTENSION(39)

GL_EXTENSION(40)

GL_EXTENSION(41)

GL_EXTENSION(42)

GL_EXTENSION(43)

GL_EXTENSION(44)

GL_EXTENSION(45)

GL_EXTENSION(46)

GL_EXTENSION(47)



GL_EXTENSION(48)

GL_EXTENSION(49)

GL_EXTENSION(50)

GL_EXTENSION(51)

GL_EXTENSION(52)

GL_EXTENSION(53)

GL_EXTENSION(54)

GL_EXTENSION(55)

GL_EXTENSION(56)

GL_EXTENSION(57)

GL_EXTENSION(58)

GL_EXTENSION(59)

GL_EXTENSION(60)

GL_EXTENSION(61)

GL_EXTENSION(62)

GL_EXTENSION(63)





extern const __eglMustCastToProperFunctionPointerType gExtensionForwarders[MAX_NUMBER_OF_GL_EXTENSIONS] = {

extern const __eglMustCastToProperFunctionPointerType gExtensionForwarders[MAX_NUMBER_OF_GL_EXTENSIONS] = {

     GL_EXTENSION_NAME(0),  GL_EXTENSION_NAME(1),  GL_EXTENSION_NAME(2),  GL_EXTENSION_NAME(3),

        GL_EXTENSION_LIST( GL_EXTENSION_ARRAY )

     GL_EXTENSION_NAME(4),  GL_EXTENSION_NAME(5),  GL_EXTENSION_NAME(6),  GL_EXTENSION_NAME(7),

     GL_EXTENSION_NAME(8),  GL_EXTENSION_NAME(9),  GL_EXTENSION_NAME(10), GL_EXTENSION_NAME(11),

     GL_EXTENSION_NAME(12), GL_EXTENSION_NAME(13), GL_EXTENSION_NAME(14), GL_EXTENSION_NAME(15),

     GL_EXTENSION_NAME(16), GL_EXTENSION_NAME(17), GL_EXTENSION_NAME(18), GL_EXTENSION_NAME(19),

     GL_EXTENSION_NAME(20), GL_EXTENSION_NAME(21), GL_EXTENSION_NAME(22), GL_EXTENSION_NAME(23),

     GL_EXTENSION_NAME(24), GL_EXTENSION_NAME(25), GL_EXTENSION_NAME(26), GL_EXTENSION_NAME(27),

     GL_EXTENSION_NAME(28), GL_EXTENSION_NAME(29), GL_EXTENSION_NAME(30), GL_EXTENSION_NAME(31),

     GL_EXTENSION_NAME(32), GL_EXTENSION_NAME(33), GL_EXTENSION_NAME(34), GL_EXTENSION_NAME(35),

     GL_EXTENSION_NAME(36), GL_EXTENSION_NAME(37), GL_EXTENSION_NAME(38), GL_EXTENSION_NAME(39),

     GL_EXTENSION_NAME(40), GL_EXTENSION_NAME(41), GL_EXTENSION_NAME(42), GL_EXTENSION_NAME(43),

     GL_EXTENSION_NAME(44), GL_EXTENSION_NAME(45), GL_EXTENSION_NAME(46), GL_EXTENSION_NAME(47),

     GL_EXTENSION_NAME(48), GL_EXTENSION_NAME(49), GL_EXTENSION_NAME(50), GL_EXTENSION_NAME(51),

     GL_EXTENSION_NAME(52), GL_EXTENSION_NAME(53), GL_EXTENSION_NAME(54), GL_EXTENSION_NAME(55),

     GL_EXTENSION_NAME(56), GL_EXTENSION_NAME(57), GL_EXTENSION_NAME(58), GL_EXTENSION_NAME(59),

     GL_EXTENSION_NAME(60), GL_EXTENSION_NAME(61), GL_EXTENSION_NAME(62), GL_EXTENSION_NAME(63)

 };

 };





#undef GET_TLS

#undef GL_EXTENSION_LIST

#undef GL_EXTENSION_ARRAY

#undef GL_EXTENSION_NAME

#undef GL_EXTENSION_NAME

#undef GL_EXTENSION

#undef GL_EXTENSION

#undef API_ENTRY

#undef API_ENTRY

#undef CALL_GL_API

#undef CALL_GL_EXTENSION_API





// ----------------------------------------------------------------------------

// ----------------------------------------------------------------------------

}; // namespace android

}; // namespace android