David Rosca
656a03e583
glx: Destroy base screen after deinitScreen
...
Instead of destroying it before deinitScreen to match the original order.
Fixes: 407a9094f7 ("glx: move base screen destroy to glx_screen_cleanup")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31087 >
2024-09-10 08:55:58 +02:00
Sid Pranjale
27c09eacb7
glx: add a missing nullptr check
...
This caused GLX applications to segfault under zink.
This technically also fixes cleanup when any driver fails init
Signed-off-by: Sid Pranjale <mail@sidonthe.net>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31072 >
2024-09-10 01:29:48 +00:00
Mike Blumenkrantz
b6f201b173
meson: require dri3 modifiers
...
the year is 2024 and we have the technology
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31044 >
2024-09-06 17:34:17 +00:00
Mike Blumenkrantz
8f6fca89aa
meson: delete dri3 build option
...
this existed for historical reasons, but realistically now it should
be possible to build mesa with dri3 always enabled. additionally,
this check was often used as a substitute for having drm functionality,
which is sort of similar but also not really a direct match
this simplifies a bunch of conditionals and prevents users from footgunnning
themselves into orbit
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30952 >
2024-09-04 14:48:17 +00:00
Yunhyeok "Yune" Choi
27014df366
glx: Getting rid of the double assignment in __glXWireToEvent.
...
Previously the field `event_type` in `GLXPbufferClobberEvent`
was assigned twice in succession with different values.
Removing the first assignment and retaining only the second one.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30836 >
2024-08-26 23:19:56 +00:00
Mike Blumenkrantz
7930fe5f01
glx: unify dri screen init
...
lot of duplication
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:59 +00:00
Mike Blumenkrantz
520572eb25
glx: inline __GLXDRIscreen onto base glx_screen
...
this is much less awkward
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:59 +00:00
Mike Blumenkrantz
2c50ee4398
glx: determine is_direct_capable from driver type
...
indirect contexts have no driver type
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:59 +00:00
Mike Blumenkrantz
912090fa96
glx: unify more extension setup
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:59 +00:00
Mike Blumenkrantz
0af723ea44
glx/dri3: delete driScreenRenderGPU
...
this is redundant
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:59 +00:00
Mike Blumenkrantz
407a9094f7
glx: move base screen destroy to glx_screen_cleanup
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:59 +00:00
Mike Blumenkrantz
b89cf3bbaa
glx: rework screen destroy
...
all the destroy functions call free, but also the caller function calls
free anyway, so just change destroy -> deinit and let there be one free
call
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:59 +00:00
Mike Blumenkrantz
39fe5a5dac
glx: move driver_configs to base glx_screen
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:59 +00:00
Mike Blumenkrantz
abe3bea574
glx: delete private DRIscreen pointers
...
these are all on the base glx_screen object now
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:59 +00:00
Mike Blumenkrantz
5ece0a3b66
glx: unify bind_tex_image
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:59 +00:00
Mike Blumenkrantz
19f38ba000
glx: unify dri screen vtable
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:59 +00:00
Mike Blumenkrantz
b06e861dc8
glx: unify dri get_driver_name
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
f717e67f0c
glx/dri3: strdup existing driverName instead of fetching it again
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
046728f47a
glx/dri2: strdup driver name
...
this is freed by the caller
cc: mesa-stable
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
5edfc64858
glx: unify renderer query hooks
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
479f778a2c
glx: unify dri create_context_attribs
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
7efd6d8a8c
glx: tweak some dri3 context create code
...
this better matches dri2/drisw create
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
d19c650c7e
glx: tweak some drisw context create code
...
this better matches dri2/dri3 create
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
273efc92cf
glx: unify dri destroy context
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
346fae55e7
glx: unify dri unbind context
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
b62601a716
glx: unify dri bind_context
...
these were all more or less the same
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
09eae187dd
glx: use __GLXDRIdrawable more broadly instead of display type drawables
...
most of this usage was to get at the __DRIdrawable
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
46c3bc3365
glx: move/add __DRIdrawable struct to __GLXDRIdrawable
...
this makes access simpler
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
476b4581d9
glx: flatten out getBufferAge a bit
...
more flattening to come
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
1908794023
glx: simplify kopper_get_buffer_age
...
these checks are pointless
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
9042e9a8c0
dri: rework drawable creation
...
this consolidates all the creation code into the dri frontend,
enabling a single caller from the loader
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
af6d3fdf6e
dri: pass has_multibuffers through from the loader
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
ac41da32b3
glx: always set swapInterval in drisw
...
this isn't (currently) used by pure sw, but guarding it in a conditional
is pointless
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
8cc95baf7b
dri: merge in loader_dri3
...
this simplifies dependencies
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619 >
2024-08-19 17:43:58 +00:00
Mike Blumenkrantz
694478025d
egl/glx: make detecting explicit modifier support more explicit
...
explicit modifier usage is different from general modifier capability
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11652 , https://gitlab.freedesktop.org/mesa/mesa/-/issues/11663
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30662 >
2024-08-19 15:00:51 +00:00
Mike Blumenkrantz
a43eefa718
glx: stop loading driver extensions
...
this is pointless now
libGL still needs to be dlopen()ed on some systems tho
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524 >
2024-08-09 14:23:28 +00:00
Mike Blumenkrantz
1de7c86bc1
dri: pass through a type enum for creating screen instead of driver_extensions
...
the caller always knows what type of screen this will be, which means
it's finally possible to kill off passing a vtable here
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524 >
2024-08-09 14:23:28 +00:00
Mike Blumenkrantz
34dea2b38e
glx: unify extension binding
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524 >
2024-08-09 14:23:28 +00:00
Mike Blumenkrantz
02fdca7ffe
glx: add a glx_screen member to indicate GLX_EXT_texture_from_pixmap
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524 >
2024-08-09 14:23:28 +00:00
Mike Blumenkrantz
7ab02fdff5
glx: use glx_driver to determine drisw extension enablement
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524 >
2024-08-09 14:23:28 +00:00
Mike Blumenkrantz
6a553a9cac
glx: set drisw glx_driver more usefully
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524 >
2024-08-09 14:23:28 +00:00
Mike Blumenkrantz
a1416eff96
glx: store the DRIscreen to the base glx_screen
...
frustratingly, there is already a driScreen member, but it's the wrong type
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524 >
2024-08-09 14:23:28 +00:00
Mike Blumenkrantz
3f497c1667
glx: deduplicate and move driverName to base glx_screen struct
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524 >
2024-08-09 14:23:28 +00:00
Mike Blumenkrantz
d491ec1bf9
glx: stop checking dri extensions
...
this was only used for robustness, which can be determined from the
pipe cap instead
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524 >
2024-08-09 14:23:28 +00:00
Mike Blumenkrantz
c3c490f775
glx: replace a straggler DRI_CONFIG_OPTIONS usage
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30524 >
2024-08-09 14:23:27 +00:00
Mike Blumenkrantz
c5c0c1215b
glx: include src/gallium for apple
...
Fixes: 91e1ea52c9 ("mesa_interface: Move out of GL/internal/")
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reported-by: Yurii Kolesnykov <root@yurikoles.com>
Tested-by: Yurii Kolesnykov <root@yurikoles.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30449 >
2024-08-01 16:01:17 +00:00
Mike Blumenkrantz
019cb3875d
glx: move up glx_driver enum declaration
...
Fixes: 4e8740370a ("glx: rework __glXInitialize")
Acked-by: Eric Engestrom <eric@igalia.com>
Reported-by: Yurii Kolesnykov <root@yurikoles.com>
Tested-by: Yurii Kolesnykov <root@yurikoles.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30449 >
2024-08-01 16:01:17 +00:00
Mike Blumenkrantz
1b6974095c
loader/dri3: delete loader_dri3_extensions
...
no longer used
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30450 >
2024-08-01 15:28:03 +00:00
Mike Blumenkrantz
c23385c42c
glx: delete DRI_IMAGE remnants
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30450 >
2024-08-01 15:28:03 +00:00
Mike Blumenkrantz
546d71044a
loader/dri: delete DRI_IMAGE remnants
...
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30450 >
2024-08-01 15:28:03 +00:00