diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-05-23 05:33:34 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-05-23 05:33:34 +0000 |
| commit | 9886815a25d84be79f51e65ebd8e458bb5d26ca8 (patch) | |
| tree | a65edf018dd992543337433f7303fb29a6c8e8cf /lib/mesa/src/gallium/winsys/svga | |
| parent | e2a3acb64af2657b1181806818eacad061103c23 (diff) | |
Merge Mesa 19.0.5
Diffstat (limited to 'lib/mesa/src/gallium/winsys/svga')
| -rw-r--r-- | lib/mesa/src/gallium/winsys/svga/drm/Makefile.in | 9 | ||||
| -rw-r--r-- | lib/mesa/src/gallium/winsys/svga/drm/vmw_screen_svga.c | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/mesa/src/gallium/winsys/svga/drm/Makefile.in b/lib/mesa/src/gallium/winsys/svga/drm/Makefile.in index b3d64f4d7..7580f6971 100644 --- a/lib/mesa/src/gallium/winsys/svga/drm/Makefile.in +++ b/lib/mesa/src/gallium/winsys/svga/drm/Makefile.in @@ -111,9 +111,9 @@ CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libsvgadrm_la_LIBADD = am__objects_1 = pb_buffer_simple_fenced.lo vmw_buffer.lo \ - vmw_context.lo vmw_fence.lo vmw_screen.lo vmw_screen_dri.lo \ - vmw_screen_ioctl.lo vmw_screen_pools.lo vmw_screen_svga.lo \ - vmw_surface.lo vmw_shader.lo vmw_query.lo + vmw_context.lo vmw_fence.lo vmw_msg.lo vmw_screen.lo \ + vmw_screen_dri.lo vmw_screen_ioctl.lo vmw_screen_pools.lo \ + vmw_screen_svga.lo vmw_surface.lo vmw_shader.lo vmw_query.lo am_libsvgadrm_la_OBJECTS = $(am__objects_1) libsvgadrm_la_OBJECTS = $(am_libsvgadrm_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -495,6 +495,8 @@ C_SOURCES := \ vmw_fence.c \ vmw_fence.h \ vmwgfx_drm.h \ + vmw_msg.c \ + vmw_msg.h \ vmw_screen.c \ vmw_screen_dri.c \ vmw_screen.h \ @@ -640,6 +642,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmw_buffer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmw_context.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmw_fence.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmw_msg.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmw_query.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmw_screen.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmw_screen_dri.Plo@am__quote@ diff --git a/lib/mesa/src/gallium/winsys/svga/drm/vmw_screen_svga.c b/lib/mesa/src/gallium/winsys/svga/drm/vmw_screen_svga.c index a6990414e..cd3f21f60 100644 --- a/lib/mesa/src/gallium/winsys/svga/drm/vmw_screen_svga.c +++ b/lib/mesa/src/gallium/winsys/svga/drm/vmw_screen_svga.c @@ -48,6 +48,7 @@ #include "vmw_surface.h" #include "vmw_buffer.h" #include "vmw_fence.h" +#include "vmw_msg.h" #include "vmw_shader.h" #include "vmw_query.h" #include "svga3d_surfacedefs.h" @@ -509,6 +510,8 @@ vmw_winsys_screen_init_svga(struct vmw_winsys_screen *vws) vws->base.stats_time_push = vmw_svga_winsys_stats_time_push; vws->base.stats_time_pop = vmw_svga_winsys_stats_time_pop; + vws->base.host_log = vmw_svga_winsys_host_log; + return TRUE; } |