[Mesa-dev] [PATCH] docs/features: update vulkan 1.1 status
--- docs/features.txt | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/features.txt b/docs/features.txt index 46e5a25a75..1225042580 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -356,29 +356,29 @@ Vulkan 1.0 -- all DONE: anv, radv Vulkan 1.1 -- all DONE: anv, radv - VK_KHR_16bit_storage in progress (Alejandro) - VK_KHR_bind_memory2 DONE (anv, radv) - VK_KHR_dedicated_allocation DONE (anv, radv) - VK_KHR_descriptor_update_template DONE (anv, radv) - VK_KHR_device_group not started - VK_KHR_device_group_creation not started - VK_KHR_external_fence DONE (anv, radv) - VK_KHR_external_fence_capabilitiesDONE (anv, radv) - VK_KHR_external_memoryDONE (anv, radv) - VK_KHR_external_memory_capabilities DONE (anv, radv) - VK_KHR_external_semaphore DONE (anv, radv) - VK_KHR_external_semaphore_capabilitiesDONE (anv, radv) - VK_KHR_get_memory_requirements2 DONE (anv, radv) - VK_KHR_get_physical_device_properties2DONE (anv, radv) - VK_KHR_maintenance1 DONE (anv, radv) - VK_KHR_maintenance2 DONE (anv, radv) - VK_KHR_maintenance3 DONE (anv, radv) - VK_KHR_multiview DONE (anv, radv) - VK_KHR_relaxed_block_layout DONE (anv, radv) - VK_KHR_sampler_ycbcr_conversion DONE (anv) - VK_KHR_shader_draw_parameters DONE (anv, radv) - VK_KHR_storage_buffer_storage_class DONE (anv, radv) - VK_KHR_variable_pointers DONE (anv, radv) + VK_KHR_16bit_storage DONE () + VK_KHR_bind_memory2 DONE () + VK_KHR_dedicated_allocation DONE () + VK_KHR_descriptor_update_template DONE () + VK_KHR_device_group DONE () + VK_KHR_device_group_creation DONE () + VK_KHR_external_fence DONE () + VK_KHR_external_fence_capabilitiesDONE () + VK_KHR_external_memoryDONE () + VK_KHR_external_memory_capabilities DONE () + VK_KHR_external_semaphore DONE () + VK_KHR_external_semaphore_capabilitiesDONE () + VK_KHR_get_memory_requirements2 DONE () + VK_KHR_get_physical_device_properties2DONE () + VK_KHR_maintenance1 DONE () + VK_KHR_maintenance2 DONE () + VK_KHR_maintenance3 DONE () + VK_KHR_multiview DONE () + VK_KHR_relaxed_block_layout DONE () + VK_KHR_sampler_ycbcr_conversion DONE () + VK_KHR_shader_draw_parameters DONE () + VK_KHR_storage_buffer_storage_class DONE () + VK_KHR_variable_pointers DONE () Khronos extensions that are not part of any Vulkan version: VK_KHR_8bit_storage DONE (anv) -- 2.17.1 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] docs/features: update vulkan 1.1 status
--- docs/features.txt | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/features.txt b/docs/features.txt index 46e5a25a75..1225042580 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -356,29 +356,29 @@ Vulkan 1.0 -- all DONE: anv, radv Vulkan 1.1 -- all DONE: anv, radv - VK_KHR_16bit_storage in progress (Alejandro) - VK_KHR_bind_memory2 DONE (anv, radv) - VK_KHR_dedicated_allocation DONE (anv, radv) - VK_KHR_descriptor_update_template DONE (anv, radv) - VK_KHR_device_group not started - VK_KHR_device_group_creation not started - VK_KHR_external_fence DONE (anv, radv) - VK_KHR_external_fence_capabilitiesDONE (anv, radv) - VK_KHR_external_memoryDONE (anv, radv) - VK_KHR_external_memory_capabilities DONE (anv, radv) - VK_KHR_external_semaphore DONE (anv, radv) - VK_KHR_external_semaphore_capabilitiesDONE (anv, radv) - VK_KHR_get_memory_requirements2 DONE (anv, radv) - VK_KHR_get_physical_device_properties2DONE (anv, radv) - VK_KHR_maintenance1 DONE (anv, radv) - VK_KHR_maintenance2 DONE (anv, radv) - VK_KHR_maintenance3 DONE (anv, radv) - VK_KHR_multiview DONE (anv, radv) - VK_KHR_relaxed_block_layout DONE (anv, radv) - VK_KHR_sampler_ycbcr_conversion DONE (anv) - VK_KHR_shader_draw_parameters DONE (anv, radv) - VK_KHR_storage_buffer_storage_class DONE (anv, radv) - VK_KHR_variable_pointers DONE (anv, radv) + VK_KHR_16bit_storage DONE () + VK_KHR_bind_memory2 DONE () + VK_KHR_dedicated_allocation DONE () + VK_KHR_descriptor_update_template DONE () + VK_KHR_device_group DONE () + VK_KHR_device_group_creation DONE () + VK_KHR_external_fence DONE () + VK_KHR_external_fence_capabilitiesDONE () + VK_KHR_external_memoryDONE () + VK_KHR_external_memory_capabilities DONE () + VK_KHR_external_semaphore DONE () + VK_KHR_external_semaphore_capabilitiesDONE () + VK_KHR_get_memory_requirements2 DONE () + VK_KHR_get_physical_device_properties2DONE () + VK_KHR_maintenance1 DONE () + VK_KHR_maintenance2 DONE () + VK_KHR_maintenance3 DONE () + VK_KHR_multiview DONE () + VK_KHR_relaxed_block_layout DONE () + VK_KHR_sampler_ycbcr_conversion DONE () + VK_KHR_shader_draw_parameters DONE () + VK_KHR_storage_buffer_storage_class DONE () + VK_KHR_variable_pointers DONE () Khronos extensions that are not part of any Vulkan version: VK_KHR_8bit_storage DONE (anv) -- 2.17.1 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] Couple patches for debian-experimental mesa branch
[PATCH 1/2] Remove libtxc-dxtn* recommends for S3TC [PATCH 2/2] Rename --enable-gallium-llvm to --enable-llvm Fabio ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] GL3: remove radeonsi occurrences in GL 4.2, already specified as "all DONE"
Thanks. Feel free to push, as I don't have commit privilege. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] GL3: remove radeonsi occurrences in GL 4.2, already specified as "all DONE"
--- docs/GL3.txt | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/GL3.txt b/docs/GL3.txt index bb2bb6e..5a6be41 100644 --- a/docs/GL3.txt +++ b/docs/GL3.txt @@ -148,17 +148,17 @@ GL 4.1, GLSL 4.10 --- all DONE: nvc0, r600, radeonsi GL 4.2, GLSL 4.20 -- all DONE: radeonsi - GL_ARB_texture_compression_bptc DONE (i965, nvc0, r600, radeonsi) + GL_ARB_texture_compression_bptc DONE (i965, nvc0, r600) GL_ARB_compressed_texture_pixel_storage DONE (all drivers) - GL_ARB_shader_atomic_counters DONE (i965, nvc0, radeonsi, softpipe) + GL_ARB_shader_atomic_counters DONE (i965, nvc0, softpipe) GL_ARB_texture_storageDONE (all drivers) - GL_ARB_transform_feedback_instanced DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_base_instance DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_shader_image_load_storeDONE (i965, radeonsi, softpipe) + GL_ARB_transform_feedback_instanced DONE (i965, nv50, nvc0, r600, llvmpipe, softpipe) + GL_ARB_base_instance DONE (i965, nv50, nvc0, r600, llvmpipe, softpipe) + GL_ARB_shader_image_load_storeDONE (i965, softpipe) GL_ARB_conservative_depth DONE (all drivers that support GLSL 1.30) GL_ARB_shading_language_420pack DONE (all drivers that support GLSL 1.30) GL_ARB_shading_language_packing DONE (all drivers) - GL_ARB_internalformat_query DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_internalformat_query DONE (i965, nv50, nvc0, r600, llvmpipe, softpipe) GL_ARB_map_buffer_alignment DONE (all drivers) -- 2.5.0 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] docs/index.html: fix typo
--- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 138447f..e28c63d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -28,7 +28,7 @@ This is a bug-fix release. This is a bug-fix release. NOTE: It is anticipated that 10.6.9 will be the final release in the 10.6 -series. Users of 10.5 are encouraged to migrate to the 11.0 series in order +series. Users of 10.6 are encouraged to migrate to the 11.0 series in order to obtain future fixes. -- 2.5.0 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] docs/index.html: fix typo
--- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 138447f..e28c63d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -28,7 +28,7 @@ This is a bug-fix release. This is a bug-fix release. NOTE: It is anticipated that 10.6.9 will be the final release in the 10.6 -series. Users of 10.5 are encouraged to migrate to the 11.0 series in order +series. Users of 10.6 are encouraged to migrate to the 11.0 series in order to obtain future fixes. -- 2.1.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] docs/GL3.txt: consolidate nvc0 status
Yes, thanks. Il 28/lug/2015 11:27 PM, Ilia Mirkin imir...@alum.mit.edu ha scritto: Fine by me. Do you need someone to commit this? On Tue, Jul 28, 2015 at 2:53 PM, Fabio Pedretti fabio@libero.it wrote: --- docs/GL3.txt | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/GL3.txt b/docs/GL3.txt index 15bb57f..2e2a7e3 100644 --- a/docs/GL3.txt +++ b/docs/GL3.txt @@ -92,11 +92,11 @@ GL 3.3, GLSL 3.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, soft GL_ARB_vertex_type_2_10_10_10_rev DONE () -GL 4.0, GLSL 4.00: +GL 4.0, GLSL 4.00 --- all DONE: nvc0 - GL_ARB_draw_buffers_blend DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_draw_indirect DONE (i965, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_gpu_shader5 DONE (i965, nvc0) + GL_ARB_draw_buffers_blend DONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_draw_indirect DONE (i965, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_gpu_shader5 DONE (i965) - 'precise' qualifier DONE - Dynamically uniform sampler array indices DONE (r600, radeonsi, softpipe) - Dynamically uniform UBO array indices DONE (r600, radeonsi) @@ -109,26 +109,26 @@ GL 4.0, GLSL 4.00: - Enhanced per-sample shading DONE (r600, radeonsi) - Interpolation functions DONE (r600) - New overload resolution rules DONE - GL_ARB_gpu_shader_fp64 DONE (nvc0, radeonsi, llvmpipe, softpipe) - GL_ARB_sample_shading DONE (i965, nv50, nvc0, r600, radeonsi) - GL_ARB_shader_subroutine DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_tessellation_shader DONE (nvc0, radeonsi) - GL_ARB_texture_buffer_object_rgb32 DONE (i965, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_texture_cube_map_array DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_texture_gather DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_texture_query_lod DONE (i965, nv50, nvc0, r600, radeonsi) - GL_ARB_transform_feedback2 DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_transform_feedback3 DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_gpu_shader_fp64 DONE (radeonsi, llvmpipe, softpipe) + GL_ARB_sample_shading DONE (i965, nv50, r600, radeonsi) + GL_ARB_shader_subroutine DONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_tessellation_shader DONE (radeonsi) + GL_ARB_texture_buffer_object_rgb32 DONE (i965, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_texture_cube_map_array DONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_texture_gather DONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_texture_query_lod DONE (i965, nv50, r600, radeonsi) + GL_ARB_transform_feedback2 DONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_transform_feedback3 DONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) -GL 4.1, GLSL 4.10: +GL 4.1, GLSL 4.10 --- all DONE: nvc0 - GL_ARB_ES2_compatibility DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_ES2_compatibility DONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) GL_ARB_get_program_binary DONE (0 binary formats) GL_ARB_separate_shader_objects DONE (all drivers) GL_ARB_shader_precision DONE (all drivers that support GLSL 4.10) - GL_ARB_vertex_attrib_64bit DONE (nvc0, radeonsi, llvmpipe, softpipe) - GL_ARB_viewport_array DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe) + GL_ARB_vertex_attrib_64bit DONE (radeonsi, llvmpipe, softpipe) + GL_ARB_viewport_array DONE (i965, nv50, r600, radeonsi, llvmpipe
[Mesa-dev] [PATCH] docs/GL3.txt: consolidate nvc0 status
--- docs/GL3.txt | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/GL3.txt b/docs/GL3.txt index 15bb57f..2e2a7e3 100644 --- a/docs/GL3.txt +++ b/docs/GL3.txt @@ -92,11 +92,11 @@ GL 3.3, GLSL 3.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, soft GL_ARB_vertex_type_2_10_10_10_rev DONE () -GL 4.0, GLSL 4.00: +GL 4.0, GLSL 4.00 --- all DONE: nvc0 - GL_ARB_draw_buffers_blendDONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_draw_indirect DONE (i965, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_gpu_shader5 DONE (i965, nvc0) + GL_ARB_draw_buffers_blendDONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_draw_indirect DONE (i965, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_gpu_shader5 DONE (i965) - 'precise' qualifierDONE - Dynamically uniform sampler array indices DONE (r600, radeonsi, softpipe) - Dynamically uniform UBO array indices DONE (r600, radeonsi) @@ -109,26 +109,26 @@ GL 4.0, GLSL 4.00: - Enhanced per-sample shadingDONE (r600, radeonsi) - Interpolation functionsDONE (r600) - New overload resolution rules DONE - GL_ARB_gpu_shader_fp64 DONE (nvc0, radeonsi, llvmpipe, softpipe) - GL_ARB_sample_shadingDONE (i965, nv50, nvc0, r600, radeonsi) - GL_ARB_shader_subroutine DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_tessellation_shader DONE (nvc0, radeonsi) - GL_ARB_texture_buffer_object_rgb32 DONE (i965, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_texture_cube_map_arrayDONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_texture_gatherDONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_texture_query_lod DONE (i965, nv50, nvc0, r600, radeonsi) - GL_ARB_transform_feedback2 DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) - GL_ARB_transform_feedback3 DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_gpu_shader_fp64 DONE (radeonsi, llvmpipe, softpipe) + GL_ARB_sample_shadingDONE (i965, nv50, r600, radeonsi) + GL_ARB_shader_subroutine DONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_tessellation_shader DONE (radeonsi) + GL_ARB_texture_buffer_object_rgb32 DONE (i965, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_texture_cube_map_arrayDONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_texture_gatherDONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_texture_query_lod DONE (i965, nv50, r600, radeonsi) + GL_ARB_transform_feedback2 DONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_transform_feedback3 DONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) -GL 4.1, GLSL 4.10: +GL 4.1, GLSL 4.10 --- all DONE: nvc0 - GL_ARB_ES2_compatibility DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_ES2_compatibility DONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe) GL_ARB_get_program_binaryDONE (0 binary formats) GL_ARB_separate_shader_objects DONE (all drivers) GL_ARB_shader_precision DONE (all drivers that support GLSL 4.10) - GL_ARB_vertex_attrib_64bit DONE (nvc0, radeonsi, llvmpipe, softpipe) - GL_ARB_viewport_arrayDONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe) + GL_ARB_vertex_attrib_64bit DONE (radeonsi, llvmpipe, softpipe) + GL_ARB_viewport_arrayDONE (i965, nv50, r600, radeonsi, llvmpipe) GL 4.2, GLSL 4.20: -- 2.1.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] configure.ac: fix typo in error message
--- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1e5e496..b3d8a92 100644 --- a/configure.ac +++ b/configure.ac @@ -287,7 +287,7 @@ case x$enable_static$enable_shared in xnoyes ) ;; * ) -AC_MSG_WARN([Messa build supports only shared libraries, enabling shared]) +AC_MSG_WARN([Mesa build supports only shared libraries, enabling shared]) enable_shared=yes enable_static=no ;; -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] Build patches v2
Updated patches with the following changes: [PATCH 1/2] glx/dri2: fix build failure on HURD - improved commit message (thanks to Matt Turner and Ian Romanick) - added Cc: for 10.1 [PATCH 2/2] configure.ac: consolidate dependencies version check - added a missing $ (thanks to Matt Turner) - added Reviewed-by: ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/2] glx/dri2: fix build failure on HURD
From: Julien Cristau jcris...@debian.org Patch from Debian package. Cc: 10.1 mesa-sta...@lists.freedesktop.org --- src/glx/dri2_query_renderer.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c index b50a202..95560cb 100644 --- a/src/glx/dri2_query_renderer.c +++ b/src/glx/dri2_query_renderer.c @@ -20,6 +20,9 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ + +#if defined(GLX_DIRECT_RENDERING) !defined(GLX_USE_APPLEGL) + #include glxclient.h #include glx_error.h #include xf86drm.h @@ -95,3 +98,5 @@ dri2_query_renderer_string(struct glx_screen *base, int attribute, return psc-rendererQuery-queryString(psc-driScreen, dri_attribute, value); } + +#endif /* GLX_DIRECT_RENDERING */ -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 2/2] configure.ac: consolidate dependencies version check
Reviewed-by: Matt Turner matts...@gmail.com --- configure.ac | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 0e0fd18..5f6f4cd 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,13 @@ DRI3PROTO_REQUIRED=1.0 PRESENTPROTO_REQUIRED=1.0 LIBUDEV_REQUIRED=151 GLPROTO_REQUIRED=1.4.14 +LIBOMXIL_BELLAGIO_REQUIRED=0.0 +VDPAU_REQUIRED=0.4.1 +WAYLAND_REQUIRED=1.2.0 +XCBDRI2_REQUIRED=1.8 +XCBGLX_REQUIRED=1.8.1 +XSHMFENCE_REQUIRED=1.1 +XVMC_REQUIRED=1.0.6 dnl Check for progs AC_PROG_CPP @@ -855,10 +862,10 @@ xyesno) fi # find the DRI deps for libGL -dri_modules=x11 xext xdamage xfixes x11-xcb xcb-glx = 1.8.1 xcb-dri2 = 1.8 +dri_modules=x11 xext xdamage xfixes x11-xcb xcb-glx = $XCBGLX_REQUIRED xcb-dri2 = $XCBDRI2_REQUIRED if test x$enable_dri3 = xyes; then -dri_modules=$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence = 1.1 +dri_modules=$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence = $XSHMFENCE_REQUIRED fi # add xf86vidmode if available @@ -1284,20 +1291,20 @@ if test -n $with_gallium_drivers; then fi if test x$enable_xvmc = xyes; then -PKG_CHECK_MODULES([XVMC], [xvmc = 1.0.6 x11-xcb xcb-dri2 = 1.8]) +PKG_CHECK_MODULES([XVMC], [xvmc = $XVMC_REQUIRED x11-xcb xcb-dri2 = $XCBDRI2_REQUIRED]) GALLIUM_STATE_TRACKERS_DIRS=$GALLIUM_STATE_TRACKERS_DIRS xvmc fi AM_CONDITIONAL(HAVE_ST_XVMC, test x$enable_xvmc = xyes) if test x$enable_vdpau = xyes; then -PKG_CHECK_MODULES([VDPAU], [vdpau = 0.4.1 x11-xcb xcb-dri2 = 1.8], +PKG_CHECK_MODULES([VDPAU], [vdpau = $VDPAU_REQUIRED x11-xcb xcb-dri2 = $XCBDRI2_REQUIRED], [VDPAU_LIBS=`$PKG_CONFIG --libs x11-xcb xcb-dri2`]) GALLIUM_STATE_TRACKERS_DIRS=$GALLIUM_STATE_TRACKERS_DIRS vdpau fi AM_CONDITIONAL(HAVE_ST_VDPAU, test x$enable_vdpau = xyes) if test x$enable_omx = xyes; then -PKG_CHECK_MODULES([OMX], [libomxil-bellagio = 0.0 x11-xcb xcb-dri2 = 1.8]) +PKG_CHECK_MODULES([OMX], [libomxil-bellagio = $LIBOMXIL_BELLAGIO_REQUIRED x11-xcb xcb-dri2 = $XCBDRI2_REQUIRED]) GALLIUM_STATE_TRACKERS_DIRS=$GALLIUM_STATE_TRACKERS_DIRS omx fi AM_CONDITIONAL(HAVE_ST_OMX, test x$enable_omx = xyes) @@ -1410,7 +1417,7 @@ egl_platforms=`IFS=', '; echo $with_egl_platforms` for plat in $egl_platforms; do case $plat in wayland) - PKG_CHECK_MODULES([WAYLAND], [wayland-client = 1.2.0 wayland-server = 1.2.0]) + PKG_CHECK_MODULES([WAYLAND], [wayland-client = $WAYLAND_REQUIRED wayland-server = $WAYLAND_REQUIRED]) GALLIUM_WINSYS_DIRS=$GALLIUM_WINSYS_DIRS sw/wayland WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` @@ -1419,7 +1426,7 @@ for plat in $egl_platforms; do ;; x11) - PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 = 1.8 xcb-xfixes]) + PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 = $XCBDRI2_REQUIRED xcb-xfixes]) ;; drm) -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 2/2] configure.ac: consolidate dependencies version check
--- configure.ac | 21 ++--- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 0e0fd18..a6ce794 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,13 @@ DRI3PROTO_REQUIRED=1.0 PRESENTPROTO_REQUIRED=1.0 LIBUDEV_REQUIRED=151 GLPROTO_REQUIRED=1.4.14 +LIBOMXIL_BELLAGIO_REQUIRED=0.0 +VDPAU_REQUIRED=0.4.1 +WAYLAND_REQUIRED=1.2.0 +XCBDRI2_REQUIRED=1.8 +XCBGLX_REQUIRED=1.8.1 +XSHMFENCE_REQUIRED=1.1 +XVMC_REQUIRED=1.0.6 dnl Check for progs AC_PROG_CPP @@ -855,10 +862,10 @@ xyesno) fi # find the DRI deps for libGL -dri_modules=x11 xext xdamage xfixes x11-xcb xcb-glx = 1.8.1 xcb-dri2 = 1.8 +dri_modules=x11 xext xdamage xfixes x11-xcb xcb-glx = $XCBGLX_REQUIRED xcb-dri2 = $XCBDRI2_REQUIRED if test x$enable_dri3 = xyes; then -dri_modules=$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence = 1.1 +dri_modules=$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence = $XSHMFENCE_REQUIRED fi # add xf86vidmode if available @@ -1284,20 +1291,20 @@ if test -n $with_gallium_drivers; then fi if test x$enable_xvmc = xyes; then -PKG_CHECK_MODULES([XVMC], [xvmc = 1.0.6 x11-xcb xcb-dri2 = 1.8]) +PKG_CHECK_MODULES([XVMC], [xvmc = $XVMC_REQUIRED x11-xcb xcb-dri2 = $XCBDRI2_REQUIRED]) GALLIUM_STATE_TRACKERS_DIRS=$GALLIUM_STATE_TRACKERS_DIRS xvmc fi AM_CONDITIONAL(HAVE_ST_XVMC, test x$enable_xvmc = xyes) if test x$enable_vdpau = xyes; then -PKG_CHECK_MODULES([VDPAU], [vdpau = 0.4.1 x11-xcb xcb-dri2 = 1.8], +PKG_CHECK_MODULES([VDPAU], [vdpau = $VDPAU_REQUIRED x11-xcb xcb-dri2 = $XCBDRI2_REQUIRED], [VDPAU_LIBS=`$PKG_CONFIG --libs x11-xcb xcb-dri2`]) GALLIUM_STATE_TRACKERS_DIRS=$GALLIUM_STATE_TRACKERS_DIRS vdpau fi AM_CONDITIONAL(HAVE_ST_VDPAU, test x$enable_vdpau = xyes) if test x$enable_omx = xyes; then -PKG_CHECK_MODULES([OMX], [libomxil-bellagio = 0.0 x11-xcb xcb-dri2 = 1.8]) +PKG_CHECK_MODULES([OMX], [libomxil-bellagio = $LIBOMXIL_BELLAGIO_REQUIRED x11-xcb xcb-dri2 = $XCBDRI2_REQUIRED]) GALLIUM_STATE_TRACKERS_DIRS=$GALLIUM_STATE_TRACKERS_DIRS omx fi AM_CONDITIONAL(HAVE_ST_OMX, test x$enable_omx = xyes) @@ -1410,7 +1417,7 @@ egl_platforms=`IFS=', '; echo $with_egl_platforms` for plat in $egl_platforms; do case $plat in wayland) - PKG_CHECK_MODULES([WAYLAND], [wayland-client = 1.2.0 wayland-server = 1.2.0]) + PKG_CHECK_MODULES([WAYLAND], [wayland-client = $WAYLAND_REQUIRED wayland-server = $WAYLAND_REQUIRED]) GALLIUM_WINSYS_DIRS=$GALLIUM_WINSYS_DIRS sw/wayland WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` @@ -1419,7 +1426,7 @@ for plat in $egl_platforms; do ;; x11) - PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 = 1.8 xcb-xfixes]) + PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 = XCBDRI2_REQUIRED xcb-xfixes]) ;; drm) -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/2] glx/dri2: fix FTBFS on hurd
From: Julien Cristau jcris...@debian.org --- src/glx/dri2_query_renderer.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c index b50a202..95560cb 100644 --- a/src/glx/dri2_query_renderer.c +++ b/src/glx/dri2_query_renderer.c @@ -20,6 +20,9 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ + +#if defined(GLX_DIRECT_RENDERING) !defined(GLX_USE_APPLEGL) + #include glxclient.h #include glx_error.h #include xf86drm.h @@ -95,3 +98,5 @@ dri2_query_renderer_string(struct glx_screen *base, int attribute, return psc-rendererQuery-queryString(psc-driScreen, dri_attribute, value); } + +#endif /* GLX_DIRECT_RENDERING */ -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 2/2] docs: update 10.0 relnotes for GL_NV_vdpau_interop
Cc: 10.0 mesa-sta...@lists.freedesktop.org --- docs/relnotes/10.0.html | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/relnotes/10.0.html b/docs/relnotes/10.0.html index eabe77f..bbb447f 100644 --- a/docs/relnotes/10.0.html +++ b/docs/relnotes/10.0.html @@ -55,6 +55,7 @@ Note: some of the new features are only available with certain drivers. liGL_ARB_vertex_attrib_binding/li liGL_ARB_vertex_type_10f_11f_11f_rev on i965 and r600g/li liGL_KHR_debug/li +liGL_NV_vdpau_interop on gallium drivers/li /ul -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/2] gallium: fix build on GNU/Hurd due to missing PIPE_OS_HURD detection
From: Cyril Brulebois k...@debian.org
Thanks to Pino Toscano.
Patch from Debian package.
Cc: 10.0 mesa-sta...@lists.freedesktop.org
---
src/gallium/auxiliary/os/os_thread.h | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/gallium/auxiliary/os/os_thread.h
b/src/gallium/auxiliary/os/os_thread.h
index e153ab4..4528abb 100644
--- a/src/gallium/auxiliary/os/os_thread.h
+++ b/src/gallium/auxiliary/os/os_thread.h
@@ -41,7 +41,7 @@
#include util/u_debug.h /* for assert */
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
|| defined(PIPE_OS_HURD)
#include pthread.h /* POSIX threads headers */
#include stdio.h /* for perror() */
@@ -316,7 +316,7 @@ typedef int64_t pipe_condvar;
* pipe_barrier
*/
-#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) ||
defined(PIPE_OS_SOLARIS)) !defined(PIPE_OS_ANDROID)
+#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) ||
defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HURD)) !defined(PIPE_OS_ANDROID)
typedef pthread_barrier_t pipe_barrier;
@@ -444,7 +444,7 @@ pipe_semaphore_wait(pipe_semaphore *sema)
*/
typedef struct {
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
|| defined(PIPE_OS_HURD)
pthread_key_t key;
#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
DWORD key;
@@ -459,7 +459,7 @@ typedef struct {
static INLINE void
pipe_tsd_init(pipe_tsd *tsd)
{
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
|| defined(PIPE_OS_HURD)
if (pthread_key_create(tsd-key, NULL/*free*/) != 0) {
perror(pthread_key_create(): failed to allocate key for thread specific
data);
exit(-1);
@@ -476,7 +476,7 @@ pipe_tsd_get(pipe_tsd *tsd)
if (tsd-initMagic != (int) PIPE_TSD_INIT_MAGIC) {
pipe_tsd_init(tsd);
}
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
|| defined(PIPE_OS_HURD)
return pthread_getspecific(tsd-key);
#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
assert(0);
@@ -493,7 +493,7 @@ pipe_tsd_set(pipe_tsd *tsd, void *value)
if (tsd-initMagic != (int) PIPE_TSD_INIT_MAGIC) {
pipe_tsd_init(tsd);
}
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
|| defined(PIPE_OS_HURD)
if (pthread_setspecific(tsd-key, value) != 0) {
perror(pthread_set_specific() failed);
exit(-1);
--
1.8.3.2
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] R: Re: [PATCH 1/2] gallium: fix build on GNU/Hurd due to missing PIPE_OS_HURD detection
Looks OK to me. Do you need someone to commit this for you? Yes, thanks. -Brian ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] R: Re: [PATCH 2/2] docs: update 10.0 relnotes for GL_NV_vdpau_interop
Da: bri...@vmware.com Data: 12/11/2013 16.39 A: mesa-dev@lists.freedesktop.org Ogg: Re: [Mesa-dev] [PATCH 2/2] docs: update 10.0 relnotes for GL_NV_vdpau_interop On 11/12/2013 02:51 AM, Fabio Pedretti wrote: Cc: 10.0 mesa-sta...@lists.freedesktop.org --- docs/relnotes/10.0.html | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/relnotes/10.0.html b/docs/relnotes/10.0.html index eabe77f..bbb447f 100644 --- a/docs/relnotes/10.0.html +++ b/docs/relnotes/10.0.html @@ -55,6 +55,7 @@ Note: some of the new features are only available with certain drivers. liGL_ARB_vertex_attrib_binding/li liGL_ARB_vertex_type_10f_11f_11f_rev on i965 and r600g/li liGL_KHR_debug/li +liGL_NV_vdpau_interop on gallium drivers/li /ul All gallium drivers? If not, maybe say some gallium drivers or list the ones that support it. The extension is enabled on the two I tried, llvmpipe and r300 (even if they both no longer have the vdpau state tracker). I have no idea how much it is useful on them, however. -Brian ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] Fix FTBFS on GNU/Hurd due to missing PIPE_OS_HURD detection.
From: Cyril Brulebois k...@debian.org
Thanks to Pino Toscano.
Patch from Debian package.
---
src/gallium/auxiliary/os/os_thread.h | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/gallium/auxiliary/os/os_thread.h
b/src/gallium/auxiliary/os/os_thread.h
index e153ab4..4528abb 100644
--- a/src/gallium/auxiliary/os/os_thread.h
+++ b/src/gallium/auxiliary/os/os_thread.h
@@ -41,7 +41,7 @@
#include util/u_debug.h /* for assert */
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
|| defined(PIPE_OS_HURD)
#include pthread.h /* POSIX threads headers */
#include stdio.h /* for perror() */
@@ -316,7 +316,7 @@ typedef int64_t pipe_condvar;
* pipe_barrier
*/
-#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) ||
defined(PIPE_OS_SOLARIS)) !defined(PIPE_OS_ANDROID)
+#if (defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) ||
defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HURD)) !defined(PIPE_OS_ANDROID)
typedef pthread_barrier_t pipe_barrier;
@@ -444,7 +444,7 @@ pipe_semaphore_wait(pipe_semaphore *sema)
*/
typedef struct {
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
|| defined(PIPE_OS_HURD)
pthread_key_t key;
#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
DWORD key;
@@ -459,7 +459,7 @@ typedef struct {
static INLINE void
pipe_tsd_init(pipe_tsd *tsd)
{
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
|| defined(PIPE_OS_HURD)
if (pthread_key_create(tsd-key, NULL/*free*/) != 0) {
perror(pthread_key_create(): failed to allocate key for thread specific
data);
exit(-1);
@@ -476,7 +476,7 @@ pipe_tsd_get(pipe_tsd *tsd)
if (tsd-initMagic != (int) PIPE_TSD_INIT_MAGIC) {
pipe_tsd_init(tsd);
}
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
|| defined(PIPE_OS_HURD)
return pthread_getspecific(tsd-key);
#elif defined(PIPE_SUBSYSTEM_WINDOWS_USER)
assert(0);
@@ -493,7 +493,7 @@ pipe_tsd_set(pipe_tsd *tsd, void *value)
if (tsd-initMagic != (int) PIPE_TSD_INIT_MAGIC) {
pipe_tsd_init(tsd);
}
-#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
+#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
|| defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) || defined(PIPE_OS_CYGWIN)
|| defined(PIPE_OS_HURD)
if (pthread_setspecific(tsd-key, value) != 0) {
perror(pthread_set_specific() failed);
exit(-1);
--
1.8.3.2
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] R: Re: [PATCH 3/4] mesa: fix build on kFreeBSD
Done, I also improved commit message of patches 3 and 4. Updated patches follow. I think we could simplify this a bit. 2013/11/5 Fabio Pedretti fabio@libero.it: From: Aurelien Jarno aure...@debian.org From: Cyril Brulebois k...@debian.org mesa fails to build on GNU/kFreeBSD, since some parts are not enabled. Debian bug: http://bugs.debian.org/524690 Patch from Debian package --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 0a25047..e250734 100644 --- a/configure.ac +++ b/configure.ac @@ -425,7 +425,7 @@ if test x$enable_asm = xyes; then case $host_cpu in i?86) case $host_os in -linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*) +linux* | *freebsd* | dragonfly* | *netbsd* | openbsd* | kfreebsd*- gnu*) *freebsd* already includes kfreebsd*-gnu* test x$enable_64bit = xyes asm_arch=x86_64 || asm_arch=x86 ;; gnu*) @@ -435,7 +435,7 @@ if test x$enable_asm = xyes; then ;; x86_64|amd64) case $host_os in -linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*) +linux* | *freebsd* | dragonfly* | *netbsd* | openbsd* | kfreebsd*- gnu*) same as above test x$enable_32bit = xyes asm_arch=x86 || asm_arch=x86_64 ;; esac @@ -974,7 +974,7 @@ if test x$enable_dri = xyes; then ;; esac ;; -freebsd* | dragonfly* | *netbsd* | openbsd*) +freebsd* | dragonfly* | *netbsd* | openbsd* | kfreebsd*-gnu*) To be consistent we could use *freebsd* as well. Andreas. DEFINES=$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1 DEFINES=$DEFINES -DHAVE_ALIAS -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 3/4] configure.ac: fix build on GNU/kFreeBSD
Based on existing patch from Debian package. Debian bug: http://bugs.debian.org/524690 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0a25047..989168a 100644 --- a/configure.ac +++ b/configure.ac @@ -974,7 +974,7 @@ if test x$enable_dri = xyes; then ;; esac ;; -freebsd* | dragonfly* | *netbsd* | openbsd*) +*freebsd* | dragonfly* | *netbsd* | openbsd*) DEFINES=$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1 DEFINES=$DEFINES -DHAVE_ALIAS -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 4/4] gallium: fix build on GNU/kFreeBSD
Patch from Debian package --- src/gallium/auxiliary/rtasm/rtasm_execmem.c | 2 +- src/gallium/include/pipe/p_config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/rtasm/rtasm_execmem.c b/src/gallium/auxiliary/rtasm/rtasm_execmem.c index 3c4b048..edc1b66 100644 --- a/src/gallium/auxiliary/rtasm/rtasm_execmem.c +++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.c @@ -38,7 +38,7 @@ #include rtasm_execmem.h -#if defined(PIPE_OS_BSD) +#ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h index 9bccf32..64acd02 100644 --- a/src/gallium/include/pipe/p_config.h +++ b/src/gallium/include/pipe/p_config.h @@ -190,7 +190,7 @@ #define PIPE_OS_ANDROID #endif -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #define PIPE_OS_FREEBSD #define PIPE_OS_BSD #define PIPE_OS_UNIX -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 4/4] mesa: fix build on kFreeBSD
Patch from Debian package --- src/gallium/auxiliary/rtasm/rtasm_execmem.c | 2 +- src/gallium/include/pipe/p_config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/rtasm/rtasm_execmem.c b/src/gallium/auxiliary/rtasm/rtasm_execmem.c index 3c4b048..edc1b66 100644 --- a/src/gallium/auxiliary/rtasm/rtasm_execmem.c +++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.c @@ -38,7 +38,7 @@ #include rtasm_execmem.h -#if defined(PIPE_OS_BSD) +#ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h index 9bccf32..64acd02 100644 --- a/src/gallium/include/pipe/p_config.h +++ b/src/gallium/include/pipe/p_config.h @@ -190,7 +190,7 @@ #define PIPE_OS_ANDROID #endif -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #define PIPE_OS_FREEBSD #define PIPE_OS_BSD #define PIPE_OS_UNIX -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 3/4] mesa: fix build on kFreeBSD
From: Aurelien Jarno aure...@debian.org From: Cyril Brulebois k...@debian.org mesa fails to build on GNU/kFreeBSD, since some parts are not enabled. Debian bug: http://bugs.debian.org/524690 Patch from Debian package --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 0a25047..e250734 100644 --- a/configure.ac +++ b/configure.ac @@ -425,7 +425,7 @@ if test x$enable_asm = xyes; then case $host_cpu in i?86) case $host_os in -linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*) +linux* | *freebsd* | dragonfly* | *netbsd* | openbsd* | kfreebsd*-gnu*) test x$enable_64bit = xyes asm_arch=x86_64 || asm_arch=x86 ;; gnu*) @@ -435,7 +435,7 @@ if test x$enable_asm = xyes; then ;; x86_64|amd64) case $host_os in -linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*) +linux* | *freebsd* | dragonfly* | *netbsd* | openbsd* | kfreebsd*-gnu*) test x$enable_32bit = xyes asm_arch=x86 || asm_arch=x86_64 ;; esac @@ -974,7 +974,7 @@ if test x$enable_dri = xyes; then ;; esac ;; -freebsd* | dragonfly* | *netbsd* | openbsd*) +freebsd* | dragonfly* | *netbsd* | openbsd* | kfreebsd*-gnu*) DEFINES=$DEFINES -DHAVE_PTHREAD -DUSE_EXTERNAL_DXTN_LIB=1 DEFINES=$DEFINES -DHAVE_ALIAS -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/4] r600/compute: silence unused var warning
---
src/gallium/drivers/r600/evergreen_compute.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/gallium/drivers/r600/evergreen_compute.c
b/src/gallium/drivers/r600/evergreen_compute.c
index ea77f5e..ffdc5c3 100644
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -392,7 +392,6 @@ static void compute_emit_cs(struct r600_context *ctx, const
uint *block_layout,
const uint *grid_layout)
{
struct radeon_winsys_cs *cs = ctx-b.rings.gfx.cs;
- unsigned flush_flags = 0;
int i;
/* make sure that the gfx ring is only one active */
--
1.8.3.2
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 2/4] mesa: add aarch64 support
Patch from Ubuntu package --- src/mesa/main/compiler.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index 2820913..65c4141 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -312,6 +312,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x) defined(__hppa__) || defined(hpux) || \ defined(__mips) || defined(_MIPS_ARCH) || \ defined(__arm__) || \ +defined(__aarch64__) || \ defined(__sh__) || defined(__m32r__) || \ (defined(__sun) defined(_IEEE_754)) || \ defined(__alpha__) -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] R: Re: [PATCH 2/4] mesa: add aarch64 support
On 11/05/2013 04:49 AM, Fabio Pedretti wrote: Patch from Ubuntu package --- src/mesa/main/compiler.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index 2820913..65c4141 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -312,6 +312,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x) defined(__hppa__) || defined(hpux) || \ defined(__mips) || defined(_MIPS_ARCH) || \ defined(__arm__) || \ +defined(__aarch64__) || \ defined(__sh__) || defined(__m32r__) || \ (defined(__sun) defined(_IEEE_754)) || \ defined(__alpha__) I believe that's Arm64, right? If so, it could go on the same line as the __arm__ check. That would follow the pattern of preceding HP and MIPS checks. But not a big deal. I sent a new patch with clarified commit message and put on the same line. Reviewed-by: Brian Paul bri...@vmware.com ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] r600: silence unused var warning
diff --git a/src/gallium/drivers/r600/evergreen_compute.c
b/src/gallium/drivers/r600/evergreen_compute.c
index ea77f5e..ffdc5c3 100644
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -392,7 +392,6 @@ static void compute_emit_cs(struct r600_context *ctx, const
uint *block_layout,
const uint *grid_layout)
{
struct radeon_winsys_cs *cs = ctx-b.rings.gfx.cs;
- unsigned flush_flags = 0;
int i;
/* make sure that the gfx ring is only one active */
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] wayland: silence unused var warning
diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c
b/src/egl/wayland/wayland-drm/wayland-drm.c
index 2f5acb2..e9c6e0a 100644
--- a/src/egl/wayland/wayland-drm/wayland-drm.c
+++ b/src/egl/wayland/wayland-drm/wayland-drm.c
@@ -247,8 +247,6 @@ bind_drm(struct wl_client *client, void *data, uint32_t
version, uint32_t id)
struct wl_drm_buffer *
wayland_drm_buffer_get(struct wl_drm *drm, struct wl_resource *resource)
{
- struct wl_drm_buffer *buffer;
-
if (resource == NULL)
return NULL;
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] i965: silence unused var warning in non-debug mode
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs.c
b/src/mesa/drivers/dri/i965/brw_vec4_gs.c
index b52d646..2ae5818 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_vec4_gs.c
@@ -283,9 +283,7 @@ brw_upload_gs_prog(struct brw_context *brw)
if (!brw_search_cache(brw-cache, BRW_GS_PROG,
key, sizeof(key),
stage_state-prog_offset, brw-gs.prog_data)) {
- bool success = do_gs_prog(brw, ctx-Shader.CurrentGeometryProgram,
-gp, key);
- assert(success);
+ assert(do_gs_prog(brw, ctx-Shader.CurrentGeometryProgram, gp, key));
}
brw-gs.base.prog_data = brw-gs.prog_data-base.base;
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] update wayland requirement
Since 8d29b52 wayland 1.2.0 is required.--- configure.ac2013-08-12 13:17:10.0 +0200 +++ configure.ac2013-08-12 13:19:15.0 +0200 @@ -1433,7 +1433,7 @@ egl_platforms=`IFS=', '; echo $with_egl_ for plat in $egl_platforms; do case $plat in wayland) - PKG_CHECK_MODULES([WAYLAND], [wayland-client = 1.0.2 wayland-server = 1.0.2]) + PKG_CHECK_MODULES([WAYLAND], [wayland-client = 1.2.0 wayland-server = 1.2.0]) GALLIUM_WINSYS_DIRS=$GALLIUM_WINSYS_DIRS sw/wayland WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] Build with optimization + debug and 'Mesa errors' messages
After commit 122345876 there is no way to change compiler optimization flag on a debug build, since -O0 gets added after your CFLAGS. Can this be changed? Also it would be nice to always enable, also on non debug builds, the messages about Mesa errors in output_if_debug. It can be enabled with MESA_DEBUG env var, but having it enabled by default could help to detect possible problems, it also won't spam too much the console since it can detect and report duplicate messages without printing it every time. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] R: Re: R: Re: [PATCH] silence unused code warnings
Da: bri...@vmware.com On 12/07/2012 02:59 PM, Fabio Pedretti wrote: Comments below. Thanks, updated patches follow. These look OK to me. Do you need me to commit them for you? Yes, thanks. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] R: Re: [PATCH] silence unused code warnings
Comments below. Thanks, updated patches follow. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] nv50: remove unused OpClassStr array
diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_print.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_print.cpp
index ded4f61..ea81e53 100644
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_print.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_print.cpp
@@ -67,26 +67,6 @@ static void init_colours()
colour = _colour;
}
-static const char *OpClassStr[OPCLASS_OTHER + 1] =
-{
- MOVE,
- LOAD,
- STORE,
- ARITH,
- SHIFT,
- SFU,
- LOGIC,
- COMPARE,
- CONVERT,
- ATOMIC,
- TEXTURE,
- SURFACE,
- FLOW,
- (INVALID),
- PSEUDO,
- OTHER
-};
-
const char *operationStr[OP_LAST + 1] =
{
nop,
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] vega: remove unused variables
diff --git a/src/gallium/state_trackers/vega/path.c b/src/gallium/state_trackers/vega/path.c
index 43755f4..31ec719 100644
--- a/src/gallium/state_trackers/vega/path.c
+++ b/src/gallium/state_trackers/vega/path.c
@@ -1085,10 +1085,8 @@ static INLINE VGubyte normalize_coords(struct path_iter_data *pd,
}
break;
case VG_SCUBIC_TO: {
- VGfloat x0, y0, x1, y1, x2, y2, x3, y3;
+ VGfloat x1, y1, x2, y2, x3, y3;
data_at(pd-coords, pd-path, 0, 4, data);
- x0 = pd-ox;
- y0 = pd-oy;
x1 = 2*pd-ox-pd-px;
y1 = 2*pd-oy-pd-py;
x2 = data[0];
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] R: Re: Gallium versioning, currently at 0.4
So, is there a plan to do it? Da: mar...@gmail.com The Gallium version has no meaning to me. The renderer string could just be ATI RV530. Marek On Wed, Oct 31, 2012 at 6:05 PM, Fabio Pedretti fabio@libero.it wrote: Is there a reason to keep the '0.4' on Gallium renderer string ( 'Gallium 0.4 on ATI RV530' )? It never gets update, although the gallium interface changes, similar to the old DRIVER_DATE that was then removed. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] silence unused code warnings
diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_print.cpp
b/src/gallium/drivers/nv50/codegen/nv50_ir_print.cpp
index ded4f61..ea81e53 100644
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_print.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_print.cpp
@@ -67,26 +67,6 @@ static void init_colours()
colour = _colour;
}
-static const char *OpClassStr[OPCLASS_OTHER + 1] =
-{
- MOVE,
- LOAD,
- STORE,
- ARITH,
- SHIFT,
- SFU,
- LOGIC,
- COMPARE,
- CONVERT,
- ATOMIC,
- TEXTURE,
- SURFACE,
- FLOW,
- (INVALID),
- PSEUDO,
- OTHER
-};
-
const char *operationStr[OP_LAST + 1] =
{
nop,
diff --git a/src/gallium/drivers/nvc0/nvc0_state_validate.c
b/src/gallium/drivers/nvc0/nvc0_state_validate.c
index 0f92614..80a8c01 100644
--- a/src/gallium/drivers/nvc0/nvc0_state_validate.c
+++ b/src/gallium/drivers/nvc0/nvc0_state_validate.c
@@ -3,6 +3,7 @@
#include nvc0_context.h
+#if 0
static void
nvc0_validate_zcull(struct nvc0_context *nvc0)
{
@@ -51,6 +52,7 @@ nvc0_validate_zcull(struct nvc0_context *nvc0)
BEGIN_NVC0(push, NVC0_3D(ZCULL_INVALIDATE), 1);
PUSH_DATA (push, 0);
}
+#endif
static void
nvc0_validate_fb(struct nvc0_context *nvc0)
diff --git a/src/gallium/state_trackers/vega/path.c
b/src/gallium/state_trackers/vega/path.c
index 43755f4..31ec719 100644
--- a/src/gallium/state_trackers/vega/path.c
+++ b/src/gallium/state_trackers/vega/path.c
@@ -1085,10 +1085,8 @@ static INLINE VGubyte normalize_coords(struct
path_iter_data *pd,
}
break;
case VG_SCUBIC_TO: {
- VGfloat x0, y0, x1, y1, x2, y2, x3, y3;
+ VGfloat x1, y1, x2, y2, x3, y3;
data_at(pd-coords, pd-path, 0, 4, data);
- x0 = pd-ox;
- y0 = pd-oy;
x1 = 2*pd-ox-pd-px;
y1 = 2*pd-oy-pd-py;
x2 = data[0];
diff --git a/src/gallium/state_trackers/vega/vg_translate.c
b/src/gallium/state_trackers/vega/vg_translate.c
index 7b3df27..6c1e354 100644
--- a/src/gallium/state_trackers/vega/vg_translate.c
+++ b/src/gallium/state_trackers/vega/vg_translate.c
@@ -201,8 +201,7 @@ void _vega_pack_rgba_span_float(struct vg_context *ctx,
case VG_BW_1: {
VGshort *dst = (VGshort *)dstAddr;
for (i = 0; i n; ++i) {
- VGubyte r, g, b, a;
- VGubyte res;
+ VGubyte r, g, b, a, res;
r = float_to_ubyte(rgba[i][0]);
g = float_to_ubyte(rgba[i][1]);
b = float_to_ubyte(rgba[i][2]);
@@ -229,8 +228,7 @@ void _vega_pack_rgba_span_float(struct vg_context *ctx,
case VG_A_4: {
VGshort *dst = (VGshort *)dstAddr;
for (i = 0; i n; ++i) {
- VGubyte a;
- VGubyte res;
+ VGubyte a, res;
a = float_to_ubyte(rgba[i][3]);
res = a/4;
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] Gallium versioning, currently at 0.4
Is there a reason to keep the '0.4' on Gallium renderer string ( 'Gallium 0.4 on ATI RV530' )? It never gets update, although the gallium interface changes, similar to the old DRIVER_DATE that was then removed. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] R: Re: Default CC list of mesa driver bug
Da: bri...@vmware.com On 09/02/2012 01:42 PM, Fabio Pedretti wrote: I noticed that mesa bug report got CCed to mesa-dev list, while driver mesa bug went to dri-devel. That does seem kind of weird. Is this intended, why don't use mesa-dev for all mesa related bug instead and use dri-devel for libdrm/kernel modules only? Sounds good to me. I guess we'd have to ask one of the fd.o admins to fix that. Any news on this? Eventually older components (i810, TDFX, DRI/r300, ...) could also be removed (possibly moving existing bugs to mesa core). ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] Default CC list of mesa driver bug
I noticed that mesa bug report got CCed to mesa-dev list, while driver mesa bug went to dri-devel. Is this intended, why don't use mesa-dev for all mesa related bug instead and use dri-devel for libdrm/kernel modules only? ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] remove some unused variables
The attached patches remove some unused-but-set-variables from mesa.diff -purN mesa-7.12_orig//src/mesa/drivers/osmesa/osmesa.c mesa-7.12/src/mesa/drivers/osmesa/osmesa.c
--- mesa-7.12_orig//src/mesa/drivers/osmesa/osmesa.c 2011-06-10 12:05:04.0 +0200
+++ mesa-7.12/src/mesa/drivers/osmesa/osmesa.c 2011-10-19 15:48:51.080213224 +0200
@@ -795,14 +795,6 @@ osmesa_renderbuffer_storage(struct gl_co
GLenum internalFormat, GLuint width, GLuint height)
{
const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
- GLint bpc; /* bits per channel */
-
- if (rb-DataType == GL_UNSIGNED_BYTE)
- bpc = 8;
- else if (rb-DataType == GL_UNSIGNED_SHORT)
- bpc = 16;
- else
- bpc = 32;
/* Note: we can ignoring internalFormat for window-system renderbuffers */
(void) internalFormat;
diff --git a/src/gallium/state_trackers/vega/vg_translate.c b/src/gallium/state_trackers/vega/vg_translate.c
index 03575ca..06cc003 100644
--- a/src/gallium/state_trackers/vega/vg_translate.c
+++ b/src/gallium/state_trackers/vega/vg_translate.c
@@ -131,10 +131,7 @@ void _vega_pack_rgba_span_float(struct vg_context *ctx,
case VG_sL_8: {
VGubyte *dst = (VGubyte *)dstAddr;
for (i = 0; i n; ++i) {
- VGubyte r, g, b, a;
- r = float_to_ubyte(rgba[i][0]);
- g = float_to_ubyte(rgba[i][1]);
- b = float_to_ubyte(rgba[i][2]);
+ VGubyte a;
a = float_to_ubyte(rgba[i][3]);
dst[i] = a;
@@ -183,10 +180,7 @@ void _vega_pack_rgba_span_float(struct vg_context *ctx,
case VG_lL_8: {
VGubyte *dst = (VGubyte *)dstAddr;
for (i = 0; i n; ++i) {
- VGubyte r, g, b ,a;
- r = float_to_ubyte(rgba[i][0]);
- g = float_to_ubyte(rgba[i][1]);
- b = float_to_ubyte(rgba[i][2]);
+ VGubyte a;
a = float_to_ubyte(rgba[i][3]);
dst[i] = a;
}
@@ -196,10 +190,7 @@ void _vega_pack_rgba_span_float(struct vg_context *ctx,
case VG_A_8: {
VGubyte *dst = (VGubyte *)dstAddr;
for (i = 0; i n; ++i) {
- VGubyte r, g, b, a;
- r = float_to_ubyte(rgba[i][0]);
- g = float_to_ubyte(rgba[i][1]);
- b = float_to_ubyte(rgba[i][2]);
+ VGubyte a;
a = float_to_ubyte(rgba[i][3]);
dst[i] = a;
@@ -227,10 +218,7 @@ void _vega_pack_rgba_span_float(struct vg_context *ctx,
case VG_A_1: {
VGshort *dst = (VGshort *)dstAddr;
for (i = 0; i n; ++i) {
- VGubyte r, g, b, a;
- r = float_to_ubyte(rgba[i][0]);
- g = float_to_ubyte(rgba[i][1]);
- b = float_to_ubyte(rgba[i][2]);
+ VGubyte a;
a = float_to_ubyte(rgba[i][3]);
dst[i] = (a (128));
@@ -241,11 +229,8 @@ void _vega_pack_rgba_span_float(struct vg_context *ctx,
case VG_A_4: {
VGshort *dst = (VGshort *)dstAddr;
for (i = 0; i n; ++i) {
- VGubyte r, g, b, a;
+ VGubyte a;
VGubyte res;
- r = float_to_ubyte(rgba[i][0]);
- g = float_to_ubyte(rgba[i][1]);
- b = float_to_ubyte(rgba[i][2]);
a = float_to_ubyte(rgba[i][3]);
res = a/4;
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] radeon: further cleanup of shared code
diff --git a/src/mesa/drivers/dri/radeon/radeon_chipset.h b/src/mesa/drivers/dri/radeon/radeon_chipset.h
index 445e085..10cf348 100644
--- a/src/mesa/drivers/dri/radeon/radeon_chipset.h
+++ b/src/mesa/drivers/dri/radeon/radeon_chipset.h
@@ -1,7 +1,5 @@
#ifndef _RADEON_CHIPSET_H
#define _RADEON_CHIPSET_H
-/* Including xf86PciInfo.h introduces a bunch of errors...
- */
/* General chip classes:
* r100 includes R100, RV100, RV200, RS100, RS200, RS250.
@@ -35,13 +33,8 @@ enum {
CHIP_FAMILY_LAST
};
-/* General classes of Radeons, as described above the device ID section */
-#define RADEON_CLASS_R100 (0 0)
-#define RADEON_CLASS_R200 (1 0)
-#define RADEON_CLASS_MASK (3 0)
-
-#define RADEON_CHIPSET_TCL (1 2) /* tcl support - any radeon */
-#define RADEON_CHIPSET_BROKEN_STENCIL (1 3) /* r100 stencil bug */
-#define R200_CHIPSET_YCBCR_BROKEN (1 4) /* r200 ycbcr bug */
+#define RADEON_CHIPSET_TCL (1 0) /* tcl support - any radeon */
+#define RADEON_CHIPSET_BROKEN_STENCIL (1 1) /* r100 stencil bug */
+#define R200_CHIPSET_YCBCR_BROKEN (1 2) /* r200 ycbcr bug */
#endif /* _RADEON_CHIPSET_H */
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index b4190eb..68ac5ba 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -177,9 +177,7 @@ static const __DRItexBufferExtension radeonTexBufferExtension = {
radeonSetTexBuffer,
radeonSetTexBuffer2,
};
-#endif
-
-#if defined(RADEON_R200)
+#elif defined(RADEON_R200)
static const __DRItexBufferExtension r200TexBufferExtension = {
{ __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },
r200SetTexBuffer,
@@ -516,20 +514,12 @@ radeonCreateScreen2(__DRIscreen *sPriv)
if (getenv(R300_NO_TCL))
screen-chip_flags = ~RADEON_CHIPSET_TCL;
-#if defined(RADEON_R100)
- screen-chip_flags |= RADEON_CLASS_R100;
-#elif defined(RADEON_R200)
- screen-chip_flags |= RADEON_CLASS_R200;
-#endif
-
i = 0;
screen-extensions[i++] = dri2ConfigQueryExtension.base;
#if defined(RADEON_R100)
screen-extensions[i++] = radeonTexBufferExtension.base;
-#endif
-
-#if defined(RADEON_R200)
+#elif defined(RADEON_R200)
screen-extensions[i++] = r200TexBufferExtension.base;
#endif
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
index 6d32189..178ff09 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
@@ -337,8 +337,8 @@ static gl_format radeonChooseTexFormat(radeonContextPtr rmesa,
GLenum srcFormat,
GLenum srcType, GLboolean fbo)
{
- /* r100 can only do this */
#if defined(RADEON_R100)
+ /* r100 can only do this */
return _radeon_texformat_argb;
#elif defined(RADEON_R200)
const GLuint ui = 1;
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] cleanup radeon shared code after r300 and r600 classic drivers removal
Only compile tested.diff -purN mesa-7.12_//include/pci_ids/r600_pci_ids.h mesa-7.12/include/pci_ids/r600_pci_ids.h
--- mesa-7.12_//include/pci_ids/r600_pci_ids.h 2011-07-18 11:48:14.0 +0200
+++ mesa-7.12/include/pci_ids/r600_pci_ids.h 2011-11-05 21:02:52.799146824 +0100
@@ -205,7 +205,6 @@ CHIPSET(0x964a, SUMO_964A, SUMO)
CHIPSET(0x964e, SUMO_964E, SUMO)
CHIPSET(0x964f, SUMO_964F, SUMO)
-#ifndef RADEON_CLASSIC
CHIPSET(0x6700, CAYMAN_6700, CAYMAN)
CHIPSET(0x6701, CAYMAN_6701, CAYMAN)
CHIPSET(0x6702, CAYMAN_6702, CAYMAN)
@@ -221,7 +220,6 @@ CHIPSET(0x6719, CAYMAN_6719, CAYMAN)
CHIPSET(0x671C, CAYMAN_671C, CAYMAN)
CHIPSET(0x671D, CAYMAN_671D, CAYMAN)
CHIPSET(0x671F, CAYMAN_671F, CAYMAN)
-#endif
CHIPSET(0x6720, BARTS_6720, BARTS)
CHIPSET(0x6721, BARTS_6721, BARTS)
diff -purN mesa-7.12_//src/mesa/drivers/dri/radeon/radeon_chipset.h mesa-7.12/src/mesa/drivers/dri/radeon/radeon_chipset.h
--- mesa-7.12_//src/mesa/drivers/dri/radeon/radeon_chipset.h 2011-06-10 12:05:04.0 +0200
+++ mesa-7.12/src/mesa/drivers/dri/radeon/radeon_chipset.h 2011-11-05 21:03:27.923320988 +0100
@@ -6,77 +6,38 @@
/* General chip classes:
* r100 includes R100, RV100, RV200, RS100, RS200, RS250.
* r200 includes R200, RV250, RV280, RS300.
- * r300 includes R300, RV350, RV370.
* (RS* denotes IGP)
*/
enum {
-#define RADEON_CLASSIC 1
#define CHIPSET(id, name, family) PCI_CHIP_##name = id,
+#if defined(RADEON_R100)
#include pci_ids/radeon_pci_ids.h
+#elif defined(RADEON_R200)
#include pci_ids/r200_pci_ids.h
-#include pci_ids/r300_pci_ids.h
-#include pci_ids/r600_pci_ids.h
+#endif
#undef CHIPSET
};
enum {
+#if defined(RADEON_R100)
CHIP_FAMILY_R100,
CHIP_FAMILY_RV100,
CHIP_FAMILY_RS100,
CHIP_FAMILY_RV200,
CHIP_FAMILY_RS200,
+#elif defined(RADEON_R200)
CHIP_FAMILY_R200,
CHIP_FAMILY_RV250,
CHIP_FAMILY_RS300,
CHIP_FAMILY_RV280,
- CHIP_FAMILY_R300,
- CHIP_FAMILY_R350,
- CHIP_FAMILY_RV350,
- CHIP_FAMILY_RV380,
- CHIP_FAMILY_RS400,
- CHIP_FAMILY_R420,
- CHIP_FAMILY_RV410,
- CHIP_FAMILY_RS600,
- CHIP_FAMILY_RS690,
- CHIP_FAMILY_RS740,
- CHIP_FAMILY_RV515,
- CHIP_FAMILY_R520,
- CHIP_FAMILY_RV530,
- CHIP_FAMILY_R580,
- CHIP_FAMILY_RV560,
- CHIP_FAMILY_RV570,
- CHIP_FAMILY_R600,
- CHIP_FAMILY_RV610,
- CHIP_FAMILY_RV630,
- CHIP_FAMILY_RV670,
- CHIP_FAMILY_RV620,
- CHIP_FAMILY_RV635,
- CHIP_FAMILY_RS780,
- CHIP_FAMILY_RS880,
- CHIP_FAMILY_RV770,
- CHIP_FAMILY_RV730,
- CHIP_FAMILY_RV710,
- CHIP_FAMILY_RV740,
- CHIP_FAMILY_CEDAR,
- CHIP_FAMILY_REDWOOD,
- CHIP_FAMILY_JUNIPER,
- CHIP_FAMILY_CYPRESS,
- CHIP_FAMILY_HEMLOCK,
- CHIP_FAMILY_PALM,
- CHIP_FAMILY_SUMO,
- CHIP_FAMILY_SUMO2,
- CHIP_FAMILY_BARTS,
- CHIP_FAMILY_TURKS,
- CHIP_FAMILY_CAICOS,
+#endif
CHIP_FAMILY_LAST
};
/* General classes of Radeons, as described above the device ID section */
#define RADEON_CLASS_R100 (0 0)
#define RADEON_CLASS_R200 (1 0)
-#define RADEON_CLASS_R300 (2 0)
-#define RADEON_CLASS_R600 (3 0)
#define RADEON_CLASS_MASK (3 0)
#define RADEON_CHIPSET_TCL (1 2) /* tcl support - any radeon */
diff -purN mesa-7.12_//src/mesa/drivers/dri/radeon/radeon_common_context.c mesa-7.12/src/mesa/drivers/dri/radeon/radeon_common_context.c
--- mesa-7.12_//src/mesa/drivers/dri/radeon/radeon_common_context.c 2011-11-05 15:44:43.0 +0100
+++ mesa-7.12/src/mesa/drivers/dri/radeon/radeon_common_context.c 2011-11-05 21:02:52.815146897 +0100
@@ -53,54 +53,18 @@ int RADEON_DEBUG = (0);
static const char* get_chip_family_name(int chip_family)
{
switch(chip_family) {
+#if defined(RADEON_R100)
case CHIP_FAMILY_R100: return R100;
case CHIP_FAMILY_RV100: return RV100;
case CHIP_FAMILY_RS100: return RS100;
case CHIP_FAMILY_RV200: return RV200;
case CHIP_FAMILY_RS200: return RS200;
+#elif defined(RADEON_R200)
case CHIP_FAMILY_R200: return R200;
case CHIP_FAMILY_RV250: return RV250;
case CHIP_FAMILY_RS300: return RS300;
case CHIP_FAMILY_RV280: return RV280;
- case CHIP_FAMILY_R300: return R300;
- case CHIP_FAMILY_R350: return R350;
- case CHIP_FAMILY_RV350: return RV350;
- case CHIP_FAMILY_RV380: return RV380;
- case CHIP_FAMILY_R420: return R420;
- case CHIP_FAMILY_RV410: return RV410;
- case CHIP_FAMILY_RS400: return RS400;
- case CHIP_FAMILY_RS600: return RS600;
- case CHIP_FAMILY_RS690: return RS690;
- case CHIP_FAMILY_RS740: return RS740;
- case CHIP_FAMILY_RV515: return RV515;
- case CHIP_FAMILY_R520: return R520;
- case CHIP_FAMILY_RV530: return RV530;
- case CHIP_FAMILY_R580: return R580;
- case CHIP_FAMILY_RV560: return RV560;
- case CHIP_FAMILY_RV570: return RV570;
- case CHIP_FAMILY_R600: return R600;
- case CHIP_FAMILY_RV610: return RV610;
- case CHIP_FAMILY_RV630: return RV630;
- case CHIP_FAMILY_RV670: return RV670;
- case CHIP_FAMILY_RV620: return RV620;
- case CHIP_FAMILY_RV635: return RV635;
- case CHIP_FAMILY_RS780: return RS780;
- case CHIP_FAMILY_RS880: return RS880;
- case
[Mesa-dev] remove unused but set variables
from osmesa, radeon and r600 classic drivers.diff --git a/src/mesa/drivers/dri/r600/evergreen_fragprog.c b/src/mesa/drivers/dri/r600/evergreen_fragprog.c
index cc584ca..10c88d7 100644
--- a/src/mesa/drivers/dri/r600/evergreen_fragprog.c
+++ b/src/mesa/drivers/dri/r600/evergreen_fragprog.c
@@ -498,7 +498,6 @@ GLboolean evergreenSetupFragmentProgram(struct gl_context * ctx)
unsigned int ui, i;
unsigned int unNumOfReg;
unsigned int unBit;
-GLuint exportCount;
GLboolean point_sprite = GL_FALSE;
if(GL_FALSE == fp-loaded)
@@ -717,8 +716,6 @@ GLboolean evergreenSetupFragmentProgram(struct gl_context * ctx)
}
}
-exportCount = (evergreen-SQ_PGM_EXPORTS_PS.u32All EXPORT_MODE_mask) / (1 EXPORT_MODE_shift);
-
return GL_TRUE;
}
diff --git a/src/mesa/drivers/dri/r600/evergreen_render.c b/src/mesa/drivers/dri/r600/evergreen_render.c
index 74563ca..7016063 100644
--- a/src/mesa/drivers/dri/r600/evergreen_render.c
+++ b/src/mesa/drivers/dri/r600/evergreen_render.c
@@ -689,8 +689,6 @@ static void evergreenAlignDataToDword(struct gl_context *ctx,
static void evergreenSetupStreams(struct gl_context *ctx, const struct gl_client_array *input[], int count)
{
context_t *context = EVERGREEN_CONTEXT(ctx);
-GLuint stride;
-int ret;
int i, index;
EVERGREEN_STATECHANGE(context, vtx);
@@ -700,8 +698,6 @@ static void evergreenSetupStreams(struct gl_context *ctx, const struct gl_client
struct radeon_aos *aos = context-radeon.tcl.aos[index];
i = context-stream_desc[index].element;
-stride = (input[i]-StrideB == 0) ? getTypeSize(input[i]-Type) * input[i]-Size : input[i]-StrideB;
-
if (input[i]-Type == GL_DOUBLE || input[i]-Type == GL_UNSIGNED_INT || input[i]-Type == GL_INT
#if MESA_BIG_ENDIAN
|| getTypeSize(input[i]-Type) != 4
@@ -781,10 +777,6 @@ static void evergreenSetupStreams(struct gl_context *ctx, const struct gl_client
RADEON_GEM_DOMAIN_GTT, 0);
}
}
-
-ret = radeon_cs_space_check_with_bo(context-radeon.cmdbuf.cs,
-first_elem(context-radeon.dma.reserved)-bo,
-RADEON_GEM_DOMAIN_GTT, 0);
}
static void evergreenFreeData(struct gl_context *ctx)
diff --git a/src/mesa/drivers/dri/r600/evergreen_vertprog.c b/src/mesa/drivers/dri/r600/evergreen_vertprog.c
index 117916a..a968eaf 100644
--- a/src/mesa/drivers/dri/r600/evergreen_vertprog.c
+++ b/src/mesa/drivers/dri/r600/evergreen_vertprog.c
@@ -454,11 +454,6 @@ static void evergreenTranslateAttrib(struct gl_context *ctx, GLuint unLoc, int c
StreamDesc * pStreamDesc = (context-stream_desc[context-nNumActiveAos]);
- GLuint stride;
-
- stride = (input-StrideB == 0) ? evergreen_getTypeSize(input-Type) * input-Size
- : input-StrideB;
-
if (input-Type == GL_DOUBLE || input-Type == GL_UNSIGNED_INT || input-Type == GL_INT
#if MESA_BIG_ENDIAN
|| evergreen_getTypeSize(input-Type) != 4
diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c
index 216ff0b..bc58695 100644
--- a/src/mesa/drivers/dri/r600/r700_assembler.c
+++ b/src/mesa/drivers/dri/r600/r700_assembler.c
@@ -954,7 +954,6 @@ GLboolean assemble_vfetch_instruction(r700_AssemblerBase* pAsm,
VTX_FETCH_METHOD* pFetchMethod)
{
GLuint client_size_inbyte;
- GLuint data_format;
GLuint mega_fetch_count;
GLuint is_mega_fetch_flag;
@@ -975,8 +974,6 @@ GLboolean assemble_vfetch_instruction(r700_AssemblerBase* pAsm,
vfetch_instruction_ptr = assembled_vfetch_instruction_ptr;
}
- data_format = GetSurfaceFormat(dataElementType, number_of_elements, client_size_inbyte);
-
if(GL_TRUE == pFetchMethod-bEnableMini) //More conditions here
{
//TODO : mini fetch
@@ -2668,8 +2665,6 @@ GLboolean check_scalar(r700_AssemblerBase* pAsm,
BITS sel;
BITS chan;
-BITS rel;
-BITS neg;
GLuint src;
@@ -2711,8 +2706,6 @@ GLboolean check_scalar(r700_AssemblerBase* pAsm,
{
sel = src_sel [src];
chan = src_chan[src];
-rel = src_rel [src];
-neg = src_neg [src];
if (is_const( sel ))
{
@@ -2731,8 +2724,6 @@ GLboolean check_scalar(r700_AssemblerBase* pAsm,
{
sel = src_sel [src];
chan = src_chan[src];
-rel = src_rel [src];
-neg = src_neg [src];
if( is_gpr(sel) )
{
@@ -2767,8 +2758,6 @@ GLboolean check_vector(r700_AssemblerBase* pAsm,
BITS sel;
BITS chan;
-BITS rel;
-BITS neg;
BITS src_sel [3] = {0,0,0};
BITS src_chan[3] = {0,0,0};
@@ -2809,8 +2798,6 @@ GLboolean check_vector(r700_AssemblerBase* pAsm,
{
sel = src_sel [src];
chan = src_chan[src];
-rel = src_rel [src];
-neg = src_neg [src];
bank_swizzle =
[Mesa-dev] [PATCH] build fix (bug 40343)
--- a/src/mesa/drivers/x11/xm_dd.c 2011-08-24 09:34:07.994841678 +0200 +++ b/src/mesa/drivers/x11/xm_dd.c 2011-08-24 12:22:10.756839418 +0200 @@ -588,7 +588,7 @@ xmesa_DrawPixels_5R6G5B( struct gl_conte glDrawPixels(invalid PBO access)); return; } - buf = (GLubyte *) ctx-Driver.MapBufferRange(ctx, 0 + buf = (GLubyte *) ctx-Driver.MapBufferRange(ctx, 0, unpack-BufferObj-Size, GL_MAP_READ_BIT, unpack-BufferObj); ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] silence unused variable warning
--- a/src/mesa/vbo/vbo_exec_draw.c 2011-08-24 09:34:08.038841896 +0200
+++ b/src/mesa/vbo/vbo_exec_draw.c 2011-08-24 12:17:57.359582871 +0200
@@ -260,8 +260,6 @@ vbo_exec_bind_arrays( struct gl_context
static void
vbo_exec_vtx_unmap( struct vbo_exec_context *exec )
{
- GLenum target = GL_ARRAY_BUFFER_ARB;
-
if (_mesa_is_bufferobj(exec-vtx.bufferobj)) {
struct gl_context *ctx = exec-ctx;
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] fix unused variable warnings
The attached patch fixes the following swrast warnings:
swrast/s_span.c: In function 'interpolate_int_colors':
swrast/s_span.c:216:11: warning: unused variable 'i'
swrast/s_span.c:215:17: warning: unused variable 'n'--- a/src/mesa/swrast/s_span.c 2011-07-21 09:57:48.183225983 +0200
+++ b/src/mesa/swrast/s_span.c 2011-07-28 13:59:37.037050901 +0200
@@ -212,10 +212,10 @@ interpolate_active_attribs(struct gl_con
static INLINE void
interpolate_int_colors(struct gl_context *ctx, SWspan *span)
{
+#if CHAN_BITS != 32
const GLuint n = span-end;
GLuint i;
-#if CHAN_BITS != 32
ASSERT(!(span-arrayMask SPAN_RGBA));
#endif
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
