Makefile.am | 1 README.md | 6 autogen.sh | 2 configure.ac | 10 src/GL/Makefile.am | 1 src/GLX/Makefile.am | 10 src/GLdispatch/Makefile.am | 12 src/GLdispatch/mapi/Android.mk | 78 src/GLdispatch/mapi/Makefile.am | 46 src/GLdispatch/mapi/Makefile.sources | 36 src/GLdispatch/mapi/entry.c | 97 src/GLdispatch/mapi/entry.h | 47 src/GLdispatch/mapi/entry_x86-64_tls.h | 112 src/GLdispatch/mapi/entry_x86_tls.h | 132 src/GLdispatch/mapi/entry_x86_tsd.h | 103 src/GLdispatch/mapi/es1api/ABI-check | 254 src/GLdispatch/mapi/es1api/Makefile.am | 66 src/GLdispatch/mapi/es1api/glesv1_cm.pc.in | 12 src/GLdispatch/mapi/es2api/ABI-check | 292 src/GLdispatch/mapi/es2api/Makefile.am | 70 src/GLdispatch/mapi/es2api/glesv2.pc.in | 12 src/GLdispatch/mapi/glapi/Makefile.am | 61 src/GLdispatch/mapi/glapi/Makefile.sources | 20 src/GLdispatch/mapi/glapi/SConscript | 102 src/GLdispatch/mapi/glapi/gen/AMD_draw_buffers_blend.xml | 38 src/GLdispatch/mapi/glapi/gen/APPLE_object_purgeable.xml | 37 src/GLdispatch/mapi/glapi/gen/APPLE_vertex_array_object.xml | 29 src/GLdispatch/mapi/glapi/gen/ARB_ES2_compatibility.xml | 58 src/GLdispatch/mapi/glapi/gen/ARB_ES3_compatibility.xml | 23 src/GLdispatch/mapi/glapi/gen/ARB_base_instance.xml | 43 src/GLdispatch/mapi/glapi/gen/ARB_blend_func_extended.xml | 32 src/GLdispatch/mapi/glapi/gen/ARB_color_buffer_float.xml | 24 src/GLdispatch/mapi/glapi/gen/ARB_copy_buffer.xml | 24 src/GLdispatch/mapi/glapi/gen/ARB_debug_output.xml | 93 src/GLdispatch/mapi/glapi/gen/ARB_depth_buffer_float.xml | 15 src/GLdispatch/mapi/glapi/gen/ARB_depth_clamp.xml | 12 src/GLdispatch/mapi/glapi/gen/ARB_draw_buffers.xml | 123 src/GLdispatch/mapi/glapi/gen/ARB_draw_buffers_blend.xml | 38 src/GLdispatch/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml | 52 src/GLdispatch/mapi/glapi/gen/ARB_draw_instanced.xml | 49 src/GLdispatch/mapi/glapi/gen/ARB_framebuffer_object.xml | 300 src/GLdispatch/mapi/glapi/gen/ARB_geometry_shader4.xml | 57 src/GLdispatch/mapi/glapi/gen/ARB_get_program_binary.xml | 36 src/GLdispatch/mapi/glapi/gen/ARB_instanced_arrays.xml | 21 src/GLdispatch/mapi/glapi/gen/ARB_internalformat_query.xml | 21 src/GLdispatch/mapi/glapi/gen/ARB_invalidate_subdata.xml | 48 src/GLdispatch/mapi/glapi/gen/ARB_map_buffer_range.xml | 34 src/GLdispatch/mapi/glapi/gen/ARB_robustness.xml | 185 src/GLdispatch/mapi/glapi/gen/ARB_sampler_objects.xml | 96 src/GLdispatch/mapi/glapi/gen/ARB_seamless_cube_map.xml | 12 src/GLdispatch/mapi/glapi/gen/ARB_sync.xml | 84 src/GLdispatch/mapi/glapi/gen/ARB_texture_buffer_object.xml | 22 src/GLdispatch/mapi/glapi/gen/ARB_texture_buffer_range.xml | 22 src/GLdispatch/mapi/glapi/gen/ARB_texture_compression_rgtc.xml | 15 src/GLdispatch/mapi/glapi/gen/ARB_texture_cube_map_array.xml | 18 src/GLdispatch/mapi/glapi/gen/ARB_texture_float.xml | 36 src/GLdispatch/mapi/glapi/gen/ARB_texture_multisample.xml | 69 src/GLdispatch/mapi/glapi/gen/ARB_texture_rg.xml | 42 src/GLdispatch/mapi/glapi/gen/ARB_texture_rgb10_a2ui.xml | 12 src/GLdispatch/mapi/glapi/gen/ARB_texture_storage.xml | 67 src/GLdispatch/mapi/glapi/gen/ARB_texture_storage_multisample.xml | 31 src/GLdispatch/mapi/glapi/gen/ARB_uniform_buffer_object.xml | 97 src/GLdispatch/mapi/glapi/gen/ARB_vertex_array_object.xml | 34 src/GLdispatch/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml | 256 src/GLdispatch/mapi/glapi/gen/EXT_draw_buffers2.xml | 49 src/GLdispatch/mapi/glapi/gen/EXT_framebuffer_object.xml | 217 src/GLdispatch/mapi/glapi/gen/EXT_gpu_shader4.xml | 249 src/GLdispatch/mapi/glapi/gen/EXT_packed_depth_stencil.xml | 18 src/GLdispatch/mapi/glapi/gen/EXT_provoking_vertex.xml | 35 src/GLdispatch/mapi/glapi/gen/EXT_separate_shader_objects.xml | 26 src/GLdispatch/mapi/glapi/gen/EXT_texture_array.xml | 41 src/GLdispatch/mapi/glapi/gen/EXT_texture_integer.xml | 98 src/GLdispatch/mapi/glapi/gen/EXT_transform_feedback.xml | 118 src/GLdispatch/mapi/glapi/gen/GL3x.xml | 635 src/GLdispatch/mapi/glapi/gen/GL4x.xml | 757 src/GLdispatch/mapi/glapi/gen/Makefile.am | 285 src/GLdispatch/mapi/glapi/gen/NV_conditional_render.xml | 26 src/GLdispatch/mapi/glapi/gen/NV_primitive_restart.xml | 24 src/GLdispatch/mapi/glapi/gen/NV_texture_barrier.xml | 13 src/GLdispatch/mapi/glapi/gen/OES_EGL_image.xml | 22 src/GLdispatch/mapi/glapi/gen/OES_fixed_point.xml | 300 src/GLdispatch/mapi/glapi/gen/OES_single_precision.xml | 53 src/GLdispatch/mapi/glapi/gen/SConscript | 63 src/GLdispatch/mapi/glapi/gen/es_EXT.xml | 840 src/GLdispatch/mapi/glapi/gen/extension_helper.py | 324 src/GLdispatch/mapi/glapi/gen/glX_API.xml | 234 src/GLdispatch/mapi/glapi/gen/glX_XML.py | 570 src/GLdispatch/mapi/glapi/gen/glX_doc.py | 280 src/GLdispatch/mapi/glapi/gen/glX_proto_common.py | 95 src/GLdispatch/mapi/glapi/gen/glX_proto_recv.py | 555 src/GLdispatch/mapi/glapi/gen/glX_proto_send.py | 1122 src/GLdispatch/mapi/glapi/gen/glX_proto_size.py | 703 src/GLdispatch/mapi/glapi/gen/glX_server_table.py | 410 src/GLdispatch/mapi/glapi/gen/gl_API.dtd | 146 src/GLdispatch/mapi/glapi/gen/gl_API.xml |13005 ---------- src/GLdispatch/mapi/glapi/gen/gl_SPARC_asm.py | 273 src/GLdispatch/mapi/glapi/gen/gl_XML.py | 1078 src/GLdispatch/mapi/glapi/gen/gl_and_es_API.xml | 328 src/GLdispatch/mapi/glapi/gen/gl_and_glX_API.xml | 7 src/GLdispatch/mapi/glapi/gen/gl_apitemp.py | 327 src/GLdispatch/mapi/glapi/gen/gl_enums.py | 261 src/GLdispatch/mapi/glapi/gen/gl_genexec.py | 219 src/GLdispatch/mapi/glapi/gen/gl_gentable.py | 202 src/GLdispatch/mapi/glapi/gen/gl_inittable.py | 198 src/GLdispatch/mapi/glapi/gen/gl_offsets.py | 120 src/GLdispatch/mapi/glapi/gen/gl_procs.py | 215 src/GLdispatch/mapi/glapi/gen/gl_table.py | 238 src/GLdispatch/mapi/glapi/gen/gl_x86-64_asm.py | 322 src/GLdispatch/mapi/glapi/gen/gl_x86_asm.py | 256 src/GLdispatch/mapi/glapi/gen/glapi_gen.mk | 57 src/GLdispatch/mapi/glapi/gen/license.py | 47 src/GLdispatch/mapi/glapi/gen/mesadef.py | 215 src/GLdispatch/mapi/glapi/gen/next_available_offset.sh | 39 src/GLdispatch/mapi/glapi/gen/remap_helper.py | 192 src/GLdispatch/mapi/glapi/gen/typeexpr.py | 292 src/GLdispatch/mapi/glapi/glapi.c | 75 src/GLdispatch/mapi/glapi/glapi.h | 216 src/GLdispatch/mapi/glapi/glapi_dispatch.c | 92 src/GLdispatch/mapi/glapi/glapi_entrypoint.c | 345 src/GLdispatch/mapi/glapi/glapi_getproc.c | 666 src/GLdispatch/mapi/glapi/glapi_nop.c | 121 src/GLdispatch/mapi/glapi/glapi_priv.h | 114 src/GLdispatch/mapi/glapi/glthread.c | 7 src/GLdispatch/mapi/glapi/glthread.h | 28 src/GLdispatch/mapi/glapi/tests/Makefile.am | 19 src/GLdispatch/mapi/glapi/tests/check_table.cpp | 1661 - src/GLdispatch/mapi/mapi.c | 190 src/GLdispatch/mapi/mapi.h | 65 src/GLdispatch/mapi/mapi_abi.py | 895 src/GLdispatch/mapi/mapi_glapi.c | 250 src/GLdispatch/mapi/mapi_tmp.h | 47 src/GLdispatch/mapi/shared-glapi/Makefile.am | 32 src/GLdispatch/mapi/shared-glapi/SConscript | 121 src/GLdispatch/mapi/shared-glapi/tests/Makefile.am | 18 src/GLdispatch/mapi/shared-glapi/tests/check_table.cpp | 471 src/GLdispatch/mapi/stub.c | 228 src/GLdispatch/mapi/stub.h | 59 src/GLdispatch/mapi/table.c | 55 src/GLdispatch/mapi/table.h | 71 src/GLdispatch/mapi/u_compiler.h | 33 src/GLdispatch/mapi/u_current.c | 330 src/GLdispatch/mapi/u_current.h | 106 src/GLdispatch/mapi/u_execmem.c | 145 src/GLdispatch/mapi/u_execmem.h | 7 src/GLdispatch/mapi/u_macros.h | 12 src/GLdispatch/mapi/u_thread.h | 287 src/GLdispatch/mapi/vgapi/Makefile.am | 61 src/GLdispatch/mapi/vgapi/SConscript | 61 src/GLdispatch/mapi/vgapi/vg.pc.in | 12 src/GLdispatch/mapi/vgapi/vgapi.csv | 93 src/GLdispatch/mapi/vnd-glapi/Makefile.am | 37 src/GLdispatch/mapi/vnd-glapi/SConscript | 121 src/GLdispatch/mapi/vnd-glapi/tests/Makefile.am | 18 src/GLdispatch/mapi/vnd-glapi/tests/check_table.cpp | 471 src/GLdispatch/vnd-glapi/Makefile.am | 39 src/GLdispatch/vnd-glapi/SConscript | 121 src/GLdispatch/vnd-glapi/mapi/Android.mk | 78 src/GLdispatch/vnd-glapi/mapi/Makefile.am | 46 src/GLdispatch/vnd-glapi/mapi/Makefile.sources | 36 src/GLdispatch/vnd-glapi/mapi/entry.c | 97 src/GLdispatch/vnd-glapi/mapi/entry.h | 47 src/GLdispatch/vnd-glapi/mapi/entry_x86-64_tls.h | 112 src/GLdispatch/vnd-glapi/mapi/entry_x86_tls.h | 132 src/GLdispatch/vnd-glapi/mapi/entry_x86_tsd.h | 103 src/GLdispatch/vnd-glapi/mapi/es1api/ABI-check | 254 src/GLdispatch/vnd-glapi/mapi/es1api/Makefile.am | 66 src/GLdispatch/vnd-glapi/mapi/es1api/glesv1_cm.pc.in | 12 src/GLdispatch/vnd-glapi/mapi/es2api/ABI-check | 292 src/GLdispatch/vnd-glapi/mapi/es2api/Makefile.am | 70 src/GLdispatch/vnd-glapi/mapi/es2api/glesv2.pc.in | 12 src/GLdispatch/vnd-glapi/mapi/glapi/Makefile.am | 61 src/GLdispatch/vnd-glapi/mapi/glapi/Makefile.sources | 20 src/GLdispatch/vnd-glapi/mapi/glapi/SConscript | 102 src/GLdispatch/vnd-glapi/mapi/glapi/gen/AMD_draw_buffers_blend.xml | 38 src/GLdispatch/vnd-glapi/mapi/glapi/gen/APPLE_object_purgeable.xml | 37 src/GLdispatch/vnd-glapi/mapi/glapi/gen/APPLE_vertex_array_object.xml | 29 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_ES2_compatibility.xml | 58 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_ES3_compatibility.xml | 23 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_base_instance.xml | 43 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_blend_func_extended.xml | 32 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_color_buffer_float.xml | 24 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_copy_buffer.xml | 24 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_debug_output.xml | 93 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_depth_buffer_float.xml | 15 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_depth_clamp.xml | 12 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_draw_buffers.xml | 123 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_draw_buffers_blend.xml | 38 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml | 52 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_draw_instanced.xml | 49 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_framebuffer_object.xml | 300 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_geometry_shader4.xml | 57 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_get_program_binary.xml | 36 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_instanced_arrays.xml | 21 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_internalformat_query.xml | 21 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_invalidate_subdata.xml | 48 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_map_buffer_range.xml | 34 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_robustness.xml | 185 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_sampler_objects.xml | 96 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_seamless_cube_map.xml | 12 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_sync.xml | 84 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_texture_buffer_object.xml | 22 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_texture_buffer_range.xml | 22 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_texture_compression_rgtc.xml | 15 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_texture_cube_map_array.xml | 18 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_texture_float.xml | 36 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_texture_multisample.xml | 69 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_texture_rg.xml | 42 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_texture_rgb10_a2ui.xml | 12 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_texture_storage.xml | 67 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_texture_storage_multisample.xml | 31 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_uniform_buffer_object.xml | 97 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_vertex_array_object.xml | 34 src/GLdispatch/vnd-glapi/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml | 256 src/GLdispatch/vnd-glapi/mapi/glapi/gen/EXT_draw_buffers2.xml | 49 src/GLdispatch/vnd-glapi/mapi/glapi/gen/EXT_framebuffer_object.xml | 217 src/GLdispatch/vnd-glapi/mapi/glapi/gen/EXT_gpu_shader4.xml | 249 src/GLdispatch/vnd-glapi/mapi/glapi/gen/EXT_packed_depth_stencil.xml | 18 src/GLdispatch/vnd-glapi/mapi/glapi/gen/EXT_provoking_vertex.xml | 35 src/GLdispatch/vnd-glapi/mapi/glapi/gen/EXT_separate_shader_objects.xml | 26 src/GLdispatch/vnd-glapi/mapi/glapi/gen/EXT_texture_array.xml | 41 src/GLdispatch/vnd-glapi/mapi/glapi/gen/EXT_texture_integer.xml | 98 src/GLdispatch/vnd-glapi/mapi/glapi/gen/EXT_transform_feedback.xml | 118 src/GLdispatch/vnd-glapi/mapi/glapi/gen/GL3x.xml | 635 src/GLdispatch/vnd-glapi/mapi/glapi/gen/GL4x.xml | 757 src/GLdispatch/vnd-glapi/mapi/glapi/gen/Makefile.am | 285 src/GLdispatch/vnd-glapi/mapi/glapi/gen/NV_conditional_render.xml | 26 src/GLdispatch/vnd-glapi/mapi/glapi/gen/NV_primitive_restart.xml | 24 src/GLdispatch/vnd-glapi/mapi/glapi/gen/NV_texture_barrier.xml | 13 src/GLdispatch/vnd-glapi/mapi/glapi/gen/OES_EGL_image.xml | 22 src/GLdispatch/vnd-glapi/mapi/glapi/gen/OES_fixed_point.xml | 300 src/GLdispatch/vnd-glapi/mapi/glapi/gen/OES_single_precision.xml | 53 src/GLdispatch/vnd-glapi/mapi/glapi/gen/SConscript | 63 src/GLdispatch/vnd-glapi/mapi/glapi/gen/es_EXT.xml | 840 src/GLdispatch/vnd-glapi/mapi/glapi/gen/extension_helper.py | 324 src/GLdispatch/vnd-glapi/mapi/glapi/gen/glX_API.xml | 234 src/GLdispatch/vnd-glapi/mapi/glapi/gen/glX_XML.py | 570 src/GLdispatch/vnd-glapi/mapi/glapi/gen/glX_doc.py | 280 src/GLdispatch/vnd-glapi/mapi/glapi/gen/glX_proto_common.py | 95 src/GLdispatch/vnd-glapi/mapi/glapi/gen/glX_proto_recv.py | 555 src/GLdispatch/vnd-glapi/mapi/glapi/gen/glX_proto_send.py | 1122 src/GLdispatch/vnd-glapi/mapi/glapi/gen/glX_proto_size.py | 703 src/GLdispatch/vnd-glapi/mapi/glapi/gen/glX_server_table.py | 410 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_API.dtd | 146 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_API.xml |13005 ++++++++++ src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_SPARC_asm.py | 273 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_XML.py | 1078 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_and_es_API.xml | 328 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_and_glX_API.xml | 7 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_apitemp.py | 327 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_enums.py | 261 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_genexec.py | 219 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_gentable.py | 202 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_inittable.py | 198 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_offsets.py | 120 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_procs.py | 215 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_table.py | 238 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_x86-64_asm.py | 322 src/GLdispatch/vnd-glapi/mapi/glapi/gen/gl_x86_asm.py | 256 src/GLdispatch/vnd-glapi/mapi/glapi/gen/glapi_gen.mk | 57 src/GLdispatch/vnd-glapi/mapi/glapi/gen/license.py | 47 src/GLdispatch/vnd-glapi/mapi/glapi/gen/mesadef.py | 215 src/GLdispatch/vnd-glapi/mapi/glapi/gen/next_available_offset.sh | 39 src/GLdispatch/vnd-glapi/mapi/glapi/gen/remap_helper.py | 192 src/GLdispatch/vnd-glapi/mapi/glapi/gen/typeexpr.py | 292 src/GLdispatch/vnd-glapi/mapi/glapi/glapi.c | 75 src/GLdispatch/vnd-glapi/mapi/glapi/glapi.h | 216 src/GLdispatch/vnd-glapi/mapi/glapi/glapi_dispatch.c | 92 src/GLdispatch/vnd-glapi/mapi/glapi/glapi_entrypoint.c | 345 src/GLdispatch/vnd-glapi/mapi/glapi/glapi_getproc.c | 666 src/GLdispatch/vnd-glapi/mapi/glapi/glapi_nop.c | 121 src/GLdispatch/vnd-glapi/mapi/glapi/glapi_priv.h | 114 src/GLdispatch/vnd-glapi/mapi/glapi/glthread.c | 7 src/GLdispatch/vnd-glapi/mapi/glapi/glthread.h | 28 src/GLdispatch/vnd-glapi/mapi/glapi/tests/Makefile.am | 19 src/GLdispatch/vnd-glapi/mapi/glapi/tests/check_table.cpp | 1661 + src/GLdispatch/vnd-glapi/mapi/mapi.c | 190 src/GLdispatch/vnd-glapi/mapi/mapi.h | 65 src/GLdispatch/vnd-glapi/mapi/mapi_abi.py | 895 src/GLdispatch/vnd-glapi/mapi/mapi_glapi.c | 250 src/GLdispatch/vnd-glapi/mapi/mapi_tmp.h | 47 src/GLdispatch/vnd-glapi/mapi/shared-glapi/Makefile.am | 32 src/GLdispatch/vnd-glapi/mapi/shared-glapi/SConscript | 121 src/GLdispatch/vnd-glapi/mapi/shared-glapi/tests/Makefile.am | 18 src/GLdispatch/vnd-glapi/mapi/shared-glapi/tests/check_table.cpp | 471 src/GLdispatch/vnd-glapi/mapi/stub.c | 228 src/GLdispatch/vnd-glapi/mapi/stub.h | 59 src/GLdispatch/vnd-glapi/mapi/table.c | 55 src/GLdispatch/vnd-glapi/mapi/table.h | 71 src/GLdispatch/vnd-glapi/mapi/u_compiler.h | 33 src/GLdispatch/vnd-glapi/mapi/u_current.c | 330 src/GLdispatch/vnd-glapi/mapi/u_current.h | 106 src/GLdispatch/vnd-glapi/mapi/u_execmem.c | 145 src/GLdispatch/vnd-glapi/mapi/u_execmem.h | 7 src/GLdispatch/vnd-glapi/mapi/u_macros.h | 12 src/GLdispatch/vnd-glapi/mapi/u_thread.h | 287 src/GLdispatch/vnd-glapi/mapi/vgapi/Makefile.am | 61 src/GLdispatch/vnd-glapi/mapi/vgapi/SConscript | 61 src/GLdispatch/vnd-glapi/mapi/vgapi/vg.pc.in | 12 src/GLdispatch/vnd-glapi/mapi/vgapi/vgapi.csv | 93 src/GLdispatch/vnd-glapi/tests/Makefile.am | 18 src/GLdispatch/vnd-glapi/tests/check_table.cpp | 471 src/OpenGL/Makefile.am | 1 src/arch/x86-64/Makefile.am | 2 src/arch/x86/Makefile.am | 2 src/util/Makefile.am | 2 src/util/glvnd_pthread/Makefile.am | 2 src/util/trace/Makefile.am | 2 src/x11glvnd/Makefile.am | 5 tests/GLX_dummy/Makefile.am | 1 tests/Makefile.am | 4 tests/fini_test_env.sh | 2 tests/init_test_env.sh | 4 tests/testglxnscreens.sh | 2 tests/testglxnscrthreads.sh | 2 tests/testglxqueryversion.c | 1 tests/testx11glvndproto.sh | 2 316 files changed, 37739 insertions(+), 37707 deletions(-)
New commits: commit acb5f98231a994474c33f625af158e146133e395 Author: Brian Nguyen <[email protected]> Date: Fri Sep 27 03:42:24 2013 -0700 [tests] Replace SKIP_ENV_INIT with DO_X11_TESTS Instead of requiring a special environment variable to skip tests which require a special X11 environment, skip these tests by default and have users opt-in with the DO_X11_TESTS environment variable. Signed-off-by: Brian Nguyen <[email protected]> diff --git a/README.md b/README.md index 635bfc1..68c9184 100644 --- a/README.md +++ b/README.md @@ -54,9 +54,9 @@ There are a few good starting points for familiarizing oneself with the code: The tests/ directory contains several unit tests which verify that dispatching to different vendors actually works. Run `make check` to run these unit tests. -Note some of the unit tests require a special environment that can only be set -up if X is not currently running. To skip these tests (and environment -initialization/teardown), run `make check SKIP_ENV_INIT=1`. +Note some of the unit tests require a special X server configuration and +are skipped by default. To include these tests (and X server +initialization/teardown), run `make check DO_X11_TESTS=1`. Architecture ------------ diff --git a/tests/fini_test_env.sh b/tests/fini_test_env.sh index 1663557..e228681 100755 --- a/tests/fini_test_env.sh +++ b/tests/fini_test_env.sh @@ -1,6 +1,6 @@ #!/bin/sh -if [ -n "$SKIP_ENV_INIT" ]; then +if [ -z "$DO_X11_TESTS" ]; then echo "Test environment cleanup skipped" exit 77 fi diff --git a/tests/init_test_env.sh b/tests/init_test_env.sh index 1bfad9a..61d72cc 100755 --- a/tests/init_test_env.sh +++ b/tests/init_test_env.sh @@ -2,11 +2,11 @@ echo -n "Initializing test environment... " -if [ -n "$SKIP_ENV_INIT" ]; then +if [ -z "$DO_X11_TESTS" ]; then echo "skipped" exit 77 fi -echo "(set SKIP_ENV_INIT to disable this step)" +echo "(unset DO_X11_TESTS to disable this step)" X -config "$ABS_TOP_BUILDDIR/tests/xorg.2screens.conf" \ -modulepath "/usr/lib/xorg/modules/,$ABS_TOP_BUILDDIR/src/x11glvnd/.libs" \ diff --git a/tests/testglxnscreens.sh b/tests/testglxnscreens.sh index 551f9ea..4fae6ee 100755 --- a/tests/testglxnscreens.sh +++ b/tests/testglxnscreens.sh @@ -2,7 +2,7 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$TOP_BUILDDIR/tests/GLX_dummy/.libs -if [ -n "$SKIP_ENV_INIT" ]; then +if [ -z "$DO_X11_TESTS" ]; then echo "Skipping test; requires environment init" exit 77 fi diff --git a/tests/testglxnscrthreads.sh b/tests/testglxnscrthreads.sh index 9382d86..db7c0e6 100755 --- a/tests/testglxnscrthreads.sh +++ b/tests/testglxnscrthreads.sh @@ -5,7 +5,7 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$TOP_BUILDDIR/tests/GLX_dummy/.libs # We require pthreads be loaded before libGLX for correctness export LD_PRELOAD=libpthread.so.0 -if [ -n "$SKIP_ENV_INIT" ]; then +if [ -z "$DO_X11_TESTS" ]; then echo "Skipping test; requires environment init" exit 77 fi diff --git a/tests/testx11glvndproto.sh b/tests/testx11glvndproto.sh index 890d1b5..3804f6d 100755 --- a/tests/testx11glvndproto.sh +++ b/tests/testx11glvndproto.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [ -n "$SKIP_ENV_INIT" ]; then +if [ -z "$DO_X11_TESTS" ]; then echo "Skipping test; requires environment init" exit 77 fi commit c6dbd5782934ecf7aa6956a3cfd503aad67784ed Author: Aaron Plattner <[email protected]> Date: Thu Sep 26 22:32:02 2013 -0700 [build] add $(BUILT_SOURCES) to $(CLEANFILES) The 'distclean' target should completely cleans the build directory, so that $(builddir) contains only directories. This means that all built sources have to be included in CLEANFILES, or they're left behind. Signed-off-by: Aaron Plattner <[email protected]> Signed-off-by: Brian Nguyen <[email protected]> diff --git a/src/GL/Makefile.am b/src/GL/Makefile.am index 79f34c9..efbb404 100644 --- a/src/GL/Makefile.am +++ b/src/GL/Makefile.am @@ -32,6 +32,7 @@ libGL_la_SOURCES = \ glapitemp.h BUILT_SOURCES = glapitemp.h +CLEANFILES = $(BUILT_SOURCES) TOP = $(top_srcdir) GLAPI = $(top_srcdir)/$(MAPI_PREFIX)/glapi diff --git a/src/OpenGL/Makefile.am b/src/OpenGL/Makefile.am index 6a19df1..eafc864 100644 --- a/src/OpenGL/Makefile.am +++ b/src/OpenGL/Makefile.am @@ -32,6 +32,7 @@ libOpenGL_la_SOURCES = \ glapitemp.h BUILT_SOURCES = glapitemp.h +CLEANFILES = $(BUILT_SOURCES) TOP = $(top_srcdir) GLAPI = $(top_srcdir)/$(MAPI_PREFIX)/glapi diff --git a/src/arch/x86-64/Makefile.am b/src/arch/x86-64/Makefile.am index ad4c4c8..9b1023e 100644 --- a/src/arch/x86-64/Makefile.am +++ b/src/arch/x86-64/Makefile.am @@ -32,7 +32,7 @@ noinst_PROGRAMS = gen_matypes gen_matypes_SOURCES = ../x86/gen_matypes.c BUILT_SOURCES = matypes.h -CLEANFILES = matypes.h +CLEANFILES = $(BUILT_SOURCES) matypes.h: gen_matypes $(AM_V_GEN)./gen_matypes > $@ diff --git a/src/arch/x86/Makefile.am b/src/arch/x86/Makefile.am index 1343827..762abde 100644 --- a/src/arch/x86/Makefile.am +++ b/src/arch/x86/Makefile.am @@ -32,7 +32,7 @@ noinst_PROGRAMS = gen_matypes gen_matypes_SOURCES = gen_matypes.c BUILT_SOURCES = matypes.h -CLEANFILES = matypes.h +CLEANFILES = $(BUILT_SOURCES) matypes.h: gen_matypes $(AM_V_GEN)./gen_matypes > $@ commit 61360bc96133a38dcd4fc8d6753bba24369c6196 Author: Aaron Plattner <[email protected]> Date: Thu Sep 26 18:47:05 2013 -0700 [build] distribute files needed to build Everything needed to actually build the driver needs to be included in something that makes it end up in the distribution tarball. For headers, use noinst_HEADERS. For everything else, use EXTRA_DIST. Signed-off-by: Aaron Plattner <[email protected]> Signed-off-by: Brian Nguyen <[email protected]> diff --git a/Makefile.am b/Makefile.am index a459377..eb63ba5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1,2 @@ SUBDIRS = src tests +noinst_HEADERS = include diff --git a/src/GLX/Makefile.am b/src/GLX/Makefile.am index 729333f..46c215d 100644 --- a/src/GLX/Makefile.am +++ b/src/GLX/Makefile.am @@ -25,6 +25,16 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +noinst_HEADERS = \ + libglxabi.h \ + libglxabipriv.h \ + libglxcurrent.h \ + libglxgldispatch.h \ + libglxmapping.h \ + libglxnoop.h \ + libglxnoopdefs.h \ + libglxthread.h + lib_LTLIBRARIES = libGLX.la UTIL_DIR = ../util diff --git a/src/GLdispatch/Makefile.am b/src/GLdispatch/Makefile.am index d21341b..91671e0 100644 --- a/src/GLdispatch/Makefile.am +++ b/src/GLdispatch/Makefile.am @@ -25,6 +25,10 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +noinst_HEADERS = \ + GLdispatch.h \ + GLdispatchPrivate.h + lib_LTLIBRARIES = libGLdispatch.la SUBDIRS = vnd-glapi diff --git a/src/GLdispatch/vnd-glapi/Makefile.am b/src/GLdispatch/vnd-glapi/Makefile.am index 30a55b4..7140ae6 100644 --- a/src/GLdispatch/vnd-glapi/Makefile.am +++ b/src/GLdispatch/vnd-glapi/Makefile.am @@ -1,5 +1,7 @@ # Used by OpenGL vendor-neutral dispatch library +EXTRA_DIST = mapi + TOP = $(top_srcdir) GLAPI = $(top_srcdir)/$(MAPI_PREFIX)/glapi include $(srcdir)/mapi/Makefile.sources diff --git a/src/util/Makefile.am b/src/util/Makefile.am index cfdc4a7..febab5c 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -1 +1,3 @@ SUBDIRS = glvnd_pthread trace +noinst_HEADERS = utils_misc.h +EXTRA_DIST = uthash diff --git a/src/util/glvnd_pthread/Makefile.am b/src/util/glvnd_pthread/Makefile.am index 2c88ef4..5a778f3 100644 --- a/src/util/glvnd_pthread/Makefile.am +++ b/src/util/glvnd_pthread/Makefile.am @@ -27,6 +27,8 @@ # libglvnd_pthread.la: Convenience library for wrapping pthreads +noinst_HEADERS = glvnd_pthread.h + noinst_LTLIBRARIES = libglvnd_pthread.la libglvnd_pthread_la_LIBADD = -ldl diff --git a/src/util/trace/Makefile.am b/src/util/trace/Makefile.am index da36033..dabc9f1 100644 --- a/src/util/trace/Makefile.am +++ b/src/util/trace/Makefile.am @@ -27,6 +27,8 @@ # libtrace.la: convenience library for API library tracing routines +noinst_HEADERS = trace.h + noinst_LTLIBRARIES = libtrace.la libtrace_la_LIBADD = $(PTHREAD_LIBS) diff --git a/src/x11glvnd/Makefile.am b/src/x11glvnd/Makefile.am index 4056d30..b57577c 100644 --- a/src/x11glvnd/Makefile.am +++ b/src/x11glvnd/Makefile.am @@ -25,6 +25,11 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +noinst_HEADERS = \ + x11glvnd.h \ + x11glvndproto.h \ + x11glvndserver.h + noinst_LTLIBRARIES = libx11glvnd_client.la INCLUDES = \ diff --git a/tests/GLX_dummy/Makefile.am b/tests/GLX_dummy/Makefile.am index 7c93899..7588df1 100644 --- a/tests/GLX_dummy/Makefile.am +++ b/tests/GLX_dummy/Makefile.am @@ -1,3 +1,4 @@ +noinst_HEADERS = GLX_dummy.h lib_LTLIBRARIES = libGLX_dummy.la check-local: libGLX_dummy_copy diff --git a/tests/Makefile.am b/tests/Makefile.am index ba6c9cf..190a1a9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -28,6 +28,8 @@ SUBDIRS = \ GLX_dummy +noinst_HEADERS = test_utils.h + TESTS_ENVIRONMENT = \ TOP_BUILDDIR=$(top_builddir) \ ABS_TOP_BUILDDIR=$(abs_top_builddir) \ @@ -48,6 +50,8 @@ TESTS = \ testglxnscrthreads.sh \ fini_test_env.sh +EXTRA_DIST = $(TESTS) + check_PROGRAMS = \ testglxgetprocaddress \ testglxmakecurrent \ commit c552b7173cd6ff00d49719e73cfef4c4b18fdb5a Author: Aaron Plattner <[email protected]> Date: Thu Sep 26 20:08:04 2013 -0700 [build] make mapi a subdirectory of vnd-glapi Currently, the GLdispatch makefile recurses into the mapi/vnd-glapi subdirectory, which then uses files out of its parent directory. This makes it difficult to include the mapi directory in the dist tarball because just including it in EXTRA_DIST makes it pick up the generated Makefile in addition to the checked-in source files. Instead, exchange the two directories so that mapi is a subdirectory of vnd-glapi and the former is included wholesale with EXTRA_DIST. Signed-off-by: Aaron Plattner <[email protected]> Signed-off-by: Brian Nguyen <[email protected]> diff --git a/configure.ac b/configure.ac index dbcc7a2..1a269e9 100644 --- a/configure.ac +++ b/configure.ac @@ -111,7 +111,7 @@ dnl dnl mapi top-relative paths: defined here so mapi can be used elsewhere dnl -AC_SUBST([MAPI_PREFIX], [src/GLdispatch/mapi]) +AC_SUBST([MAPI_PREFIX], [src/GLdispatch/vnd-glapi/mapi]) AC_SUBST([MAPI_MESA_PREFIX], [src/GLdispatch/mesa]) AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1) @@ -168,7 +168,7 @@ AC_CONFIG_FILES([Makefile src/GLX/Makefile src/x11glvnd/Makefile src/GLdispatch/Makefile - src/GLdispatch/mapi/vnd-glapi/Makefile + src/GLdispatch/vnd-glapi/Makefile src/util/Makefile src/util/glvnd_pthread/Makefile src/util/trace/Makefile diff --git a/src/GLdispatch/Makefile.am b/src/GLdispatch/Makefile.am index 2df9484..d21341b 100644 --- a/src/GLdispatch/Makefile.am +++ b/src/GLdispatch/Makefile.am @@ -27,12 +27,12 @@ lib_LTLIBRARIES = libGLdispatch.la -SUBDIRS = mapi/vnd-glapi +SUBDIRS = vnd-glapi -libGLdispatch_la_CFLAGS = -I$(srcdir)/mapi/glapi +libGLdispatch_la_CFLAGS = -I$(srcdir)/vnd-glapi/mapi/glapi libGLdispatch_la_CFLAGS += -I$(top_srcdir)/src/util/trace libGLdispatch_la_CFLAGS += -I$(top_srcdir)/src/util/glvnd_pthread -libGLdispatch_la_CFLAGS += -I$(srcdir)/mapi +libGLdispatch_la_CFLAGS += -I$(srcdir)/vnd-glapi/mapi libGLdispatch_la_CFLAGS += -I$(top_srcdir)/include libGLdispatch_la_LDFLAGS = -shared @@ -40,5 +40,5 @@ libGLdispatch_la_LDFLAGS = -shared libGLdispatch_la_SOURCES = \ GLdispatch.c -libGLdispatch_la_LIBADD = mapi/vnd-glapi/libglapi.la +libGLdispatch_la_LIBADD = vnd-glapi/libglapi.la libGLdispatch_la_LIBADD += ../util/trace/libtrace.la diff --git a/src/GLdispatch/mapi/Android.mk b/src/GLdispatch/mapi/Android.mk deleted file mode 100644 index f104378..0000000 --- a/src/GLdispatch/mapi/Android.mk +++ /dev/null @@ -1,78 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu <[email protected]> -# Copyright (C) 2010-2011 LunarG Inc. -# -# 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 restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or 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 PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN 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. - -# Android.mk for glapi - -LOCAL_PATH := $(call my-dir) - -mapi_abi_headers := - -# --------------------------------------- -# Build libglapi -# --------------------------------------- - -include $(CLEAR_VARS) - -abi_header := shared-glapi/glapi_mapi_tmp.h - -LOCAL_SRC_FILES := \ - entry.c \ - mapi_glapi.c \ - stub.c \ - table.c \ - u_current.c \ - u_execmem.c - -LOCAL_CFLAGS := \ - -DMAPI_MODE_GLAPI \ - -DMAPI_ABI_HEADER=\"$(abi_header)\" - -LOCAL_C_INCLUDES := \ - $(MESA_TOP)/src/mapi - -LOCAL_MODULE := libglapi - -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -intermediates := $(call local-intermediates-dir) -abi_header := $(intermediates)/$(abi_header) -LOCAL_GENERATED_SOURCES := $(abi_header) - -$(abi_header): PRIVATE_PRINTER := shared-glapi - -mapi_abi_headers += $(abi_header) - -include $(MESA_COMMON_MK) -include $(BUILD_SHARED_LIBRARY) - - -mapi_abi_deps := \ - $(wildcard $(LOCAL_PATH)/glapi/gen/*.py) \ - $(wildcard $(LOCAL_PATH)/glapi/gen/*.xml) \ - $(LOCAL_PATH)/mapi_abi.py - -$(mapi_abi_headers): PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/mapi_abi.py -$(mapi_abi_headers): PRIVATE_APIXML := $(LOCAL_PATH)/glapi/gen/gl_and_es_API.xml -$(mapi_abi_headers): $(mapi_abi_deps) - @mkdir -p $(dir $@) - @echo "target $(PRIVATE_PRINTER): $(PRIVATE_MODULE) <= $(PRIVATE_APIXML)" - $(hide) $(PRIVATE_SCRIPT) --printer $(PRIVATE_PRINTER) --mode lib $(PRIVATE_APIXML) > $@ diff --git a/src/GLdispatch/mapi/Makefile.am b/src/GLdispatch/mapi/Makefile.am deleted file mode 100644 index 96e85fc..0000000 --- a/src/GLdispatch/mapi/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright © 2013 Intel Corporation -# -# 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 restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or 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 (including the next -# paragraph) 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 PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN 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. - -SUBDIRS = glapi/gen - -if HAVE_VND_GLAPI -SUBDIRS += vnd-glapi -endif - -if HAVE_SHARED_GLAPI -SUBDIRS += shared-glapi -endif - -if HAVE_OPENGL -SUBDIRS += glapi -endif - -if HAVE_OPENGL_ES1 -SUBDIRS += es1api -endif - -if HAVE_OPENGL_ES2 -SUBDIRS += es2api -endif - -if HAVE_OPENVG -SUBDIRS += vgapi -endif diff --git a/src/GLdispatch/mapi/Makefile.sources b/src/GLdispatch/mapi/Makefile.sources deleted file mode 100644 index ecf3166..0000000 --- a/src/GLdispatch/mapi/Makefile.sources +++ /dev/null @@ -1,36 +0,0 @@ -# mapi/Makefile.sources -# -# mapi may be used in several ways -# -# - In default mode, mapi implements the interface defined by mapi.h. To use -# this mode, compile MAPI_FILES. -# -# - In util mode, mapi provides utility functions for use with glapi. To use -# this mode, compile MAPI_UTIL_FILES with MAPI_MODE_UTIL defined. -# -# - In glapi mode, mapi implements the interface defined by glapi.h. To use -# this mode, compile MAPI_GLAPI_FILES with MAPI_MODE_GLAPI defined. -# -# - In bridge mode, mapi provides entry points calling into glapi. To use -# this mode, compile MAPI_BRIDGE_FILES with MAPI_MODE_BRIDGE defined. - -MAPI_UTIL_FILES = \ - $(TOP)/$(MAPI_PREFIX)/u_current.c \ - $(TOP)/$(MAPI_PREFIX)/u_execmem.c - -MAPI_FILES = \ - $(TOP)/$(MAPI_PREFIX)/entry.c \ - $(TOP)/$(MAPI_PREFIX)/mapi.c \ - $(TOP)/$(MAPI_PREFIX)/stub.c \ - $(TOP)/$(MAPI_PREFIX)/table.c \ - $(MAPI_UTIL_FILES) - -MAPI_GLAPI_FILES = \ - $(TOP)/$(MAPI_PREFIX)/entry.c \ - $(TOP)/$(MAPI_PREFIX)/mapi_glapi.c \ - $(TOP)/$(MAPI_PREFIX)/stub.c \ - $(TOP)/$(MAPI_PREFIX)/table.c \ - $(MAPI_UTIL_FILES) - -MAPI_BRIDGE_FILES = \ - $(TOP)/$(MAPI_PREFIX)/entry.c diff --git a/src/GLdispatch/mapi/entry.c b/src/GLdispatch/mapi/entry.c deleted file mode 100644 index a57661e..0000000 --- a/src/GLdispatch/mapi/entry.c +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Mesa 3-D graphics library - * - * Copyright (C) 2010 LunarG Inc. - * - * 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 restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or 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 PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN 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. - * - * Authors: - * Chia-I Wu <[email protected]> - */ - -#include "entry.h" -#include "u_current.h" -#include "u_macros.h" - -/* define macros for use by assembly dispatchers */ -#define ENTRY_CURRENT_TABLE U_STRINGIFY(u_current) - -/* in bridge mode, mapi is a user of glapi */ -#ifdef MAPI_MODE_BRIDGE -#define ENTRY_CURRENT_TABLE_GET "_glapi_get_dispatch" -#else -#define ENTRY_CURRENT_TABLE_GET U_STRINGIFY(u_current_get_internal) -#endif - -#if defined(USE_X86_ASM) && defined(__GNUC__) -# ifdef GLX_USE_TLS -# include "entry_x86_tls.h" -# else -# include "entry_x86_tsd.h" -# endif -#elif defined(USE_X86_64_ASM) && defined(__GNUC__) && defined(GLX_USE_TLS) -# include "entry_x86-64_tls.h" -#else - -#include <stdlib.h> - -static INLINE const struct mapi_table * -entry_current_get(void) -{ -#ifdef MAPI_MODE_BRIDGE - return GET_DISPATCH(); -#else - return u_current_get(); -#endif -} - -/* C version of the public entries */ -#define MAPI_TMP_DEFINES -#define MAPI_TMP_PUBLIC_DECLARES -#define MAPI_TMP_PUBLIC_ENTRIES -#include "mapi_tmp.h" - -#ifndef MAPI_MODE_BRIDGE - -void -entry_patch_public(void) -{ -} - -mapi_func -entry_get_public(int slot) -{ - /* pubic_entries are defined by MAPI_TMP_PUBLIC_ENTRIES */ - return public_entries[slot]; -} - -mapi_func -entry_generate(int slot) -{ - return NULL; -} - -void -entry_patch(mapi_func entry, int slot) -{ -} - -#endif /* MAPI_MODE_BRIDGE */ - -#endif /* asm */ diff --git a/src/GLdispatch/mapi/entry.h b/src/GLdispatch/mapi/entry.h deleted file mode 100644 index dba1c06..0000000 --- a/src/GLdispatch/mapi/entry.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Mesa 3-D graphics library - * - * Copyright (C) 2010 LunarG Inc. - * - * 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 restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or 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. - * -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
