Merge branch 'master' into instanced-arrays

[mesa.git] / src / mesa / drivers / windows / gdi / mesa.def

diff --git a/src/mesa/drivers/windows/gdi/mesa.def b/src/mesa/drivers/windows/gdi/mesa.def
index c525945426fa6e8f71d8c69097adfb034be3c3f0..62f75d9541ff429a68554e57267ca87bb695d178 100644 (file)
--- a/src/mesa/drivers/windows/gdi/mesa.def
+++ b/src/mesa/drivers/windows/gdi/mesa.def
@@ -867,34 +867,22 @@ EXPORTS
        _glapi_get_proc_address
        _mesa_add_soft_renderbuffers
        _mesa_add_renderbuffer
-       _mesa_attach_shader
-       _mesa_bind_attrib_location
-       _mesa_buffer_data
-       _mesa_buffer_get_subdata
-       _mesa_buffer_map
-       _mesa_buffer_subdata
-       _mesa_buffer_unmap
        _mesa_bzero
        _mesa_calloc
        _mesa_choose_tex_format
-       _mesa_compile_shader
        _mesa_compressed_texture_size
        _mesa_create_framebuffer
-       _mesa_create_program
-       _mesa_create_shader
        _mesa_create_visual
        _mesa_delete_array_object
-       _mesa_delete_buffer_object
        _mesa_delete_program
-       _mesa_delete_program2
-       _mesa_delete_shader
        _mesa_delete_texture_object
        _mesa_destroy_framebuffer
        _mesa_destroy_visual
-       _mesa_detach_shader
        _mesa_enable_1_3_extensions
        _mesa_enable_1_4_extensions
        _mesa_enable_1_5_extensions
+       _mesa_enable_2_0_extensions
+       _mesa_enable_2_1_extensions
        _mesa_enable_sw_extensions
        _mesa_error
        _mesa_finish_render_texture
@@ -902,36 +890,20 @@ EXPORTS
        _mesa_free
        _mesa_free_context_data
        _mesa_free_texture_image_data
-       _mesa_get_active_attrib
-       _mesa_get_active_uniform 
-       _mesa_get_attached_shaders
-       _mesa_get_attrib_location
+       _mesa_generate_mipmap
        _mesa_get_compressed_teximage
        _mesa_get_current_context
-       _mesa_get_handle
-       _mesa_get_programiv
-       _mesa_get_program_info_log
-       _mesa_get_program_register
-       _mesa_get_shaderiv
-       _mesa_get_shader_info_log
-       _mesa_get_shader_source
        _mesa_get_teximage
-       _mesa_get_uniformfv
-       _mesa_get_uniform_location
        _mesa_init_driver_functions
+       _mesa_init_glsl_driver_functions
        _mesa_init_renderbuffer
        _mesa_initialize_context
-       _mesa_is_program
-       _mesa_is_shader
-       _mesa_link_program
        _mesa_make_current
        _mesa_memcpy
        _mesa_memset
        _mesa_new_array_object
-       _mesa_new_buffer_object
        _mesa_new_framebuffer
        _mesa_new_program
-       _mesa_new_query_object
        _mesa_new_renderbuffer
        _mesa_new_soft_renderbuffer
        _mesa_new_texture_image
@@ -942,7 +914,6 @@ EXPORTS
        _mesa_render_texture
        _mesa_ResizeBuffersMESA
        _mesa_resize_framebuffer
-       _mesa_shader_source
        _mesa_store_compressed_teximage1d
        _mesa_store_compressed_teximage2d
        _mesa_store_compressed_teximage3d
@@ -957,13 +928,20 @@ EXPORTS
        _mesa_store_texsubimage3d
        _mesa_strcmp
        _mesa_test_proxy_teximage
-       _mesa_uniform
-       _mesa_uniform_matrix
-       _mesa_unreference_framebuffer
+       _mesa_reference_framebuffer
        _mesa_update_framebuffer_visual
        _mesa_use_program
-       _mesa_validate_program
        _mesa_Viewport
+       _mesa_meta_CopyColorSubTable
+       _mesa_meta_CopyColorTable
+       _mesa_meta_CopyConvolutionFilter1D
+       _mesa_meta_CopyConvolutionFilter2D
+       _mesa_meta_CopyTexImage1D
+       _mesa_meta_CopyTexImage2D
+       _mesa_meta_CopyTexSubImage1D
+       _mesa_meta_CopyTexSubImage2D
+       _mesa_meta_CopyTexSubImage3D
+       _mesa_wait_query
        _swrast_Accum
        _swrast_Bitmap
        _swrast_BlitFramebuffer
@@ -973,15 +951,6 @@ EXPORTS
        _swrast_Clear
        _swrast_choose_line
        _swrast_choose_triangle
-       _swrast_CopyColorSubTable
-       _swrast_CopyColorTable
-       _swrast_CopyConvolutionFilter1D
-       _swrast_CopyConvolutionFilter2D
-       _swrast_copy_teximage1d
-       _swrast_copy_teximage2d
-       _swrast_copy_texsubimage1d
-       _swrast_copy_texsubimage2d
-       _swrast_copy_texsubimage3d
        _swrast_CreateContext
        _swrast_DestroyContext
        _swrast_exec_fragment_program
@@ -996,3 +965,4 @@ EXPORTS
        _tnl_InvalidateState
        _tnl_run_pipeline
        _tnl_program_string
+       _tnl_RasterPos
\ No newline at end of file