Module: Mesa Branch: main Commit: 8120360358663af237562a7c81313087a23f8dd6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8120360358663af237562a7c81313087a23f8dd6
Author: Juan A. Suarez Romero <jasua...@igalia.com> Date: Fri Jan 12 23:17:07 2024 +0100 Revert "v3d: show warning on creating a v3d screen on real hw" There are paths were a v3d screen can be created instead of vc4 screen, in a real rpi4 hardware. For instance, in the CI itself. So assuming that it was only possible with the simulator was wrong. This reverts commit c31be1f4bacde88ccd7177af26cb554c35472573. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27047> --- src/gallium/winsys/v3d/drm/meson.build | 8 -------- src/gallium/winsys/v3d/drm/v3d_drm_winsys.c | 4 ---- 2 files changed, 12 deletions(-) diff --git a/src/gallium/winsys/v3d/drm/meson.build b/src/gallium/winsys/v3d/drm/meson.build index 258033bbae5..3d3cc5b3f01 100644 --- a/src/gallium/winsys/v3d/drm/meson.build +++ b/src/gallium/winsys/v3d/drm/meson.build @@ -18,13 +18,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -dep_v3dv3 = dependency('v3dv3', required: false) - -v3d_winsys_c_args = [] -if (dep_v3dv3.found()) - v3d_winsys_c_args += '-DUSE_V3D_SIMULATOR' -endif - libv3dwinsys = static_library( 'v3dwinsys', files('v3d_drm_winsys.c'), @@ -32,7 +25,6 @@ libv3dwinsys = static_library( inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_gallium_drivers, ], - c_args: [v3d_winsys_c_args], gnu_symbol_visibility : 'hidden', dependencies : idep_mesautil, ) diff --git a/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c b/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c index 7185e0d8d93..0386cde886e 100644 --- a/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c +++ b/src/gallium/winsys/v3d/drm/v3d_drm_winsys.c @@ -34,10 +34,6 @@ struct pipe_screen * v3d_drm_screen_create(int fd, const struct pipe_screen_config *config) { -#ifndef USE_V3D_SIMULATOR - fprintf (stderr, "Do not manually force v3d driver; hardware uses vc4 to create display\n"); -#endif - return u_pipe_screen_lookup_or_create(os_dupfd_cloexec(fd), config, NULL, v3d_screen_create); }
