this might fix it this time

1 files changed, 26 insertions, 25 deletions

diff --git a/nvidia.patch b/nvidia.patch
index 926b4d09ee9c..b69268d8ee2d 100644
--- a/nvidia.patch
+++ b/nvidia.patch
@@ -1,41 +1,42 @@
-diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
+Submodule subprojects/wlroots contains modified content
+diff --git a/subprojects/wlroots/render/gles2/renderer.c b/subprojects/wlroots/render/gles2/renderer.c
 index 9fe934f7..9662d4ee 100644
---- a/render/gles2/renderer.c
-+++ b/render/gles2/renderer.c
+--- a/subprojects/wlroots/render/gles2/renderer.c
++++ b/subprojects/wlroots/render/gles2/renderer.c
 @@ -176,7 +176,7 @@ static bool gles2_bind_buffer(struct wlr_renderer *wlr_renderer,
-        assert(wlr_egl_is_current(renderer->egl));
+ 		assert(wlr_egl_is_current(renderer->egl));
  
-        push_gles2_debug(renderer);
--       glFlush();
-+       glFinish();
-        glBindFramebuffer(GL_FRAMEBUFFER, 0);
-        pop_gles2_debug(renderer);
+ 		push_gles2_debug(renderer);
+-		glFlush();
++		glFinish();
+ 		glBindFramebuffer(GL_FRAMEBUFFER, 0);
+ 		pop_gles2_debug(renderer);
  
-diff --git a/types/output/render.c b/types/output/render.c
+diff --git a/subprojects/wlroots/types/output/render.c b/subprojects/wlroots/types/output/render.c
 index a185d844..01df6ffc 100644
---- a/types/output/render.c
-+++ b/types/output/render.c
+--- a/subprojects/wlroots/types/output/render.c
++++ b/subprojects/wlroots/types/output/render.c
 @@ -240,22 +240,7 @@ bool output_pick_format(struct wlr_output *output,
  }
  
  uint32_t wlr_output_preferred_read_format(struct wlr_output *output) {
--   struct wlr_renderer *renderer = output->renderer;
--   assert(renderer != NULL);
+-	struct wlr_renderer *renderer = output->renderer;
+-	assert(renderer != NULL);
 -
--   if (!renderer->impl->preferred_read_format || !renderer->impl->read_pixels) {
--       return DRM_FORMAT_INVALID;
--   }
+-	if (!renderer->impl->preferred_read_format || !renderer->impl->read_pixels) {
+-		return DRM_FORMAT_INVALID;
+-	}
 -
--   if (!wlr_output_attach_render(output, NULL)) {
--       return false;
--   }
+-	if (!wlr_output_attach_render(output, NULL)) {
+-		return false;
+-	}
 -
--   uint32_t fmt = renderer->impl->preferred_read_format(renderer);
+-	uint32_t fmt = renderer->impl->preferred_read_format(renderer);
 -
--   output_clear_back_buffer(output);
+-	output_clear_back_buffer(output);
 -
--   return fmt;
-+   return DRM_FORMAT_XRGB8888;
+-	return fmt;
++	return DRM_FORMAT_XRGB8888;
  }
  
- struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output,
\ No newline at end of file
+ struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output,