diff options
| -rw-r--r-- | xorg-server/hw/xwin/glx/gl.spec | 556 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/glx/wglext.h | 34 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/glx/wglext.spec | 63 |
3 files changed, 640 insertions, 13 deletions
diff --git a/xorg-server/hw/xwin/glx/gl.spec b/xorg-server/hw/xwin/glx/gl.spec index 86a6064e7..4c9fddab1 100644 --- a/xorg-server/hw/xwin/glx/gl.spec +++ b/xorg-server/hw/xwin/glx/gl.spec @@ -7,7 +7,7 @@ # This document is licensed under the SGI Free Software B License Version # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . # -# $Revision: 13168 $ on $Date: 2010-12-09 02:18:26 -0800 (Thu, 09 Dec 2010) $ +# $Revision: 15267 $ on $Date: 2011-08-08 00:37:03 -0700 (Mon, 08 Aug 2011) $ required-props: # Description of a parameter @@ -21,7 +21,7 @@ vectorequiv: * # Category this function falls in. While there are many categories for # early GL 1.0 functions, later functions just have a core version # (e.g. VERSION_major_minor) or extension name for the category. -category: display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform VERSION_1_0 VERSION_1_0_DEPRECATED VERSION_1_1 VERSION_1_1_DEPRECATED VERSION_1_2 VERSION_1_2_DEPRECATED VERSION_1_3 VERSION_1_3_DEPRECATED VERSION_1_4 VERSION_1_4_DEPRECATED VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_0_DEPRECATED VERSION_3_1 VERSION_3_2 VERSION_3_3 VERSION_4_0 VERSION_4_1 VERSION_4_1_DEPRECATED ATI_element_array ATI_envmap_bumpmap ATI_fragment_shader ATI_pn_triangles ATI_vertex_array_object ATI_vertex_streams EXT_blend_color EXT_blend_minmax EXT_convolution EXT_copy_texture EXT_histogram EXT_polygon_offset EXT_subtexture EXT_texture3D EXT_texture_object EXT_vertex_array EXT_vertex_shader SGIS_detail_texture SGIS_multisample SGIS_pixel_texture ARB_point_parameters EXT_point_parameters SGIS_point_parameters SGIS_sharpen_texture SGIS_texture4D SGIS_texture_filter4 SGIX_async SGIX_flush_raster SGIX_fragment_lighting SGIX_framezoom SGIX_igloo_interface SGIX_instruments SGIX_list_priority SGIX_pixel_texture SGIX_polynomial_ffd SGIX_reference_plane SGIX_sprite SGIX_tag_sample_buffer SGI_color_table ARB_multitexture ARB_multisample ARB_texture_compression ARB_transpose_matrix ARB_vertex_blend ARB_matrix_palette EXT_compiled_vertex_array EXT_cull_vertex EXT_index_func EXT_index_material EXT_draw_range_elements EXT_vertex_weighting INGR_blend_func_separate NV_evaluators NV_fence NV_occlusion_query NV_point_sprite NV_register_combiners NV_register_combiners2 NV_vertex_array_range NV_vertex_program NV_vertex_program1_1_dcc MESA_resize_buffers MESA_window_pos PGI_misc_hints EXT_fog_coord EXT_blend_func_separate EXT_color_subtable EXT_coordinate_frame EXT_light_texture EXT_multi_draw_arrays EXT_paletted_texture EXT_pixel_transform EXT_secondary_color EXT_texture_perturb_normal HP_image_transform IBM_multimode_draw_arrays IBM_vertex_array_lists INTEL_parallel_arrays SUNX_constant_data SUN_global_alpha SUN_mesh_array SUN_triangle_list SUN_vertex 3DFX_tbuffer EXT_multisample SGIS_fog_function SGIS_texture_color_mask ARB_window_pos EXT_stencil_two_side EXT_depth_bounds_test EXT_blend_equation_separate ARB_vertex_program ARB_fragment_program ARB_vertex_buffer_object ARB_occlusion_query ARB_shader_objects ARB_vertex_shader ARB_fragment_shader S3_s3tc ATI_draw_buffers ATI_texture_env_combine3 ATI_texture_float NV_float_buffer NV_fragment_program NV_half_float NV_pixel_data_range NV_primitive_restart NV_texture_expand_normal NV_texture_expand_normal NV_vertex_program2 APPLE_element_array APPLE_fence APPLE_vertex_array_object APPLE_vertex_array_range ATI_draw_buffers NV_fragment_program NV_half_float NV_pixel_data_range NV_primitive_restart ATI_map_object_buffer ATI_separate_stencil ATI_vertex_attrib_array_object ARB_draw_buffers ARB_texture_rectangle ARB_color_buffer_float EXT_framebuffer_object GREMEDY_string_marker EXT_stencil_clear_tag EXT_framebuffer_blit EXT_framebuffer_multisample MESAX_texture_stack EXT_timer_query EXT_gpu_program_parameters APPLE_flush_buffer_range NV_gpu_program4 NV_geometry_program4 EXT_geometry_shader4 NV_vertex_program4 EXT_gpu_shader4 EXT_draw_instanced EXT_texture_buffer_object NV_depth_buffer_float NV_framebuffer_multisample_coverage NV_parameter_buffer_object EXT_draw_buffers2 NV_transform_feedback EXT_bindable_uniform EXT_texture_integer GREMEDY_frame_terminator NV_conditional_render NV_present_video EXT_transform_feedback ARB_depth_buffer_float ARB_draw_instanced ARB_framebuffer_object ARB_framebuffer_sRGB ARB_geometry_shader4 ARB_half_float_vertex ARB_instanced_arrays ARB_map_buffer_range ARB_texture_buffer_object ARB_texture_compression_rgtc ARB_texture_rg ARB_vertex_array_object EXT_direct_state_access EXT_vertex_array_bgra EXT_texture_swizzle NV_explicit_multisample NV_transform_feedback2 ATI_meminfo AMD_performance_monitor AMD_vertex_shader_tesselator EXT_provoking_vertex ARB_uniform_buffer_object ARB_copy_buffer EXT_texture_snorm AMD_draw_buffers_blend APPLE_texture_range APPLE_float_pixels APPLE_vertex_program_evaluators APPLE_aux_depth_stencil APPLE_object_purgeable APPLE_row_bytes ARB_draw_elements_base_vertex ARB_provoking_vertex ARB_sync ARB_texture_multisample ARB_draw_buffers_blend ARB_sample_shading NV_video_capture NV_copy_image EXT_separate_shader_objects NV_parameter_buffer_object2 NV_shader_buffer_load NV_vertex_buffer_unified_memory NV_texture_barrier ARB_shading_language_include ARB_blend_func_extended ARB_sampler_objects ARB_timer_query ARB_vertex_type_2_10_10_10_rev ARB_draw_indirect ARB_gpu_shader_fp64 ARB_shader_subroutine ARB_tessellation_shader ARB_transform_feedback2 ARB_transform_feedback3 AMD_conservative_depth NV_vdpau_interop ARB_ES2_compatibility ARB_get_program_binary ARB_separate_shader_objects ARB_vertex_attrib_64bit ARB_viewport_array ARB_cl_event ARB_debug_output ARB_robustness EXT_shader_image_load_store EXT_vertex_attrib_64bit NV_gpu_shader5 NV_vertex_attrib_integer_64bit AMD_name_gen_delete AMD_debug_output NV_vdpau_interop NV_gpu_program5 +category: display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform VERSION_1_0 VERSION_1_0_DEPRECATED VERSION_1_1 VERSION_1_1_DEPRECATED VERSION_1_2 VERSION_1_2_DEPRECATED VERSION_1_3 VERSION_1_3_DEPRECATED VERSION_1_4 VERSION_1_4_DEPRECATED VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_0_DEPRECATED VERSION_3_1 VERSION_3_2 VERSION_3_3 VERSION_4_0 VERSION_4_1 VERSION_4_1_DEPRECATED ATI_element_array ATI_envmap_bumpmap ATI_fragment_shader ATI_pn_triangles ATI_vertex_array_object ATI_vertex_streams EXT_blend_color EXT_blend_minmax EXT_convolution EXT_copy_texture EXT_histogram EXT_polygon_offset EXT_subtexture EXT_texture3D EXT_texture_object EXT_vertex_array EXT_vertex_shader SGIS_detail_texture SGIS_multisample SGIS_pixel_texture ARB_point_parameters EXT_point_parameters SGIS_point_parameters SGIS_sharpen_texture SGIS_texture4D SGIS_texture_filter4 SGIX_async SGIX_flush_raster SGIX_fragment_lighting SGIX_framezoom SGIX_igloo_interface SGIX_instruments SGIX_list_priority SGIX_pixel_texture SGIX_polynomial_ffd SGIX_reference_plane SGIX_sprite SGIX_tag_sample_buffer SGI_color_table ARB_multitexture ARB_multisample ARB_texture_compression ARB_transpose_matrix ARB_vertex_blend ARB_matrix_palette EXT_compiled_vertex_array EXT_cull_vertex EXT_index_func EXT_index_material EXT_draw_range_elements EXT_vertex_weighting INGR_blend_func_separate NV_evaluators NV_fence NV_occlusion_query NV_point_sprite NV_register_combiners NV_register_combiners2 NV_vertex_array_range NV_vertex_program NV_vertex_program1_1_dcc MESA_resize_buffers MESA_window_pos PGI_misc_hints EXT_fog_coord EXT_blend_func_separate EXT_color_subtable EXT_coordinate_frame EXT_light_texture EXT_multi_draw_arrays EXT_paletted_texture EXT_pixel_transform EXT_secondary_color EXT_texture_perturb_normal HP_image_transform IBM_multimode_draw_arrays IBM_vertex_array_lists INTEL_parallel_arrays SUNX_constant_data SUN_global_alpha SUN_mesh_array SUN_triangle_list SUN_vertex 3DFX_tbuffer EXT_multisample SGIS_fog_function SGIS_texture_color_mask ARB_window_pos EXT_stencil_two_side EXT_depth_bounds_test EXT_blend_equation_separate ARB_vertex_program ARB_fragment_program ARB_vertex_buffer_object ARB_occlusion_query ARB_shader_objects ARB_vertex_shader ARB_fragment_shader S3_s3tc ATI_draw_buffers ATI_texture_env_combine3 ATI_texture_float NV_float_buffer NV_fragment_program NV_half_float NV_pixel_data_range NV_primitive_restart NV_texture_expand_normal NV_texture_expand_normal NV_vertex_program2 APPLE_element_array APPLE_fence APPLE_vertex_array_object APPLE_vertex_array_range ATI_draw_buffers NV_fragment_program NV_half_float NV_pixel_data_range NV_primitive_restart ATI_map_object_buffer ATI_separate_stencil ATI_vertex_attrib_array_object ARB_draw_buffers ARB_texture_rectangle ARB_color_buffer_float EXT_framebuffer_object GREMEDY_string_marker EXT_stencil_clear_tag EXT_framebuffer_blit EXT_framebuffer_multisample MESAX_texture_stack EXT_timer_query EXT_gpu_program_parameters APPLE_flush_buffer_range NV_gpu_program4 NV_geometry_program4 EXT_geometry_shader4 NV_vertex_program4 EXT_gpu_shader4 EXT_draw_instanced EXT_texture_buffer_object NV_depth_buffer_float NV_framebuffer_multisample_coverage NV_parameter_buffer_object EXT_draw_buffers2 NV_transform_feedback EXT_bindable_uniform EXT_texture_integer GREMEDY_frame_terminator NV_conditional_render NV_present_video EXT_transform_feedback ARB_depth_buffer_float ARB_draw_instanced ARB_framebuffer_object ARB_framebuffer_sRGB ARB_geometry_shader4 ARB_half_float_vertex ARB_instanced_arrays ARB_map_buffer_range ARB_texture_buffer_object ARB_texture_compression_rgtc ARB_texture_rg ARB_vertex_array_object EXT_direct_state_access EXT_vertex_array_bgra EXT_texture_swizzle NV_explicit_multisample NV_transform_feedback2 ATI_meminfo AMD_performance_monitor AMD_vertex_shader_tesselator EXT_provoking_vertex ARB_uniform_buffer_object ARB_copy_buffer EXT_texture_snorm AMD_draw_buffers_blend APPLE_texture_range APPLE_float_pixels APPLE_vertex_program_evaluators APPLE_aux_depth_stencil APPLE_object_purgeable APPLE_row_bytes ARB_draw_elements_base_vertex ARB_provoking_vertex ARB_sync ARB_texture_multisample ARB_draw_buffers_blend ARB_sample_shading NV_video_capture NV_copy_image EXT_separate_shader_objects NV_parameter_buffer_object2 NV_shader_buffer_load NV_vertex_buffer_unified_memory NV_texture_barrier ARB_shading_language_include ARB_blend_func_extended ARB_sampler_objects ARB_timer_query ARB_vertex_type_2_10_10_10_rev ARB_draw_indirect ARB_gpu_shader_fp64 ARB_shader_subroutine ARB_tessellation_shader ARB_transform_feedback2 ARB_transform_feedback3 AMD_conservative_depth NV_vdpau_interop ARB_ES2_compatibility ARB_get_program_binary ARB_separate_shader_objects ARB_vertex_attrib_64bit ARB_viewport_array ARB_cl_event ARB_debug_output ARB_robustness EXT_shader_image_load_store EXT_vertex_attrib_64bit NV_gpu_shader5 NV_vertex_attrib_integer_64bit AMD_name_gen_delete AMD_debug_output NV_vdpau_interop NV_gpu_program5 NV_texture_multisample AMD_sample_positions EXT_x11_sync_object AMD_multi_draw_indirect ARB_base_instance ARB_transform_feedback_instanced ARB_internalformat_query ARB_shader_atomic_counters ARB_shader_image_load_store ARB_texture_storage commands # Categories for extensions with no functions - need not be included now # ARB_texture_env_add ARB_texture_cube_map ARB_texture_border_clamp @@ -59,12 +59,15 @@ category: display-list drawing drawing-control feedback framebuf misc modeling p # NV_fragment_program4 EXT_framebuffer_sRGB NV_geometry_shader4 # EXT_vertex_array_bgra ARB_depth_clamp ARB_fragment_coord_conventions # ARB_seamless_cube_map ARB_vertex_array_bgra ARB_texture_cube_map_array -# ARB_texture_gather ARB_texture_query_lod -# AMD_shader_stencil_export AMD_seamless_cubemap_per_texture +# ARB_texture_gather ARB_texture_query_lod AMD_shader_stencil_export +# AMD_seamless_cubemap_per_texture AMD_blend_minmax_factor +# ARB_shading_language_420pack ARB_compressed_texture_pixel_storage +# ARB_conservative_depth ARB_map_buffer_alignment +# ARB_shading_language_packing # Core version in which a function was introduced, or against # which an extension can be implemented -version: 1.0 1.1 1.2 1.3 1.4 1.5 2.0 2.1 3.0 3.1 3.2 3.3 4.0 4.1 +version: 1.0 1.1 1.2 1.3 1.4 1.5 2.0 2.1 3.0 3.1 3.2 3.3 4.0 4.1 4.2 # Core version in which a function was removed deprecated: 3.1 # GLX Single, Rendering, or Vendor Private opcode @@ -7919,7 +7922,7 @@ passthru: /* ARB_vertex_type_2_10_10_10_rev */ ############################################################################### ############################################################################### -# New commands in OpenGL 4.0 - none +# New commands in OpenGL 4.0 # OpenGL 4.0 (ARB_sample_shading) commands @@ -8009,7 +8012,7 @@ passthru: /* ARB_transform_feedback3 */ # New commands in OpenGL 4.1 - none newcategory: VERSION_4_1 -passthru: /* OpenGL 4.1 also reuses entry points from these extensions: */ +passthru: /* OpenGL 4.1 reuses entry points from these extensions: */ passthru: /* ARB_ES2_compatibility */ passthru: /* ARB_get_program_binary */ passthru: /* ARB_separate_shader_objects */ @@ -8021,6 +8024,31 @@ passthru: /* ARB_viewport_array */ ############################################################################### ############################################################################### # +# OpenGL 4.2 commands +# +############################################################################### +############################################################################### + +# New commands in OpenGL 4.2 - none +newcategory: VERSION_4_2 + +passthru: /* OpenGL 4.2 reuses entry points from these extensions: */ +passthru: /* ARB_base_instance */ +passthru: /* ARB_shading_language_420pack (no entry points) */ +passthru: /* ARB_transform_feedback_instanced */ +passthru: /* ARB_compressed_texture_pixel_storage (no entry points) */ +passthru: /* ARB_conservative_depth (no entry points) */ +passthru: /* ARB_internalformat_query */ +passthru: /* ARB_map_buffer_alignment (no entry points) */ +passthru: /* ARB_shader_atomic_counters */ +passthru: /* ARB_shader_image_load_store */ +passthru: /* ARB_shading_language_packing (no entry points) */ +passthru: /* ARB_texture_storage */ + + +############################################################################### +############################################################################### +# # ARB extensions, in order by ARB extension number # ############################################################################### @@ -12013,7 +12041,7 @@ GetSamplerParameterIuiv(sampler, pname, params) ############################################################################### # (none) -newcategroy: ARB_shader_bit_encoding +newcategory: ARB_shader_bit_encoding ############################################################################### # @@ -14671,6 +14699,310 @@ GetnUniformdvARB(program, location, bufSize, params) # (none) newcategory: ARB_shader_stencil_export +############################################################################### +# +# ARB Extension #107 +# ARB_base_instance commands +# +############################################################################### + +DrawArraysInstancedBaseInstance(mode, first, count, primcount, baseinstance) + return void + param mode GLenum in value + param first Int32 in value + param count SizeI in value + param primcount SizeI in value + param baseinstance UInt32 in value + category ARB_base_instance + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + +DrawElementsInstancedBaseInstance(mode, count, type, indices, primcount, baseinstance) + return void + param mode GLenum in value + param count SizeI in value + param type GLenum in value + param indices void in array [count] + param primcount SizeI in value + param baseinstance UInt32 in value + category ARB_base_instance + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + +DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, primcount, basevertex, baseinstance) + return void + param mode GLenum in value + param count SizeI in value + param type GLenum in value + param indices void in array [count] + param primcount SizeI in value + param basevertex Int32 in value + param baseinstance UInt32 in value + category ARB_base_instance + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #108 +# ARB_shading_language_420pack commands +# +############################################################################### + +# (none) +newcategory: ARB_shading_language_420pack + +############################################################################### +# +# ARB Extension #109 +# ARB_transform_feedback_instanced commands +# +############################################################################### + +DrawTransformFeedbackInstanced(mode, id, primcount) + return void + param mode GLenum in value + param id UInt32 in value + param primcount SizeI in value + category ARB_transform_feedback_instanced + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + +DrawTransformFeedbackStreamInstanced(mode, id, stream, primcount) + return void + param mode GLenum in value + param id UInt32 in value + param stream UInt32 in value + param primcount SizeI in value + category ARB_transform_feedback_instanced + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #110 +# ARB_compressed_texture_pixel_storage commands +# +############################################################################### + +# (none) +newcategory: ARB_compressed_texture_pixel_storage + +############################################################################### +# +# ARB Extension #111 +# ARB_conservative_depth commands +# +############################################################################### + +# (none) +newcategory: ARB_conservative_depth + +############################################################################### +# +# ARB Extension #112 +# ARB_internalformat_query commands +# +############################################################################### + +GetInternalformativ(target, internalformat, pname, bufSize, params) + return void + param target GLenum in value + param internalformat GLenum in value + param pname GLenum in value + param bufSize SizeI in value + param params Int32 out array [bufSize] + category ARB_internalformat_query + dlflags notlistable + version 4.2 + extension + glxsingle ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #113 +# ARB_map_buffer_alignment commands +# +############################################################################### + +# (none) +newcategory: ARB_map_buffer_alignment + +############################################################################### +# +# ARB Extension #114 +# ARB_shader_atomic_counters commands +# +############################################################################### + +GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params) + return void + param program UInt32 in value + param bufferIndex UInt32 in value + param pname GLenum in value + param params Int32 out array [COMPSIZE(pname)] + category ARB_shader_atomic_counters + dlflags notlistable + version 4.2 + extension + glxsingle ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #115 +# ARB_shader_image_load_store commands +# +############################################################################### + +BindImageTexture(unit, texture, level, layered, layer, access, format) + return void + param unit UInt32 in value + param texture UInt32 in value + param level Int32 in value + param layered Boolean in value + param layer Int32 in value + param access GLenum in value + param format GLenum in value + category ARB_shader_image_load_store + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + +MemoryBarrier(barriers) + return void + param barriers GLbitfield in value + category ARB_shader_image_load_store + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# ARB Extension #116 +# ARB_shading_language_packing commands +# +############################################################################### + +# (none) +newcategory: ARB_shading_language_packing + +############################################################################### +# +# ARB Extension #117 +# ARB_texture_storage commands +# +############################################################################### + +TexStorage1D(target, levels, internalformat, width) + return void + param target GLenum in value + param levels SizeI in value + param internalformat GLenum in value + param width SizeI in value + category ARB_texture_storage + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TexStorage2D(target, levels, internalformat, width, height) + return void + param target GLenum in value + param levels SizeI in value + param internalformat GLenum in value + param width SizeI in value + param height SizeI in value + category ARB_texture_storage + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TexStorage3D(target, levels, internalformat, width, height, depth) + return void + param target GLenum in value + param levels SizeI in value + param internalformat GLenum in value + param width SizeI in value + param height SizeI in value + param depth SizeI in value + category ARB_texture_storage + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TextureStorage1DEXT(texture, target, levels, internalformat, width) + return void + param texture UInt32 in value + param target GLenum in value + param levels SizeI in value + param internalformat GLenum in value + param width SizeI in value + category ARB_texture_storage + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TextureStorage2DEXT(texture, target, levels, internalformat, width, height) + return void + param texture UInt32 in value + param target GLenum in value + param levels SizeI in value + param internalformat GLenum in value + param width SizeI in value + param height SizeI in value + category ARB_texture_storage + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + +TextureStorage3DEXT(texture, target, levels, internalformat, width, height, depth) + return void + param texture UInt32 in value + param target GLenum in value + param levels SizeI in value + param internalformat GLenum in value + param width SizeI in value + param height SizeI in value + param depth SizeI in value + category ARB_texture_storage + version 4.2 + extension + glxropcode ? + glxflags ignore + offset ? + ############################################################################### ############################################################################### @@ -31486,3 +31818,211 @@ newcategory: AMD_depth_clamp_separate # (none) newcategory: EXT_texture_sRGB_decode +############################################################################### +# +# Extension #403 +# NV_texture_multisample commands +# +############################################################################### + +TexImage2DMultisampleCoverageNV(target, coverageSamples, colorSamples, internalFormat, width, height, fixedSampleLocations) + return void + param target GLenum in value + param coverageSamples SizeI in value + param colorSamples SizeI in value + param internalFormat Int32 in value + param width SizeI in value + param height SizeI in value + param fixedSampleLocations Boolean in value + category NV_texture_multisample + version 4.1 + extension + glxropcode ? + glxflags ignore + offset ? + +TexImage3DMultisampleCoverageNV(target, coverageSamples, colorSamples, internalFormat, width, height, depth, fixedSampleLocations) + return void + param target GLenum in value + param coverageSamples SizeI in value + param colorSamples SizeI in value + param internalFormat Int32 in value + param width SizeI in value + param height SizeI in value + param depth SizeI in value + param fixedSampleLocations Boolean in value + category NV_texture_multisample + version 4.1 + extension + glxropcode ? + glxflags ignore + offset ? + +TextureImage2DMultisampleNV(texture, target, samples, internalFormat, width, height, fixedSampleLocations) + return void + param texture UInt32 in value + param target GLenum in value + param samples SizeI in value + param internalFormat Int32 in value + param width SizeI in value + param height SizeI in value + param fixedSampleLocations Boolean in value + category NV_texture_multisample + version 4.1 + extension + glxropcode ? + glxflags ignore + offset ? + +TextureImage3DMultisampleNV(texture, target, samples, internalFormat, width, height, depth, fixedSampleLocations) + return void + param texture UInt32 in value + param target GLenum in value + param samples SizeI in value + param internalFormat Int32 in value + param width SizeI in value + param height SizeI in value + param depth SizeI in value + param fixedSampleLocations Boolean in value + category NV_texture_multisample + version 4.1 + extension + glxropcode ? + glxflags ignore + offset ? + +TextureImage2DMultisampleCoverageNV(texture, target, coverageSamples, colorSamples, internalFormat, width, height, fixedSampleLocations) + return void + param texture UInt32 in value + param target GLenum in value + param coverageSamples SizeI in value + param colorSamples SizeI in value + param internalFormat Int32 in value + param width SizeI in value + param height SizeI in value + param fixedSampleLocations Boolean in value + category NV_texture_multisample + version 4.1 + extension + glxropcode ? + glxflags ignore + offset ? + +TextureImage3DMultisampleCoverageNV(texture, target, coverageSamples, colorSamples, internalFormat, width, height, depth, fixedSampleLocations) + return void + param texture UInt32 in value + param target GLenum in value + param coverageSamples SizeI in value + param colorSamples SizeI in value + param internalFormat Int32 in value + param width SizeI in value + param height SizeI in value + param depth SizeI in value + param fixedSampleLocations Boolean in value + category NV_texture_multisample + version 4.1 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# Extension #404 +# AMD_blend_minmax_factor commands +# +############################################################################### + +# (none) +newcategory: AMD_blend_minmax_factor + +############################################################################### +# +# Extension #405 +# AMD_sample_positions commands +# +############################################################################### + +SetMultisamplefvAMD(pname, index, val) + return void + param pname GLenum in value + param index UInt32 in value + param val Float32 in array [2] + category AMD_sample_positions + glxflags ignore + version 3.2 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# Extension #406 +# EXT_x11_sync_object commands +# +############################################################################### + +ImportSyncEXT(external_sync_type, external_sync, flags) + return sync + param external_sync_type GLenum in value + param external_sync Intptr in value + param flags GLbitfield in value + category EXT_x11_sync_object + glxflags ignore + version 3.2 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# Extension #407 - WGL_NV_DX_interop +# +############################################################################### + +############################################################################### +# +# Extension #408 +# AMD_multi_draw_indirect commands +# +############################################################################### + +MultiDrawArraysIndirectAMD(mode, indirect, primcount, stride) + return void + param mode GLenum in value + param indirect Void in array [] + param primcount SizeI in value + param stride SizeI in value + category AMD_multi_draw_indirect + version 4.0 + extension + glxropcode ? + glxflags ignore + offset ? + +MultiDrawElementsIndirectAMD(mode, type, indirect, primcount, stride) + return void + param mode GLenum in value + param type GLenum in value + param indirect Void in array [] + param primcount SizeI in value + param stride SizeI in value + category AMD_multi_draw_indirect + version 4.0 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# Extension #409 +# EXT_framebuffer_multisample_blit_scaled commands +# +############################################################################### + +# (none) +newcategory: EXT_framebuffer_multisample_blit_scaled + diff --git a/xorg-server/hw/xwin/glx/wglext.h b/xorg-server/hw/xwin/glx/wglext.h index e60c6527d..4cbbd10fb 100644 --- a/xorg-server/hw/xwin/glx/wglext.h +++ b/xorg-server/hw/xwin/glx/wglext.h @@ -6,7 +6,7 @@ extern "C" { #endif /* -** Copyright (c) 2007-2010 The Khronos Group Inc. +** Copyright (c) 2007-2011 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -48,9 +48,9 @@ extern "C" { /*************************************************************/ /* Header file version number */ -/* wglext.h last updated 2010/08/06 */ +/* wglext.h last updated 2011/04/13 */ /* Current version at http://www.opengl.org/registry/ */ -#define WGL_WGLEXT_VERSION 22 +#define WGL_WGLEXT_VERSION 23 #ifndef WGL_ARB_buffer_region #define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001 @@ -416,6 +416,12 @@ extern "C" { #define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 #endif +#ifndef WGL_NV_DX_interop +#define WGL_ACCESS_READ_ONLY_NV 0x00000000 +#define WGL_ACCESS_READ_WRITE_NV 0x00000001 +#define WGL_ACCESS_WRITE_DISCARD_NV 0x00000002 +#endif + /*************************************************************/ @@ -893,6 +899,28 @@ typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcNa #define WGL_NV_multisample_coverage 1 #endif +#ifndef WGL_NV_DX_interop +#define WGL_NV_DX_interop 1 +#ifdef WGL_WGLEXT_PROTOTYPES +extern BOOL WINAPI wglDXSetResourceShareHandleNV (void *dxObject, HANDLE shareHandle); +extern HANDLE WINAPI wglDXOpenDeviceNV (void *dxDevice); +extern BOOL WINAPI wglDXCloseDeviceNV (HANDLE hDevice); +extern HANDLE WINAPI wglDXRegisterObjectNV (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access); +extern BOOL WINAPI wglDXUnregisterObjectNV (HANDLE hDevice, HANDLE hObject); +extern BOOL WINAPI wglDXObjectAccessNV (HANDLE hObject, GLenum access); +extern BOOL WINAPI wglDXLockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects); +extern BOOL WINAPI wglDXUnlockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects); +#endif /* WGL_WGLEXT_PROTOTYPES */ +typedef BOOL (WINAPI * PFNWGLDXSETRESOURCESHAREHANDLENVPROC) (void *dxObject, HANDLE shareHandle); +typedef HANDLE (WINAPI * PFNWGLDXOPENDEVICENVPROC) (void *dxDevice); +typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICENVPROC) (HANDLE hDevice); +typedef HANDLE (WINAPI * PFNWGLDXREGISTEROBJECTNVPROC) (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access); +typedef BOOL (WINAPI * PFNWGLDXUNREGISTEROBJECTNVPROC) (HANDLE hDevice, HANDLE hObject); +typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSNVPROC) (HANDLE hObject, GLenum access); +typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects); +typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects); +#endif + #ifdef __cplusplus } diff --git a/xorg-server/hw/xwin/glx/wglext.spec b/xorg-server/hw/xwin/glx/wglext.spec index a2276fc48..1cac9d9cd 100644 --- a/xorg-server/hw/xwin/glx/wglext.spec +++ b/xorg-server/hw/xwin/glx/wglext.spec @@ -7,11 +7,11 @@ # This document is licensed under the SGI Free Software B License Version # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . # -# $Revision: 12183 $ on $Date: 2010-08-06 02:53:05 -0700 (Fri, 06 Aug 2010) $ +# $Revision: 14504 $ on $Date: 2011-04-13 21:31:13 -0700 (Wed, 13 Apr 2011) $ required-props: param: retval retained -category: wgl ARB_buffer_region ARB_extensions_string ARB_pixel_format ARB_make_current_read ARB_pbuffer ARB_render_texture ARB_pixel_format_float EXT_display_color_table EXT_extensions_string EXT_make_current_read EXT_pbuffer EXT_pixel_format EXT_swap_control OML_sync_control I3D_digital_video_control I3D_gamma I3D_genlock I3D_image_buffer I3D_swap_frame_lock I3D_swap_frame_usage NV_vertex_array_range 3DL_stereo_control NV_swap_group NV_video_output NV_present_video ARB_create_context NV_gpu_affinity AMD_gpu_association NV_video_capture NV_copy_image ARB_framebuffer_sRGB +category: wgl ARB_buffer_region ARB_extensions_string ARB_pixel_format ARB_make_current_read ARB_pbuffer ARB_render_texture ARB_pixel_format_float EXT_display_color_table EXT_extensions_string EXT_make_current_read EXT_pbuffer EXT_pixel_format EXT_swap_control OML_sync_control I3D_digital_video_control I3D_gamma I3D_genlock I3D_image_buffer I3D_swap_frame_lock I3D_swap_frame_usage NV_vertex_array_range 3DL_stereo_control NV_swap_group NV_video_output NV_present_video ARB_create_context NV_gpu_affinity AMD_gpu_association NV_video_capture NV_copy_image ARB_framebuffer_sRGB NV_DX_interop # required-props in wgl.spec (which is not used for anything): # dlflags: notlistable handcode # wglflags: client-handcode server-handcode non-dispatch @@ -1124,3 +1124,62 @@ CopyImageSubDataNV(hSrcRC, srcName, srcTarget, srcLevel, srcX, srcY, srcZ, hDstR # (none) newcategory: NV_multisample_coverage + +############################################################################### +# +# Extension #407 +# NV_DX_interop commands +# +############################################################################### + +DXSetResourceShareHandleNV(dxObject, shareHandle) + return BOOL + param dxObject void out array [1] + param shareHandle HANDLE in value + category NV_DX_interop + +DXOpenDeviceNV(dxDevice) + return HANDLE + param dxDevice void out array [1] + category NV_DX_interop + +DXCloseDeviceNV(hDevice) + return BOOL + param hDevice HANDLE in value + category NV_DX_interop + +DXRegisterObjectNV(hDevice, dxObject, name, type, access) + return HANDLE + param hDevice HANDLE in value + param dxObject void out array [1] + param name GLuint in value + param type GLenum in value + param access GLenum in value + category NV_DX_interop + +DXUnregisterObjectNV(hDevice, hObject) + return BOOL + param hDevice HANDLE in value + param hObject HANDLE in value + category NV_DX_interop + +DXObjectAccessNV(hObject, access) + return BOOL + param hObject HANDLE in value + param access GLenum in value + category NV_DX_interop + +DXLockObjectsNV(hDevice, count, hObjects) + return BOOL + param hDevice HANDLE in value + param count GLint in value + param hObjects HANDLE out array [count] + category NV_DX_interop + +DXUnlockObjectsNV(hDevice, count, hObjects) + return BOOL + param hDevice HANDLE in value + param count GLint in value + param hObjects HANDLE out array [count] + category NV_DX_interop + |