diff options
Diffstat (limited to 'xorg-server/hw/xwin')
| -rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/gl.spec | 867 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/gl.tm | 18 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/glwindows.h | 3 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/glwrap.c | 75 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/wgl.tm | 1 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.h | 170 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/wglext.h | 20 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/wglext.spec | 24 |
8 files changed, 981 insertions, 197 deletions
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/gl.spec b/xorg-server/hw/xwin/swrastwgl_dri/gl.spec index 4c9fddab1..d7ad0c827 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/gl.spec +++ b/xorg-server/hw/xwin/swrastwgl_dri/gl.spec @@ -7,13 +7,13 @@ # This document is licensed under the SGI Free Software B License Version # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . # -# $Revision: 15267 $ on $Date: 2011-08-08 00:37:03 -0700 (Mon, 08 Aug 2011) $ +# $Revision: 17237 $ on $Date: 2012-03-28 22:30:00 -0700 (Wed, 28 Mar 2012) $ required-props: # Description of a parameter param: retval retained # Display list flags -dlflags: notlistable handcode +dlflags: notlistable handcode prepad # GLX implementation flags glxflags: client-intercept client-handcode server-handcode EXT SGI ignore ARB # Vector ('v') equivalent form of a command taking 1-4 explicit xyzw/rgba arguments @@ -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 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 +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 NV_path_rendering AMD_stencil_operation_extended NV_bindless_texture # Categories for extensions with no functions - need not be included now # ARB_texture_env_add ARB_texture_cube_map ARB_texture_border_clamp @@ -63,7 +63,9 @@ category: display-list drawing drawing-control feedback framebuf misc modeling p # 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 +# ARB_shading_language_packing AMD_pinned_memory +# AMD_vertex_shader_viewport_index AMD_vertex_shader_layer +# NV_shader_atomic_float # Core version in which a function was introduced, or against # which an extension can be implemented @@ -401,10 +403,10 @@ Clear(mask) ClearColor(red, green, blue, alpha) return void - param red ClampedColorF in value - param green ClampedColorF in value - param blue ClampedColorF in value - param alpha ClampedColorF in value + param red ColorF in value + param green ColorF in value + param blue ColorF in value + param alpha ColorF in value category VERSION_1_0 # old: framebuf version 1.0 glxropcode 130 @@ -420,7 +422,7 @@ ClearStencil(s) ClearDepth(depth) return void - param depth ClampedFloat64 in value + param depth Float64 in value category VERSION_1_0 # old: framebuf version 1.0 glxropcode 132 @@ -523,7 +525,7 @@ LogicOp(opcode) StencilFunc(func, ref, mask) return void param func StencilFunction in value - param ref ClampedStencilValue in value + param ref StencilValue in value param mask MaskedStencilValue in value category VERSION_1_0 # old: pixel-op version 1.0 @@ -760,8 +762,8 @@ IsEnabled(cap) DepthRange(near, far) return void - param near ClampedFloat64 in value - param far ClampedFloat64 in value + param near Float64 in value + param far Float64 in value category VERSION_1_0 # old: xform version 1.0 glxropcode 174 @@ -3041,7 +3043,7 @@ EvalPoint2(i, j) AlphaFunc(func, ref) return void param func AlphaFunction in value - param ref ClampedFloat32 in value + param ref Float32 in value category VERSION_1_0_DEPRECATED # old: pixel-op version 1.0 deprecated 3.1 @@ -3855,7 +3857,7 @@ PrioritizeTextures(n, textures, priorities) return void param n SizeI in value param textures Texture in array [n] - param priorities ClampedFloat32 in array [n] + param priorities Float32 in array [n] category VERSION_1_1_DEPRECATED version 1.1 deprecated 3.1 @@ -3908,10 +3910,10 @@ PushClientAttrib(mask) BlendColor(red, green, blue, alpha) return void - param red ClampedColorF in value - param green ClampedColorF in value - param blue ClampedColorF in value - param alpha ClampedColorF in value + param red ColorF in value + param green ColorF in value + param blue ColorF in value + param alpha ColorF in value category VERSION_1_2 glxflags EXT version 1.2 @@ -4469,7 +4471,7 @@ ActiveTexture(texture) SampleCoverage(value, invert) return void - param value ClampedFloat32 in value + param value Float32 in value param invert Boolean in value category VERSION_1_3 glxflags ARB @@ -5817,7 +5819,7 @@ StencilFuncSeparate(face, func, ref, mask) return void param face StencilFaceDirection in value param func StencilFunction in value - param ref ClampedStencilValue in value + param ref StencilValue in value param mask MaskedStencilValue in value category VERSION_2_0 version 2.0 @@ -5897,8 +5899,7 @@ DeleteProgram(program) category VERSION_2_0 version 2.0 extension - glxropcode ? - glxflags ignore + glxsingle 202 offset ? DeleteShader(shader) @@ -5907,8 +5908,7 @@ DeleteShader(shader) category VERSION_2_0 version 2.0 extension - glxropcode ? - glxflags ignore + glxsingle 195 offset ? DetachShader(program, shader) @@ -6011,8 +6011,7 @@ GetProgramiv(program, pname, params) dlflags notlistable version 2.0 extension - glxsingle ? - glxflags ignore + glxsingle 199 offset ? GetProgramInfoLog(program, bufSize, length, infoLog) @@ -6025,8 +6024,7 @@ GetProgramInfoLog(program, bufSize, length, infoLog) dlflags notlistable version 2.0 extension - glxsingle ? - glxflags ignore + glxsingle 201 offset ? GetShaderiv(shader, pname, params) @@ -6038,8 +6036,7 @@ GetShaderiv(shader, pname, params) dlflags notlistable version 2.0 extension - glxsingle ? - glxflags ignore + glxsingle 198 offset ? GetShaderInfoLog(shader, bufSize, length, infoLog) @@ -6052,8 +6049,7 @@ GetShaderInfoLog(shader, bufSize, length, infoLog) dlflags notlistable version 2.0 extension - glxsingle ? - glxflags ignore + glxsingle 200 offset ? GetShaderSource(shader, bufSize, length, source) @@ -6163,7 +6159,7 @@ IsProgram(program) category VERSION_2_0 version 2.0 extension soft WINSOFT NV10 - glxvendorpriv 1304 + glxsingle 197 offset 592 IsShader(shader) @@ -6173,7 +6169,7 @@ IsShader(shader) category VERSION_2_0 version 2.0 extension soft WINSOFT NV10 - glxvendorpriv ? + glxsingle 196 offset ? LinkProgram(program) @@ -6924,7 +6920,7 @@ UniformMatrix2x3fv(location, count, transpose, value) category VERSION_2_1 version 2.1 extension - glxropcode ? + glxropcode 305 glxflags ignore offset ? @@ -6937,8 +6933,7 @@ UniformMatrix3x2fv(location, count, transpose, value) category VERSION_2_1 version 2.1 extension - glxropcode ? - glxflags ignore + glxropcode 306 offset ? UniformMatrix2x4fv(location, count, transpose, value) @@ -6950,8 +6945,7 @@ UniformMatrix2x4fv(location, count, transpose, value) category VERSION_2_1 version 2.1 extension - glxropcode ? - glxflags ignore + glxropcode 307 offset ? UniformMatrix4x2fv(location, count, transpose, value) @@ -6963,8 +6957,7 @@ UniformMatrix4x2fv(location, count, transpose, value) category VERSION_2_1 version 2.1 extension - glxropcode ? - glxflags ignore + glxropcode 308 offset ? UniformMatrix3x4fv(location, count, transpose, value) @@ -6976,8 +6969,7 @@ UniformMatrix3x4fv(location, count, transpose, value) category VERSION_2_1 version 2.1 extension - glxropcode ? - glxflags ignore + glxropcode 309 offset ? UniformMatrix4x3fv(location, count, transpose, value) @@ -6989,8 +6981,7 @@ UniformMatrix4x3fv(location, count, transpose, value) category VERSION_2_1 version 2.1 extension - glxropcode ? - glxflags ignore + glxropcode 310 offset ? ############################################################################### @@ -7928,7 +7919,7 @@ passthru: /* ARB_vertex_type_2_10_10_10_rev */ MinSampleShading(value) return void - param value ClampedColorF in value + param value ColorF in value category VERSION_4_0 version 1.2 extension @@ -8467,7 +8458,7 @@ MultTransposeMatrixdARB(m) SampleCoverageARB(value, invert) return void - param value ClampedFloat32 in value + param value Float32 in value param invert Boolean in value category ARB_multisample glxflags ARB @@ -11666,7 +11657,7 @@ BlendFuncSeparateiARB(buf, srcRGB, dstRGB, srcAlpha, dstAlpha) MinSampleShadingARB(value) return void - param value ClampedColorF in value + param value ColorF in value category ARB_sample_shading version 1.2 extension @@ -13170,8 +13161,8 @@ GetShaderPrecisionFormat(shadertype, precisiontype, range, precision) DepthRangef(n, f) return void - param n ClampedFloat32 in value - param f ClampedFloat32 in value + param n Float32 in value + param f Float32 in value category ARB_ES2_compatibility version 4.1 extension @@ -13181,7 +13172,7 @@ DepthRangef(n, f) ClearDepthf(d) return void - param d ClampedFloat32 in value + param d Float32 in value category ARB_ES2_compatibility version 4.1 extension @@ -14256,7 +14247,7 @@ DepthRangeArrayv(first, count, v) return void param first UInt32 in value param count SizeI in value - param v ClampedFloat64 in array [COMPSIZE(count)] + param v Float64 in array [COMPSIZE(count)] category ARB_viewport_array version 4.1 extension @@ -14267,8 +14258,8 @@ DepthRangeArrayv(first, count, v) DepthRangeIndexed(index, n, f) return void param index UInt32 in value - param n ClampedFloat64 in value - param f ClampedFloat64 in value + param n Float64 in value + param f Float64 in value category ARB_viewport_array version 4.1 extension @@ -15031,10 +15022,10 @@ newcategory: EXT_abgr BlendColorEXT(red, green, blue, alpha) return void - param red ClampedColorF in value - param green ClampedColorF in value - param blue ClampedColorF in value - param alpha ClampedColorF in value + param red ColorF in value + param green ColorF in value + param blue ColorF in value + param alpha ColorF in value category EXT_blend_color version 1.0 glxropcode 4096 @@ -26120,7 +26111,6 @@ GetTransformFeedbackVaryingNV(program, index, location) alias GetTransformFeedbackVarying # These commands require ARB_transform_feedback3 -#@@ void TransformFeedbackStreamAttribsNV(sizei count, const int * attribs, sizei nbuffers, const int *bufstreams, enum bufferMode); TransformFeedbackStreamAttribsNV(count, attribs, nbuffers, bufstreams, bufferMode) return void @@ -29742,11 +29732,6 @@ newcategory: EXT_texture_snorm # ############################################################################### -# void BlendFuncIndexedAMD(uint buf, enum src, enum dst) -# void BlendFuncSeparateIndexedAMD(uint buf, enum srcRGB, enum dstRGB, enum srcAlpha, enum dstAlpha) -# void BlendEquationIndexedAMD(uint buf, enum mode) -# void BlendEquationSeparateIndexedAMD(uint buf, enum modeRGB, enum modeAlpha) - BlendFuncIndexedAMD(buf, src, dst) return void param buf UInt32 in value @@ -30830,8 +30815,6 @@ VertexArrayVertexAttribLOffsetEXT(vaobj, buffer, index, size, type, stride, offs ############################################################################### # These commands require ARB_shader_subroutine -#@@ void ProgramSubroutineParametersuivNV(enum target, sizei count, const uint *params); -#@@ void GetProgramSubroutineParameteruivNV(enum target, uint index, uint *param); ProgramSubroutineParametersuivNV(target, count, params) return void @@ -32026,3 +32009,755 @@ MultiDrawElementsIndirectAMD(mode, type, indirect, primcount, stride) # (none) newcategory: EXT_framebuffer_multisample_blit_scaled +############################################################################### +# +# Extension #410 +# NV_path_rendering commands +# +############################################################################### + +# PATH NAME MANAGMENT + +GenPathsNV(range) + return Path + param range SizeI in value + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +DeletePathsNV(path, range) + return void + param path Path in value + param range SizeI in value + dlflags notlistable + category NV_path_rendering + version 1.1 + extension + +IsPathNV(path) + return Boolean + param path Path in value + dlflags notlistable + category NV_path_rendering + version 1.1 + extension + +# PATH SPECIFICATION COMMANDS + +PathCommandsNV(path, numCommands, commands, numCoords, coordType, coords) + return void + param path Path in value + param numCommands SizeI in value + param commands PathCommand in array [numCommands] + param numCoords SizeI in value + param coordType PathCoordType in value + param coords Void in array [COMPSIZE(numCoords,coordType)] + category NV_path_rendering + version 1.1 + extension + +PathCoordsNV(path, numCoords, coordType, coords) + return void + param path Path in value + param numCoords SizeI in value + param coordType PathCoordType in value + param coords Void in array [COMPSIZE(numCoords,coordType)] + category NV_path_rendering + version 1.1 + extension + +PathSubCommandsNV(path, commandStart, commandsToDelete, numCommands, commands, numCoords, coordType, coords) + return void + param path Path in value + param commandStart SizeI in value + param commandsToDelete SizeI in value + param numCommands SizeI in value + param commands PathCommand in array [numCommands] + param numCoords SizeI in value + param coordType PathCoordType in value + param coords Void in array [COMPSIZE(numCoords,coordType)] + category NV_path_rendering + version 1.1 + extension + +PathSubCoordsNV(path, coordStart, numCoords, coordType, coords) + return void + param path Path in value + param coordStart SizeI in value + param numCoords SizeI in value + param coordType PathCoordType in value + param coords Void in array [COMPSIZE(numCoords,coordType)] + category NV_path_rendering + version 1.1 + extension + +PathStringNV(path, format, length, pathString) + return void + param path Path in value + param format PathStringFormat in value + param length SizeI in value + param pathString Void in array [length] + category NV_path_rendering + version 1.1 + extension + +PathGlyphsNV(firstPathName, fontTarget, fontName, fontStyle, numGlyphs, type, charcodes, handleMissingGlyphs, pathParameterTemplate, emScale) + return void + param firstPathName Path in value + param fontTarget PathFontTarget in value + param fontName Void in array [COMPSIZE(fontTarget,fontName)] + param fontStyle PathFontStyle in value + param numGlyphs SizeI in value + param type PathElementType in value + param charcodes Void in array [COMPSIZE(numGlyphs,type,charcodes)] + param handleMissingGlyphs PathHandleMissingGlyphs in value + param pathParameterTemplate Path in value + param emScale Float32 in value + category NV_path_rendering + version 1.1 + extension + +PathGlyphRangeNV(firstPathName, fontTarget, fontName, fontStyle, firstGlyph, numGlyphs, handleMissingGlyphs, pathParameterTemplate, emScale) + return void + param firstPathName Path in value + param fontTarget PathFontTarget in value + param fontName Void in array [COMPSIZE(fontTarget,fontName)] + param fontStyle PathFontStyle in value + param firstGlyph UInt32 in value + param numGlyphs SizeI in value + param handleMissingGlyphs PathHandleMissingGlyphs in value + param pathParameterTemplate Path in value + param emScale Float32 in value + category NV_path_rendering + version 1.1 + extension + dlflags prepad + +WeightPathsNV(resultPath, numPaths, paths, weights) + return void + param resultPath Path in value + param numPaths SizeI in value + param paths Path in array [numPaths] + param weights Float32 in array [numPaths] + category NV_path_rendering + version 1.1 + extension + +CopyPathNV(resultPath, srcPath) + return void + param resultPath Path in value + param srcPath Path in value + category NV_path_rendering + version 1.1 + extension + +InterpolatePathsNV(resultPath, pathA, pathB, weight) + return void + param resultPath Path in value + param pathA Path in value + param pathB Path in value + param weight Float32 in value + category NV_path_rendering + version 1.1 + extension + +TransformPathNV(resultPath, srcPath, transformType, transformValues) + return void + param resultPath Path in value + param srcPath Path in value + param transformType PathTransformType in value + param transformValues Float32 in array [COMPSIZE(transformType)] + category NV_path_rendering + version 1.1 + extension + +PathParameterivNV(path, pname, value) + return void + param path Path in value + param pname PathParameter in value + param value Int32 in array [COMPSIZE(pname)] + category NV_path_rendering + version 1.1 + extension + +PathParameteriNV(path, pname, value) + return void + param path Path in value + param pname PathParameter in value + param value Int32 in value + category NV_path_rendering + version 1.1 + extension + +PathParameterfvNV(path, pname, value) + return void + param path Path in value + param pname PathParameter in value + param value Float32 in array [COMPSIZE(pname)] + category NV_path_rendering + version 1.1 + extension + +PathParameterfNV(path, pname, value) + return void + param path Path in value + param pname PathParameter in value + param value Float32 in value + category NV_path_rendering + version 1.1 + extension + +PathDashArrayNV(path, dashCount, dashArray) + return void + param path Path in value + param dashCount SizeI in value + param dashArray Float32 in array [dashCount] + category NV_path_rendering + version 1.1 + extension + +# PATH STENCILING + +PathStencilFuncNV(func, ref, mask) + return void + param func StencilFunction in value + param ref ClampedStencilValue in value + param mask MaskedStencilValue in value + category NV_path_rendering + version 1.1 + extension + +PathStencilDepthOffsetNV(factor, units) + return void + param factor Float32 in value + param units Float32 in value + category NV_path_rendering + version 1.1 + extension + +StencilFillPathNV(path, fillMode, mask) + return void + param path Path in value + param fillMode PathFillMode in value + param mask MaskedStencilValue in value + category NV_path_rendering + version 1.1 + extension + +StencilStrokePathNV(path, reference, mask) + return void + param path Path in value + param reference StencilValue in value + param mask MaskedStencilValue in value + category NV_path_rendering + version 1.1 + extension + +StencilFillPathInstancedNV(numPaths, pathNameType, paths, pathBase, fillMode, mask, transformType, transformValues) + return void + param numPaths SizeI in value + param pathNameType PathElementType in value + param paths PathElement in array [COMPSIZE(numPaths,pathNameType,paths)] + param pathBase Path in value + param fillMode PathFillMode in value + param mask MaskedStencilValue in value + param transformType PathTransformType in value + param transformValues Float32 in array [COMPSIZE(numPaths,transformType)] + category NV_path_rendering + version 1.1 + extension + +StencilStrokePathInstancedNV(numPaths, pathNameType, paths, pathBase, reference, mask, transformType, transformValues) + return void + param numPaths SizeI in value + param pathNameType PathElementType in value + param paths PathElement in array [COMPSIZE(numPaths,pathNameType,paths)] + param pathBase Path in value + param reference StencilValue in value + param mask MaskedStencilValue in value + param transformType PathTransformType in value + param transformValues Float32 in array [COMPSIZE(numPaths,transformType)] + category NV_path_rendering + version 1.1 + extension + +# PATH COVERING + +PathCoverDepthFuncNV(func) + return void + param func DepthFunction in value + category NV_path_rendering + version 1.1 + extension + +PathColorGenNV(color, genMode, colorFormat, coeffs) + return void + param color PathColor in value + param genMode PathGenMode in value + param colorFormat PathColorFormat in value + param coeffs Float32 in array [COMPSIZE(genMode,colorFormat)] + category NV_path_rendering + version 1.1 + extension + +PathTexGenNV(texCoordSet, genMode, components, coeffs) + return void + param texCoordSet PathColor in value + param genMode PathGenMode in value + param components Int32 in value + param coeffs Float32 in array [COMPSIZE(genMode,components)] + category NV_path_rendering + version 1.1 + extension + +PathFogGenNV(genMode) + return void + param genMode PathGenMode in value + category NV_path_rendering + version 1.1 + extension + +CoverFillPathNV(path, coverMode) + return void + param path Path in value + param coverMode PathCoverMode in value + category NV_path_rendering + version 1.1 + extension + +CoverStrokePathNV(path, coverMode) + return void + param path Path in value + param coverMode PathCoverMode in value + category NV_path_rendering + version 1.1 + extension + +CoverFillPathInstancedNV(numPaths, pathNameType, paths, pathBase, coverMode, transformType, transformValues) + return void + param numPaths SizeI in value + param pathNameType PathElementType in value + param paths PathElement in array [COMPSIZE(numPaths,pathNameType,paths)] + param pathBase Path in value + param coverMode PathCoverMode in value + param transformType PathTransformType in value + param transformValues Float32 in array [COMPSIZE(numPaths,transformType)] + category NV_path_rendering + version 1.1 + extension + +CoverStrokePathInstancedNV(numPaths, pathNameType, paths, pathBase, coverMode, transformType, transformValues) + return void + param numPaths SizeI in value + param pathNameType PathElementType in value + param paths PathElement in array [COMPSIZE(numPaths,pathNameType,paths)] + param pathBase Path in value + param coverMode PathCoverMode in value + param transformType PathTransformType in value + param transformValues Float32 in array [COMPSIZE(numPaths,transformType)] + category NV_path_rendering + version 1.1 + extension + +# PATH QUERIES + +GetPathParameterivNV(path, pname, value) + return void + param path Path in value + param pname PathParameter in value + param value Int32 out array [4] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +GetPathParameterfvNV(path, pname, value) + return void + param path Path in value + param pname PathParameter in value + param value Float32 out array [4] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +GetPathCommandsNV(path, commands) + return void + param path Path in value + param commands PathCommand out array [COMPSIZE(path)] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +GetPathCoordsNV(path, coords) + return void + param path Path in value + param coords Float32 out array [COMPSIZE(path)] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +GetPathDashArrayNV(path, dashArray) + return void + param path Path in value + param dashArray Float32 out array [COMPSIZE(path)] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +GetPathMetricsNV(metricQueryMask, numPaths, pathNameType, paths, pathBase, stride, metrics) + return void + param metricQueryMask PathMetricMask in value + param numPaths SizeI in value + param pathNameType PathElementType in value + param paths PathElement in array [COMPSIZE(numPaths,pathNameType,paths)] + param pathBase Path in value + param stride SizeI in value + param metrics Float32 out array [COMPSIZE(metricQueryMask,numPaths,stride)] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +GetPathMetricRangeNV(metricQueryMask, firstPathName, numPaths, stride, metrics) + return void + param metricQueryMask PathMetricMask in value + param firstPathName Path in value + param numPaths SizeI in value + param stride SizeI in value + param metrics Float32 out array [COMPSIZE(metricQueryMask,numPaths,stride)] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +GetPathSpacingNV(pathListMode, numPaths, pathNameType, paths, pathBase, advanceScale, kerningScale, transformType, returnedSpacing) + return void + param pathListMode PathListMode in value + param numPaths SizeI in value + param pathNameType PathElementType in value + param paths PathElement in array [COMPSIZE(numPaths,pathNameType,paths)] + param pathBase Path in value + param advanceScale Float32 in value + param kerningScale Float32 in value + param transformType PathTransformType in value + param returnedSpacing Float32 out array [COMPSIZE(pathListMode,numPaths)] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +GetPathColorGenivNV(color, pname, value) + return void + param color PathColor in value + param pname PathGenMode in value + param value Int32 out array [COMPSIZE(pname)] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +GetPathColorGenfvNV(color, pname, value) + return void + param color PathColor in value + param pname PathGenMode in value + param value Float32 out array [COMPSIZE(pname)] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +GetPathTexGenivNV(texCoordSet, pname, value) + return void + param texCoordSet TextureUnit in value + param pname PathGenMode in value + param value Int32 out array [COMPSIZE(pname)] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +GetPathTexGenfvNV(texCoordSet, pname, value) + return void + param texCoordSet TextureUnit in value + param pname PathGenMode in value + param value Float32 out array [COMPSIZE(pname)] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +IsPointInFillPathNV(path, mask, x, y) + return Boolean + param path Path in value + param mask MaskedStencilValue in value + param x Float32 in value + param y Float32 in value + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +IsPointInStrokePathNV(path, x, y) + return Boolean + param path Path in value + param x Float32 in value + param y Float32 in value + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +GetPathLengthNV(path, startSegment, numSegments) + return Float32 + param path Path in value + param startSegment SizeI in value + param numSegments SizeI in value + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +PointAlongPathNV(path, startSegment, numSegments, distance, x, y, tangentX, tangentY) + return Boolean + param path Path in value + param startSegment SizeI in value + param numSegments SizeI in value + param distance Float32 in value + param x Float32 out array [1] + param y Float32 out array [1] + param tangentX Float32 out array [1] + param tangentY Float32 out array [1] + category NV_path_rendering + dlflags notlistable + version 1.1 + extension + +############################################################################### +# +# Extension #411 +# AMD_pinned_memory commands +# +############################################################################### + +# (none) +newcategory: AMD_pinned_memory + +############################################################################### +# +# Extension #412 - WGL_NV_DX_interop2 +# +############################################################################### + +############################################################################### +# +# Extension #413 - AMD_stencil_operation_extended +# +############################################################################### + +StencilOpValueAMD(face, value) + return void + param face StencilFaceDirection in value + param value UInt32 in value + category AMD_stencil_operation_extended + version 1.2 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# Extension #414 - GLX_EXT_swap_control_tear +# Extension #415 - WGL_EXT_swap_control_tear +# +############################################################################### + +############################################################################### +# +# Extension #416 +# AMD_vertex_shader_viewport_index commands +# +############################################################################### + +# (none) +newcategory: AMD_vertex_shader_viewport_index + +############################################################################### +# +# Extension #417 +# AMD_vertex_shader_layer commands +# +############################################################################### + +# (none) +newcategory: AMD_vertex_shader_layer + +############################################################################### +# +# Extension #418 +# NV_bindless_texture commands +# +############################################################################### + +GetTextureHandleNV(texture) + return UInt64 + param texture UInt32 in value + category NV_bindless_texture + dlflags notlistable + version 4.0 + extension + glxsingle ? + glxflags ignore + offset ? + +GetTextureSamplerHandleNV(texture, sampler) + return UInt64 + param texture UInt32 in value + param sampler UInt32 in value + category NV_bindless_texture + dlflags notlistable + version 4.0 + extension + glxsingle ? + glxflags ignore + offset ? + +MakeTextureHandleResidentNV(handle) + return void + param handle UInt64 in value + category NV_bindless_texture + version 4.0 + extension + glxropcode ? + glxflags ignore + offset ? + +MakeTextureHandleNonResidentNV(handle) + return void + param handle UInt64 in value + category NV_bindless_texture + version 4.0 + extension + glxropcode ? + glxflags ignore + offset ? + +GetImageHandleNV(texture, level, layered, layer, format) + return UInt64 + param texture UInt32 in value + param level Int32 in value + param layered Boolean in value + param layer Int32 in value + param format GLenum in value + category NV_bindless_texture + dlflags notlistable + version 4.0 + extension + glxsingle ? + glxflags ignore + offset ? + +MakeImageHandleResidentNV(handle, access) + return void + param handle UInt64 in value + param access GLenum in value + category NV_bindless_texture + version 4.0 + extension + glxropcode ? + glxflags ignore + offset ? + +MakeImageHandleNonResidentNV(handle) + return void + param handle UInt64 in value + category NV_bindless_texture + version 4.0 + extension + glxropcode ? + glxflags ignore + offset ? + +UniformHandleui64NV(location, value) + return void + param location Int32 in value + param value UInt64 in value + category NV_bindless_texture + version 4.0 + extension + glxropcode ? + glxflags ignore + offset ? + +UniformHandleui64vNV(location, count, value) + return void + param location Int32 in value + param count SizeI in value + param value UInt64 in array [count] + category NV_bindless_texture + version 4.0 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniformHandleui64NV(program, location, value) + return void + param program UInt32 in value + param location Int32 in value + param value UInt64 in value + category NV_bindless_texture + version 4.0 + extension + glxropcode ? + glxflags ignore + offset ? + +ProgramUniformHandleui64vNV(program, location, count, values) + return void + param program UInt32 in value + param location Int32 in value + param count SizeI in value + param values UInt64 in array [count] + category NV_bindless_texture + version 4.0 + extension + glxropcode ? + glxflags ignore + offset ? + +IsTextureHandleResidentNV(handle) + return Boolean + param handle UInt64 in value + category NV_bindless_texture + version 4.0 + extension + glxropcode ? + glxflags ignore + offset ? + +IsImageHandleResidentNV(handle) + return Boolean + param handle UInt64 in value + category NV_bindless_texture + version 4.0 + extension + glxropcode ? + glxflags ignore + offset ? + +############################################################################### +# +# Extension #419 +# NV_shader_atomic_float commands +# +############################################################################### + +# (none) +newcategory: NV_shader_atomic_float + diff --git a/xorg-server/hw/xwin/swrastwgl_dri/gl.tm b/xorg-server/hw/xwin/swrastwgl_dri/gl.tm index f7b3856ac..3d2c43b08 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/gl.tm +++ b/xorg-server/hw/xwin/swrastwgl_dri/gl.tm @@ -326,3 +326,21 @@ vdpauSurfaceNV,*,*, GLvdpauSurfaceNV,*,*, # External API types cl_context,*,*, struct _cl_context *,*,* cl_event,*,*, struct _cl_event *,*,* +Path,*,*, GLuint,*,* +PathColor,*,*, GLenum,*,* +PathColorFormat,*,*, GLenum,*,* +PathCommand,*,*, GLubyte,*,* +PathCoordType,*,*, GLenum,*,* +PathCoverMode,*,*, GLenum,*,* +PathElementType,*,*, GLenum,*,* +PathElement,*,*, GLvoid,*,* +PathFillMode,*,*, GLenum,*,* +PathFontStyle,*,*, GLbitfield,*,* +PathFontTarget,*,*, GLenum,*,* +PathGenMode,*,*, GLenum,*,* +PathListMode,*,*, GLenum,*,* +PathMetricMask,*,*, GLbitfield,*,* +PathParameter,*,*, GLenum,*,* +PathStringFormat,*,*, GLenum,*,* +PathTransformType,*,*, GLenum,*,* +PathHandleMissingGlyphs,*,*, GLenum,*,* diff --git a/xorg-server/hw/xwin/swrastwgl_dri/glwindows.h b/xorg-server/hw/xwin/swrastwgl_dri/glwindows.h index ad817033c..3e200644f 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/glwindows.h +++ b/xorg-server/hw/xwin/swrastwgl_dri/glwindows.h @@ -34,5 +34,6 @@ void glWinCallDelta(void); void glxWinPushNativeProvider(void); const GLubyte* glGetStringWrapperNonstatic(GLenum name); -void glAddSwapHintRectWINWrapperNonstatic(GLint x, GLint y, GLsizei width, GLsizei height); +void glAddSwapHintRectWINWrapperNonstatic(GLint x, GLint y, GLsizei width, + GLsizei height); void glWinSetupDispatchTable(void); diff --git a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c index 44e287bc9..d74addb69 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c +++ b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c @@ -53,49 +53,44 @@ static unsigned int glWinDirectProcCalls = 0; void glWinCallDelta(void) { - static unsigned int glWinIndirectProcCallsLast = 0; - static unsigned int glWinDirectProcCallsLast = 0; - if ((glWinIndirectProcCalls != glWinIndirectProcCallsLast) || - (glWinDirectProcCalls != glWinDirectProcCallsLast)) - { - glWinDirectProcCallsLast = glWinDirectProcCalls; - glWinIndirectProcCallsLast = glWinIndirectProcCalls; + static unsigned int glWinIndirectProcCallsLast = 0; + static unsigned int glWinDirectProcCallsLast = 0; + + if ((glWinIndirectProcCalls != glWinIndirectProcCallsLast) || + (glWinDirectProcCalls != glWinDirectProcCallsLast)) { + glWinDirectProcCallsLast = glWinDirectProcCalls; + glWinIndirectProcCallsLast = glWinIndirectProcCalls; } } #endif static __inline PROC -glWinResolveHelper(PROC *cache, char *symbol) +glWinResolveHelper(PROC * cache, char *symbol) { - PROC proc = NULL; - - /* If not yet cached, call wglGetProcAddress */ - if ((*cache) == NULL) - { - proc = wglGetProcAddress(symbol); - if (proc == NULL) - { - ErrorF("glwrap: Can't resolve \"%s\"\n", symbol); - (*cache) = (PROC)-1; + PROC proc = NULL; + + /* If not yet cached, call wglGetProcAddress */ + if ((*cache) == NULL) { + proc = wglGetProcAddress(symbol); + if (proc == NULL) { + ErrorF("glwrap: Can't resolve \"%s\"\n", symbol); + (*cache) = (PROC) - 1; } - else - { - ErrorF("glwrap: Resolved \"%s\"\n", symbol); - (*cache) = proc; + else { + ErrorF("glwrap: Resolved \"%s\"\n", symbol); + (*cache) = proc; } } - /* Cached wglGetProcAddress failure */ - else if ((*cache) == (PROC)-1) - { - proc = 0; + /* Cached wglGetProcAddress failure */ + else if ((*cache) == (PROC) - 1) { + proc = 0; } - /* Cached wglGetProcAddress result */ - else - { - proc = (*cache); + /* Cached wglGetProcAddress result */ + else { + proc = (*cache); } - return proc; + return proc; } #ifdef _DEBUG @@ -132,20 +127,24 @@ glWinResolveHelper(PROC *cache, char *symbol) Special non-static wrapper for glGetString for debug output */ -const GLubyte* glGetStringWrapperNonstatic(GLenum name) +const GLubyte * +glGetStringWrapperNonstatic(GLenum name) { - return glGetString(name); + return glGetString(name); } /* Special non-static wrapper for glAddSwapHintRectWIN for copySubBuffers */ -typedef void (__stdcall *PFNGLADDSWAPHINTRECTWIN)(GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (__stdcall * PFNGLADDSWAPHINTRECTWIN) (GLint x, GLint y, + GLsizei width, + GLsizei height); -void glAddSwapHintRectWINWrapperNonstatic(GLint x, GLint y, GLsizei width, GLsizei height) +void +glAddSwapHintRectWINWrapperNonstatic(GLint x, GLint y, GLsizei width, + GLsizei height) { - RESOLVE(PFNGLADDSWAPHINTRECTWIN, "glAddSwapHintRectWIN"); - proc(x, y, width, height); + RESOLVE(PFNGLADDSWAPHINTRECTWIN, "glAddSwapHintRectWIN"); + proc(x, y, width, height); } - diff --git a/xorg-server/hw/xwin/swrastwgl_dri/wgl.tm b/xorg-server/hw/xwin/swrastwgl_dri/wgl.tm index baceced55..f7ae79ec8 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/wgl.tm +++ b/xorg-server/hw/xwin/swrastwgl_dri/wgl.tm @@ -24,6 +24,7 @@ INT32,*,*, INT32,*,* INT64,*,*, INT64,*,* LPVOID,*,*, LPVOID,*,* PGPU_DEVICE,*,*, PGPU_DEVICE,*,* +PROC,*,*, PROC,*,* String,*,*, const char *,*,* UINT,*,*, UINT,*,* USHORT,*,*, USHORT,*,* diff --git a/xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.h b/xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.h index 0edc6e6ed..63b1d7ef1 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.h +++ b/xorg-server/hw/xwin/swrastwgl_dri/wgl_ext_api.h @@ -1,87 +1,83 @@ -/*
- * File: wgl_ext_api.h
- * Purpose: Wrapper functions for Win32 OpenGL wgl extension functions
- *
- * Authors: Jon TURNEY
- *
- * Copyright (c) Jon TURNEY 2009
- *
- *
- * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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.
- */
-
-#ifndef wgl_ext_api_h
-#define wgl_ext_api_h
-
-#include "wglext.h"
-
-void wglResolveExtensionProcs(void);
-
-/*
- Prototypes for wrapper functions we actually use
- XXX: should be automatically generated as well
-*/
-
-const char * __stdcall wglGetExtensionsStringARBWrapper(HDC hdc);
-BOOL __stdcall wglMakeContextCurrentARBWrapper(HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
-HDC __stdcall wglGetCurrentReadDCARBWrapper(VOID);
-
-BOOL __stdcall wglGetPixelFormatAttribivARBWrapper(HDC hdc,
- int iPixelFormat,
- int iLayerPlane,
- UINT nAttributes,
- const int *piAttributes,
- int *piValues);
-
-BOOL __stdcall wglGetPixelFormatAttribfvARBWrapper(HDC hdc,
- int iPixelFormat,
- int iLayerPlane,
- UINT nAttributes,
- const int *piAttributes,
- FLOAT *pfValues);
-
-BOOL __stdcall wglChoosePixelFormatARBWrapper(HDC hdc,
- const int *piAttribIList,
- const FLOAT *pfAttribFList,
- UINT nMaxFormats,
- int *piFormats,
- UINT *nNumFormats);
-
-HPBUFFERARB __stdcall wglCreatePbufferARBWrapper(HDC hDC,
- int iPixelFormat,
- int iWidth,
- int iHeight,
- const int *piAttribList);
-
-HDC __stdcall wglGetPbufferDCARBWrapper(HPBUFFERARB hPbuffer);
-
-int __stdcall wglReleasePbufferDCARBWrapper(HPBUFFERARB hPbuffer,
- HDC hDC);
-
-BOOL __stdcall wglDestroyPbufferARBWrapper(HPBUFFERARB hPbuffer);
-
-BOOL __stdcall wglQueryPbufferARBWrapper(HPBUFFERARB hPbuffer,
- int iAttribute,
- int *piValue);
-
-BOOL __stdcall wglSwapIntervalEXTWrapper(int interval);
-
-int __stdcall wglGetSwapIntervalEXTWrapper(void);
-
-#endif /* wgl_ext_api_h */
+/* + * File: wgl_ext_api.h + * Purpose: Wrapper functions for Win32 OpenGL wgl extension functions + * + * Authors: Jon TURNEY + * + * Copyright (c) Jon TURNEY 2009 + * + * + * 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 ABOVE LISTED COPYRIGHT HOLDER(S) 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. + */ + +#ifndef wgl_ext_api_h +#define wgl_ext_api_h + +#include "wglext.h" + +void wglResolveExtensionProcs(void); + +/* + Prototypes for wrapper functions we actually use + XXX: should be automatically generated as well +*/ + +const char * __stdcall wglGetExtensionsStringARBWrapper(HDC hdc); +BOOL __stdcall wglMakeContextCurrentARBWrapper(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); +HDC __stdcall wglGetCurrentReadDCARBWrapper(VOID); + +BOOL __stdcall wglGetPixelFormatAttribivARBWrapper(HDC hdc, + int iPixelFormat, + int iLayerPlane, + UINT nAttributes, + const int *piAttributes, + int *piValues); + +BOOL __stdcall wglGetPixelFormatAttribfvARBWrapper(HDC hdc, + int iPixelFormat, + int iLayerPlane, + UINT nAttributes, + const int *piAttributes, + FLOAT * pfValues); + +BOOL __stdcall wglChoosePixelFormatARBWrapper(HDC hdc, + const int *piAttribIList, + const FLOAT * pfAttribFList, + UINT nMaxFormats, + int *piFormats, UINT * nNumFormats); + +HPBUFFERARB __stdcall wglCreatePbufferARBWrapper(HDC hDC, + int iPixelFormat, + int iWidth, + int iHeight, const int *piAttribList); + +HDC __stdcall wglGetPbufferDCARBWrapper(HPBUFFERARB hPbuffer); + +int __stdcall wglReleasePbufferDCARBWrapper(HPBUFFERARB hPbuffer, HDC hDC); + +BOOL __stdcall wglDestroyPbufferARBWrapper(HPBUFFERARB hPbuffer); + +BOOL __stdcall wglQueryPbufferARBWrapper(HPBUFFERARB hPbuffer, + int iAttribute, int *piValue); + +BOOL __stdcall wglSwapIntervalEXTWrapper(int interval); + +int __stdcall wglGetSwapIntervalEXTWrapper(void); + +#endif /* wgl_ext_api_h */ diff --git a/xorg-server/hw/xwin/swrastwgl_dri/wglext.h b/xorg-server/hw/xwin/swrastwgl_dri/wglext.h index 4cbbd10fb..b5dc7bf7f 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/wglext.h +++ b/xorg-server/hw/xwin/swrastwgl_dri/wglext.h @@ -6,7 +6,7 @@ extern "C" { #endif /* -** Copyright (c) 2007-2011 The Khronos Group Inc. +** Copyright (c) 2007-2012 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 2011/04/13 */ +/* wglext.h last updated 2012/01/04 */ /* Current version at http://www.opengl.org/registry/ */ -#define WGL_WGLEXT_VERSION 23 +#define WGL_WGLEXT_VERSION 24 #ifndef WGL_ARB_buffer_region #define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001 @@ -422,6 +422,12 @@ extern "C" { #define WGL_ACCESS_WRITE_DISCARD_NV 0x00000002 #endif +#ifndef WGL_NV_DX_interop2 +#endif + +#ifndef WGL_EXT_swap_control_tear +#endif + /*************************************************************/ @@ -921,6 +927,14 @@ typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects); #endif +#ifndef WGL_NV_DX_interop2 +#define WGL_NV_DX_interop2 1 +#endif + +#ifndef WGL_EXT_swap_control_tear +#define WGL_EXT_swap_control_tear 1 +#endif + #ifdef __cplusplus } diff --git a/xorg-server/hw/xwin/swrastwgl_dri/wglext.spec b/xorg-server/hw/xwin/swrastwgl_dri/wglext.spec index 1cac9d9cd..265bb0d06 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/wglext.spec +++ b/xorg-server/hw/xwin/swrastwgl_dri/wglext.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: 14504 $ on $Date: 2011-04-13 21:31:13 -0700 (Wed, 13 Apr 2011) $ +# $Revision: 17027 $ on $Date: 2012-03-05 11:19:50 -0800 (Mon, 05 Mar 2012) $ required-props: param: retval retained @@ -1090,7 +1090,7 @@ ReleaseVideoCaptureDeviceNV(hDc, hDevice) ############################################################################### # # Extension #376 -# WGL_NV_copy_image commands +# NV_copy_image commands # ############################################################################### @@ -1183,3 +1183,23 @@ DXUnlockObjectsNV(hDevice, count, hObjects) param hObjects HANDLE out array [count] category NV_DX_interop +############################################################################### +# +# Extension #412 +# NV_DX_interop2 commands +# +############################################################################### + +# (none) +newcategory: NV_DX_interop2 + +############################################################################### +# +# Extension #415 +# EXT_swap_control_tear commands +# +############################################################################### + +# (none) +newcategory: EXT_swap_control_tear + |