Commits

yotis committed 0a67b6d

Namespace injection rework, some cleanups

Comments (0)

Files changed (288)

generator/glxx.py

 
 
 #if defined(_WIN32) || defined(WIN32)
-    #define WIN32_LEAN_AND_MEAN 1
-    #include <Windows.h>
-    #pragma push_macro("MemoryBarrier")
-    #undef MemoryBarrier
+#    define WIN32_LEAN_AND_MEAN 1
+#    include <Windows.h>
+#    pragma push_macro("MemoryBarrier")
+#    undef MemoryBarrier
 #endif
 
+#include <glxx/private/glxx.h>
+// Disable injection when building the library.
+#undef GLXX_NAMESPACE_INJECTION
+#include <glxx/glxx_all.h>
+
+#ifdef __linux__
+    #include <GL/glx.h>
+#endif
 
 #include <iostream>
 #include <iterator>
 #include <memory>
 #include <cstring>
 #ifdef __linux__
-    #include <tr1/memory>
-#endif
-
-#include <glxx/private/glxx.h>
-#include <glxx/glxx_all.h>
-
-#ifdef __linux__
-    #include <GL/glx.h>
+#    include <tr1/memory>
 #endif
 
 

generator/include_proto/glxx/private/glxx_config.h

 #ifndef GLXX_CONFIG_H
 #define GLXX_CONFIG_H
 
+// namespace injection control
+#define GLXX_NAMESPACE_INJECTION
+
+#ifdef GLXX_LIBRARY_BUILD
+// thread local storage control
+#  define GLXX_TLS
+#endif
+
 // GLXX_EXPORT macro
 #if defined(_WIN32) || defined(WIN32)
 #  if defined(GLXX_LIBRARY_BUILD)
 #  define GLXX_EXPORT
 #endif
 
-
-#ifdef GLXX_LIBRARY_BUILD
-// thread local storage control
-#  define GLXX_TLS
-// namespace injection control
-#  define GLXX_NO_NAMESPACE_INJECTION
 #endif
-
-#endif

generator/parse.py

                 for f in category_functions:
                     cf.write('    GLXX_EXPORT %s %s%s(%s);\n' % (tm[f.returns], prefix, f.name, ', '.join(f.make_param_list(tm))))
                 cf.write('}\n')
-                cf.write('\n#ifndef GLXX_NO_NAMESPACE_INJECTION')
+                cf.write('\n#ifdef GLXX_NAMESPACE_INJECTION')
                 cf.write('\nusing namespace %s_%s;' % (prefix.lower(), category.lower()))
                 cf.write('\n#endif\n')
             if '/private/' not in category_filename:

include/glXxx/glx_arb_create_context.h

     GLXX_EXPORT GLXContext glXCreateContextAttribsARB(Display* dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int* attrib_list);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_arb_create_context;
 #endif
 

include/glXxx/glx_arb_get_proc_address.h

     GLXX_EXPORT __GLXextFuncPtr glXGetProcAddressARB(const GLubyte* procName);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_arb_get_proc_address;
 #endif
 

include/glXxx/glx_ext_import_context.h

     GLXX_EXPORT void glXFreeContextEXT(Display* dpy, GLXContext context);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_ext_import_context;
 #endif
 

include/glXxx/glx_ext_swap_control.h

     GLXX_EXPORT int glXSwapIntervalEXT(Display* dpy, GLXDrawable drawable, int interval);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_ext_swap_control;
 #endif
 

include/glXxx/glx_ext_texture_from_pixmap.h

     GLXX_EXPORT void glXReleaseTexImageEXT(Display* dpy, GLXDrawable drawable, int buffer);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_ext_texture_from_pixmap;
 #endif
 

include/glXxx/glx_mesa_agp_offset.h

     GLXX_EXPORT unsigned int glXGetAGPOffsetMESA(const void* pointer);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_mesa_agp_offset;
 #endif
 

include/glXxx/glx_mesa_copy_sub_buffer.h

     GLXX_EXPORT void glXCopySubBufferMESA(Display* dpy, GLXDrawable drawable, int x, int y, int width, int height);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_mesa_copy_sub_buffer;
 #endif
 

include/glXxx/glx_mesa_pixmap_colormap.h

     GLXX_EXPORT GLXPixmap glXCreateGLXPixmapMESA(Display* dpy, XVisualInfo* visual, Pixmap pixmap, Colormap cmap);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_mesa_pixmap_colormap;
 #endif
 

include/glXxx/glx_mesa_release_buffers.h

     GLXX_EXPORT Bool glXReleaseBuffersMESA(Display* dpy, GLXDrawable drawable);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_mesa_release_buffers;
 #endif
 

include/glXxx/glx_mesa_set_3dfx_mode.h

     GLXX_EXPORT Bool glXSet3DfxModeMESA(int mode);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_mesa_set_3dfx_mode;
 #endif
 

include/glXxx/glx_nv_copy_image.h

     GLXX_EXPORT void glXCopyImageSubDataNV(Display* dpy, GLXContext srcCtx, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLXContext dstCtx, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_nv_copy_image;
 #endif
 

include/glXxx/glx_nv_present_video.h

     GLXX_EXPORT int glXBindVideoDeviceNV(Display* dpy, unsigned int video_slot, unsigned int video_device, const int* attrib_list);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_nv_present_video;
 #endif
 

include/glXxx/glx_nv_swap_group.h

     GLXX_EXPORT Bool glXResetFrameCountNV(Display* dpy, int screen);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_nv_swap_group;
 #endif
 

include/glXxx/glx_nv_video_capture.h

     GLXX_EXPORT void glXReleaseVideoCaptureDeviceNV(Display* dpy, GLXVideoCaptureDeviceNV device);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_nv_video_capture;
 #endif
 

include/glXxx/glx_nv_video_output.h

     GLXX_EXPORT int glXGetVideoInfoNV(Display* dpy, int screen, GLXVideoDeviceNV VideoDevice, unsigned long* pulCounterOutputPbuffer, unsigned long* pulCounterOutputVideo);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_nv_video_output;
 #endif
 

include/glXxx/glx_oml_sync_control.h

     GLXX_EXPORT Bool glXWaitForSbcOML(Display* dpy, GLXDrawable drawable, int64_t target_sbc, int64_t* ust, int64_t* msc, int64_t* sbc);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_oml_sync_control;
 #endif
 

include/glXxx/glx_sgi_cushion.h

     GLXX_EXPORT void glXCushionSGI(Display* dpy, Window window, float cushion);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sgi_cushion;
 #endif
 

include/glXxx/glx_sgi_make_current_read.h

     GLXX_EXPORT GLXDrawable glXGetCurrentReadDrawableSGI();
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sgi_make_current_read;
 #endif
 

include/glXxx/glx_sgi_swap_control.h

     GLXX_EXPORT int glXSwapIntervalSGI(int interval);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sgi_swap_control;
 #endif
 

include/glXxx/glx_sgi_video_sync.h

     GLXX_EXPORT int glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int* count);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sgi_video_sync;
 #endif
 

include/glXxx/glx_sgix_dmbuffer.h

     GLXX_EXPORT Bool glXAssociateDMPbufferSGIX(Display* dpy, GLXPbufferSGIX pbuffer, DMparams* params, DMbuffer dmbuffer);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sgix_dmbuffer;
 #endif
 

include/glXxx/glx_sgix_fbconfig.h

     GLXX_EXPORT GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX(Display* dpy, XVisualInfo* vis);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sgix_fbconfig;
 #endif
 

include/glXxx/glx_sgix_hyperpipe.h

     GLXX_EXPORT int glXQueryHyperpipeAttribSGIX(Display* dpy, int timeSlice, int attrib, int size, void* returnAttribList);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sgix_hyperpipe;
 #endif
 

include/glXxx/glx_sgix_pbuffer.h

     GLXX_EXPORT void glXGetSelectedEventSGIX(Display* dpy, GLXDrawable drawable, unsigned long* mask);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sgix_pbuffer;
 #endif
 

include/glXxx/glx_sgix_swap_barrier.h

     GLXX_EXPORT Bool glXQueryMaxSwapBarriersSGIX(Display* dpy, int screen, int* max);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sgix_swap_barrier;
 #endif
 

include/glXxx/glx_sgix_swap_group.h

     GLXX_EXPORT void glXJoinSwapGroupSGIX(Display* dpy, GLXDrawable drawable, GLXDrawable member);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sgix_swap_group;
 #endif
 

include/glXxx/glx_sgix_video_resize.h

     GLXX_EXPORT int glXChannelRectSyncSGIX(Display* display, int screen, int channel, GLenum synctype);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sgix_video_resize;
 #endif
 

include/glXxx/glx_sgix_video_source.h

     GLXX_EXPORT void glXDestroyGLXVideoSourceSGIX(Display* dpy, GLXVideoSourceSGIX glxvideosource);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sgix_video_source;
 #endif
 

include/glXxx/glx_sun_get_transparent_index.h

     GLXX_EXPORT Status glXGetTransparentIndexSUN(Display* dpy, Window overlay, Window underlay, long* pTransparentIndex);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_sun_get_transparent_index;
 #endif
 

include/glXxx/private/glx_version_1_3.h

     GLXX_EXPORT void glXGetSelectedEvent(Display* dpy, GLXDrawable draw, unsigned long* event_mask);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_version_1_3;
 #endif
 

include/glXxx/private/glx_version_1_4.h

     GLXX_EXPORT __GLXextFuncPtr glXGetProcAddress(const GLubyte* procName);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace glx_version_1_4;
 #endif
 

include/glxx/gl_3dfx_tbuffer.h

     GLXX_EXPORT void glTbufferMask3DFX(GLuint mask);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_3dfx_tbuffer;
 #endif
 

include/glxx/gl_amd_debug_output.h

     GLXX_EXPORT GLuint glGetDebugMessageLogAMD(GLuint count, GLsizei bufsize, GLenum* categories, GLuint* severities, GLuint* ids, GLsizei* lengths, GLchar* message);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_amd_debug_output;
 #endif
 

include/glxx/gl_amd_draw_buffers_blend.h

     GLXX_EXPORT void glBlendEquationSeparateIndexedAMD(GLuint buf, GLenum modeRGB, GLenum modeAlpha);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_amd_draw_buffers_blend;
 #endif
 

include/glxx/gl_amd_multi_draw_indirect.h

     GLXX_EXPORT void glMultiDrawElementsIndirectAMD(GLenum mode, GLenum type, const GLvoid* indirect, GLsizei primcount, GLsizei stride);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_amd_multi_draw_indirect;
 #endif
 

include/glxx/gl_amd_name_gen_delete.h

     GLXX_EXPORT GLboolean glIsNameAMD(GLenum identifier, GLuint name);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_amd_name_gen_delete;
 #endif
 

include/glxx/gl_amd_performance_monitor.h

     GLXX_EXPORT void glGetPerfMonitorCounterDataAMD(GLuint monitor, GLenum pname, GLsizei dataSize, GLuint* data, GLint* bytesWritten);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_amd_performance_monitor;
 #endif
 

include/glxx/gl_amd_sample_positions.h

     GLXX_EXPORT void glSetMultisamplefvAMD(GLenum pname, GLuint index, const GLfloat* val);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_amd_sample_positions;
 #endif
 

include/glxx/gl_amd_vertex_shader_tesselator.h

     GLXX_EXPORT void glTessellationModeAMD(GLenum mode);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_amd_vertex_shader_tesselator;
 #endif
 

include/glxx/gl_apple_element_array.h

     GLXX_EXPORT void glMultiDrawRangeElementArrayAPPLE(GLenum mode, GLuint start, GLuint end, const GLint* first, const GLsizei* count, GLsizei primcount);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_apple_element_array;
 #endif
 

include/glxx/gl_apple_fence.h

     GLXX_EXPORT void glFinishObjectAPPLE(GLenum object, GLint name);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_apple_fence;
 #endif
 

include/glxx/gl_apple_flush_buffer_range.h

     GLXX_EXPORT void glFlushMappedBufferRangeAPPLE(GLenum target, GLintptr offset, GLsizeiptr size);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_apple_flush_buffer_range;
 #endif
 

include/glxx/gl_apple_object_purgeable.h

     GLXX_EXPORT void glGetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, GLint* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_apple_object_purgeable;
 #endif
 

include/glxx/gl_apple_texture_range.h

     GLXX_EXPORT void glGetTexParameterPointervAPPLE(GLenum target, GLenum pname, GLvoid** params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_apple_texture_range;
 #endif
 

include/glxx/gl_apple_vertex_array_object.h

     GLXX_EXPORT GLboolean glIsVertexArrayAPPLE(GLuint array);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_apple_vertex_array_object;
 #endif
 

include/glxx/gl_apple_vertex_array_range.h

     GLXX_EXPORT void glVertexArrayParameteriAPPLE(GLenum pname, GLint param);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_apple_vertex_array_range;
 #endif
 

include/glxx/gl_apple_vertex_program_evaluators.h

     GLXX_EXPORT void glMapVertexAttrib2fAPPLE(GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat* points);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_apple_vertex_program_evaluators;
 #endif
 

include/glxx/gl_arb_base_instance.h

     GLXX_EXPORT void glDrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount, GLint basevertex, GLuint baseinstance);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_base_instance;
 #endif
 

include/glxx/gl_arb_blend_func_extended.h

     GLXX_EXPORT GLint glGetFragDataIndex(GLuint program, const GLchar* name);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_blend_func_extended;
 #endif
 

include/glxx/gl_arb_cl_event.h

     GLXX_EXPORT GLsync glCreateSyncFromCLeventARB(struct _cl_context * context, struct _cl_event * event, GLbitfield flags);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_cl_event;
 #endif
 

include/glxx/gl_arb_color_buffer_float.h

     GLXX_EXPORT void glClampColorARB(GLenum target, GLenum clamp);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_color_buffer_float;
 #endif
 

include/glxx/gl_arb_copy_buffer.h

     GLXX_EXPORT void glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_copy_buffer;
 #endif
 

include/glxx/gl_arb_debug_output.h

     GLXX_EXPORT GLuint glGetDebugMessageLogARB(GLuint count, GLsizei bufsize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_debug_output;
 #endif
 

include/glxx/gl_arb_draw_buffers.h

     GLXX_EXPORT void glDrawBuffersARB(GLsizei n, const GLenum* bufs);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_draw_buffers;
 #endif
 

include/glxx/gl_arb_draw_buffers_blend.h

     GLXX_EXPORT void glBlendFuncSeparateiARB(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_draw_buffers_blend;
 #endif
 

include/glxx/gl_arb_draw_elements_base_vertex.h

     GLXX_EXPORT void glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei* count, GLenum type, const GLvoid** indices, GLsizei primcount, const GLint* basevertex);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_draw_elements_base_vertex;
 #endif
 

include/glxx/gl_arb_draw_indirect.h

     GLXX_EXPORT void glDrawElementsIndirect(GLenum mode, GLenum type, const GLvoid* indirect);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_draw_indirect;
 #endif
 

include/glxx/gl_arb_draw_instanced.h

     GLXX_EXPORT void glDrawElementsInstancedARB(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices, GLsizei primcount);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_draw_instanced;
 #endif
 

include/glxx/gl_arb_es2_compatibility.h

     GLXX_EXPORT void glClearDepthf(GLclampf d);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_es2_compatibility;
 #endif
 

include/glxx/gl_arb_fragment_program.h

     GLXX_EXPORT GLboolean glIsProgramARB(GLuint program);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_fragment_program;
 #endif
 

include/glxx/gl_arb_geometry_shader4.h

     GLXX_EXPORT void glFramebufferTextureFaceARB(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_geometry_shader4;
 #endif
 

include/glxx/gl_arb_get_program_binary.h

     GLXX_EXPORT void glProgramParameteri(GLuint program, GLenum pname, GLint value);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_get_program_binary;
 #endif
 

include/glxx/gl_arb_gpu_shader_fp64.h

     GLXX_EXPORT void glGetUniformdv(GLuint program, GLint location, GLdouble* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_gpu_shader_fp64;
 #endif
 

include/glxx/gl_arb_instanced_arrays.h

     GLXX_EXPORT void glVertexAttribDivisorARB(GLuint index, GLuint divisor);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_instanced_arrays;
 #endif
 

include/glxx/gl_arb_internalformat_query.h

     GLXX_EXPORT void glGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_internalformat_query;
 #endif
 

include/glxx/gl_arb_map_buffer_range.h

     GLXX_EXPORT void glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_map_buffer_range;
 #endif
 

include/glxx/gl_arb_matrix_palette.h

     GLXX_EXPORT void glMatrixIndexPointerARB(GLint size, GLenum type, GLsizei stride, const GLvoid* pointer);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_matrix_palette;
 #endif
 

include/glxx/gl_arb_multisample.h

     GLXX_EXPORT void glSampleCoverageARB(GLclampf value, GLboolean invert);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_multisample;
 #endif
 

include/glxx/gl_arb_multitexture.h

     GLXX_EXPORT void glMultiTexCoord4svARB(GLenum target, const GLshort* v);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_multitexture;
 #endif
 

include/glxx/gl_arb_occlusion_query.h

     GLXX_EXPORT void glGetQueryObjectuivARB(GLuint id, GLenum pname, GLuint* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_occlusion_query;
 #endif
 

include/glxx/gl_arb_point_parameters.h

     GLXX_EXPORT void glPointParameterfvARB(GLenum pname, const GLfloat* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_point_parameters;
 #endif
 

include/glxx/gl_arb_provoking_vertex.h

     GLXX_EXPORT void glProvokingVertex(GLenum mode);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_provoking_vertex;
 #endif
 

include/glxx/gl_arb_robustness.h

     GLXX_EXPORT void glGetnUniformdvARB(GLuint program, GLint location, GLsizei bufSize, GLdouble* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_robustness;
 #endif
 

include/glxx/gl_arb_sample_shading.h

     GLXX_EXPORT void glMinSampleShadingARB(GLclampf value);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_sample_shading;
 #endif
 

include/glxx/gl_arb_sampler_objects.h

     GLXX_EXPORT void glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_sampler_objects;
 #endif
 

include/glxx/gl_arb_separate_shader_objects.h

     GLXX_EXPORT void glGetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_separate_shader_objects;
 #endif
 

include/glxx/gl_arb_shader_atomic_counters.h

     GLXX_EXPORT void glGetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex, GLenum pname, GLint* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_shader_atomic_counters;
 #endif
 

include/glxx/gl_arb_shader_image_load_store.h

     GLXX_EXPORT void glMemoryBarrier(GLbitfield barriers);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_shader_image_load_store;
 #endif
 

include/glxx/gl_arb_shader_objects.h

     GLXX_EXPORT void glGetShaderSourceARB(GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB* source);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_shader_objects;
 #endif
 

include/glxx/gl_arb_shader_subroutine.h

     GLXX_EXPORT void glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint* values);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_shader_subroutine;
 #endif
 

include/glxx/gl_arb_shading_language_include.h

     GLXX_EXPORT void glGetNamedStringivARB(GLint namelen, const GLchar* name, GLenum pname, GLint* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_shading_language_include;
 #endif
 

include/glxx/gl_arb_sync.h

     GLXX_EXPORT void glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_sync;
 #endif
 

include/glxx/gl_arb_tessellation_shader.h

     GLXX_EXPORT void glPatchParameterfv(GLenum pname, const GLfloat* values);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_tessellation_shader;
 #endif
 

include/glxx/gl_arb_texture_buffer_object.h

     GLXX_EXPORT void glTexBufferARB(GLenum target, GLenum internalformat, GLuint buffer);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_texture_buffer_object;
 #endif
 

include/glxx/gl_arb_texture_compression.h

     GLXX_EXPORT void glGetCompressedTexImageARB(GLenum target, GLint level, GLvoid* img);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_texture_compression;
 #endif
 

include/glxx/gl_arb_texture_multisample.h

     GLXX_EXPORT void glSampleMaski(GLuint index, GLbitfield mask);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_texture_multisample;
 #endif
 

include/glxx/gl_arb_texture_storage.h

     GLXX_EXPORT void glTextureStorage3DEXT(GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_texture_storage;
 #endif
 

include/glxx/gl_arb_timer_query.h

     GLXX_EXPORT void glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_timer_query;
 #endif
 

include/glxx/gl_arb_transform_feedback2.h

     GLXX_EXPORT void glDrawTransformFeedback(GLenum mode, GLuint id);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_transform_feedback2;
 #endif
 

include/glxx/gl_arb_transform_feedback3.h

     GLXX_EXPORT void glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_transform_feedback3;
 #endif
 

include/glxx/gl_arb_transform_feedback_instanced.h

     GLXX_EXPORT void glDrawTransformFeedbackStreamInstanced(GLenum mode, GLuint id, GLuint stream, GLsizei primcount);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_transform_feedback_instanced;
 #endif
 

include/glxx/gl_arb_transpose_matrix.h

     GLXX_EXPORT void glMultTransposeMatrixdARB(const GLdouble* m);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_transpose_matrix;
 #endif
 

include/glxx/gl_arb_uniform_buffer_object.h

     GLXX_EXPORT void glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_uniform_buffer_object;
 #endif
 

include/glxx/gl_arb_vertex_array_object.h

     GLXX_EXPORT GLboolean glIsVertexArray(GLuint array);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_vertex_array_object;
 #endif
 

include/glxx/gl_arb_vertex_attrib_64bit.h

     GLXX_EXPORT void glGetVertexAttribLdv(GLuint index, GLenum pname, GLdouble* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_vertex_attrib_64bit;
 #endif
 

include/glxx/gl_arb_vertex_blend.h

     GLXX_EXPORT void glVertexBlendARB(GLint count);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_vertex_blend;
 #endif
 

include/glxx/gl_arb_vertex_buffer_object.h

     GLXX_EXPORT void glGetBufferPointervARB(GLenum target, GLenum pname, GLvoid** params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_vertex_buffer_object;
 #endif
 

include/glxx/gl_arb_vertex_program.h

     GLXX_EXPORT GLboolean glIsProgramARB(GLuint program);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_vertex_program;
 #endif
 

include/glxx/gl_arb_vertex_shader.h

     GLXX_EXPORT GLint glGetAttribLocationARB(GLhandleARB programObj, const GLcharARB* name);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_vertex_shader;
 #endif
 

include/glxx/gl_arb_vertex_type_2_10_10_10_rev.h

     GLXX_EXPORT void glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint* value);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_vertex_type_2_10_10_10_rev;
 #endif
 

include/glxx/gl_arb_viewport_array.h

     GLXX_EXPORT void glGetDoublei_v(GLenum target, GLuint index, GLdouble* data);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_viewport_array;
 #endif
 

include/glxx/gl_arb_window_pos.h

     GLXX_EXPORT void glWindowPos3svARB(const GLshort* v);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_arb_window_pos;
 #endif
 

include/glxx/gl_ati_draw_buffers.h

     GLXX_EXPORT void glDrawBuffersATI(GLsizei n, const GLenum* bufs);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ati_draw_buffers;
 #endif
 

include/glxx/gl_ati_element_array.h

     GLXX_EXPORT void glDrawRangeElementArrayATI(GLenum mode, GLuint start, GLuint end, GLsizei count);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ati_element_array;
 #endif
 

include/glxx/gl_ati_envmap_bumpmap.h

     GLXX_EXPORT void glGetTexBumpParameterfvATI(GLenum pname, GLfloat* param);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ati_envmap_bumpmap;
 #endif
 

include/glxx/gl_ati_fragment_shader.h

     GLXX_EXPORT void glSetFragmentShaderConstantATI(GLuint dst, const GLfloat* value);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ati_fragment_shader;
 #endif
 

include/glxx/gl_ati_map_object_buffer.h

     GLXX_EXPORT void glUnmapObjectBufferATI(GLuint buffer);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ati_map_object_buffer;
 #endif
 

include/glxx/gl_ati_pn_triangles.h

     GLXX_EXPORT void glPNTrianglesfATI(GLenum pname, GLfloat param);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ati_pn_triangles;
 #endif
 

include/glxx/gl_ati_separate_stencil.h

     GLXX_EXPORT void glStencilFuncSeparateATI(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ati_separate_stencil;
 #endif
 

include/glxx/gl_ati_vertex_array_object.h

     GLXX_EXPORT void glGetVariantArrayObjectivATI(GLuint id, GLenum pname, GLint* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ati_vertex_array_object;
 #endif
 

include/glxx/gl_ati_vertex_attrib_array_object.h

     GLXX_EXPORT void glGetVertexAttribArrayObjectivATI(GLuint index, GLenum pname, GLint* params);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ati_vertex_attrib_array_object;
 #endif
 

include/glxx/gl_ati_vertex_streams.h

     GLXX_EXPORT void glVertexBlendEnvfATI(GLenum pname, GLfloat param);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ati_vertex_streams;
 #endif
 

include/glxx/gl_ext_bindable_uniform.h

     GLXX_EXPORT GLintptr glGetUniformOffsetEXT(GLuint program, GLint location);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ext_bindable_uniform;
 #endif
 

include/glxx/gl_ext_blend_color.h

     GLXX_EXPORT void glBlendColorEXT(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ext_blend_color;
 #endif
 

include/glxx/gl_ext_blend_equation_separate.h

     GLXX_EXPORT void glBlendEquationSeparateEXT(GLenum modeRGB, GLenum modeAlpha);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ext_blend_equation_separate;
 #endif
 

include/glxx/gl_ext_blend_func_separate.h

     GLXX_EXPORT void glBlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ext_blend_func_separate;
 #endif
 

include/glxx/gl_ext_blend_minmax.h

     GLXX_EXPORT void glBlendEquationEXT(GLenum mode);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ext_blend_minmax;
 #endif
 

include/glxx/gl_ext_color_subtable.h

     GLXX_EXPORT void glCopyColorSubTableEXT(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION
 using namespace gl_ext_color_subtable;
 #endif
 

include/glxx/gl_ext_compiled_vertex_array.h

     GLXX_EXPORT void glUnlockArraysEXT();
 }
 
-#ifndef GLXX_NO_NAMESPACE_INJECTION
+#ifdef GLXX_NAMESPACE_INJECTION