sungmg/mutter-performance-source
1
0
Fork 0
Code Activity
mutter-performance-source/cogl/tests/conform/test-no-gl-header.c

17 lines
290 B
C
Raw Normal View History

Mass rename CLUTTER_COMPILATION to COGL_COMPILATION Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit a99512e5798e48ffa3a9a1a7eb98bc55647ee1b6)
2012-06-20 17:49:08 +00:00
#undef COGL_COMPILATION
Don't include any GL header from the public GL headers This splits the GL header inclusion from cogl-defines.h into a separate headear called cogl-gl-header.h which we will only include internally. That way we don't leak GL declarations out of our public headers. The texture functions that were using GLenum and GLuint in the public header have now changed to just use unsigned int. Note however that if an EGL winsys is enabled then it will still publicly include an EGL header. This is a bit more awkward to fix because we have public API which returns an EGLDisplay and we can't determine what type that is. There is also a conformance test which just verifies that no GL header has been included while compiling. The test isn't added to test-conform-main because it doesn't actually test anything at runtime. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit ef5680d3fda5df929dbd0b420c8f598ded58dfee)
2012-03-23 18:05:46 +00:00
#include <cogl/cogl.h>
/* If you just include cogl/cogl.h, you shouldn't end up including any
GL headers */
#ifdef GL_TRUE
#error "Including cogl.h shouldn't be including any GL headers"
#endif
Don't include cogl/cogl.h from test-utils.h There was a circular depedency when building from a fresh git clone where test-fixtures needs to be built before the cogl directory, but test-fixtures also indirectly includes cogl-enum-types.h which is only generated when building the cogl directory. If we change the header to just include specific cogl headers instead of cogl/cogl.h then we can break the circular dependency. This needs a tweak to test-no-gl-header because that first undefines COGL_COMPILATION before including test-utils.h. However it doesn't really do any actual work so we can get away without including it. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit adb26bd13a48ed571ef4cae4de005e039b34e361)
2013-07-03 09:50:37 +00:00
void test_no_gl_header (void);
Don't include any GL header from the public GL headers This splits the GL header inclusion from cogl-defines.h into a separate headear called cogl-gl-header.h which we will only include internally. That way we don't leak GL declarations out of our public headers. The texture functions that were using GLenum and GLuint in the public header have now changed to just use unsigned int. Note however that if an EGL winsys is enabled then it will still publicly include an EGL header. This is a bit more awkward to fix because we have public API which returns an EGLDisplay and we can't determine what type that is. There is also a conformance test which just verifies that no GL header has been included while compiling. The test isn't added to test-conform-main because it doesn't actually test anything at runtime. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit ef5680d3fda5df929dbd0b420c8f598ded58dfee)
2012-03-23 18:05:46 +00:00
void
test_no_gl_header (void)
{
}
Copy permalink