[weston,v2,2/5] gl-renderer: Rename gl_renderer::output_create to output_window_create

Submitted by Miguel Angel Vico on May 18, 2016, 3:43 p.m.

Details

Message ID 1463586180-28284-1-git-send-email-mvicomoya@nvidia.com
State Accepted
Delegated to: Pekka Paalanen
Headers show
Series "Series without cover letter" ( rev: 11 10 9 8 ) in Wayland

Not browsing as part of any series.

Commit Message

Miguel Angel Vico May 18, 2016, 3:43 p.m.
No functional change. This patch renames gl_renderer_output_create() to
gl_renderer_output_window_create(), which is something more descriptive
of what the function does.

Signed-off-by: Miguel A Vico Moya <mvicomoya@nvidia.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Reviewed-by: James Jones <jajones@nvidia.com>
---
 src/compositor-drm.c     | 12 ++++++------
 src/compositor-fbdev.c   |  9 +++++----
 src/compositor-wayland.c | 12 ++++++------
 src/compositor-x11.c     | 13 +++++++------
 src/gl-renderer.c        | 14 +++++++-------
 src/gl-renderer.h        | 12 ++++++------
 6 files changed, 37 insertions(+), 35 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index 90e0e7b..3c13dc8 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -1844,12 +1844,12 @@  drm_output_init_egl(struct drm_output *output, struct drm_backend *b)
 
 	if (format[1])
 		n_formats = 2;
-	if (gl_renderer->output_create(&output->base,
-				       (EGLNativeWindowType)output->gbm_surface,
-				       output->gbm_surface,
-				       gl_renderer->opaque_attribs,
-				       format,
-				       n_formats) < 0) {
+	if (gl_renderer->output_window_create(&output->base,
+					      (EGLNativeWindowType)output->gbm_surface,
+					      output->gbm_surface,
+					      gl_renderer->opaque_attribs,
+					      format,
+					      n_formats) < 0) {
 		weston_log("failed to create gl renderer output state\n");
 		gbm_surface_destroy(output->gbm_surface);
 		return -1;
diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
index f97fcb3..8e87c98 100644
--- a/src/compositor-fbdev.c
+++ b/src/compositor-fbdev.c
@@ -510,10 +510,11 @@  fbdev_output_create(struct fbdev_backend *backend,
 			goto out_hw_surface;
 	} else {
 		setenv("HYBRIS_EGLPLATFORM", "wayland", 1);
-		if (gl_renderer->output_create(&output->base,
-					       (EGLNativeWindowType)NULL, NULL,
-					       gl_renderer->opaque_attribs,
-					       NULL, 0) < 0) {
+		if (gl_renderer->output_window_create(
+						&output->base,
+						(EGLNativeWindowType)NULL, NULL,
+						gl_renderer->opaque_attribs,
+						NULL, 0) < 0) {
 			weston_log("gl_renderer_output_create failed.\n");
 			goto out_hw_surface;
 		}
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 682fa27..1e8d2ce 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -658,12 +658,12 @@  wayland_output_init_gl_renderer(struct wayland_output *output)
 		return -1;
 	}
 
-	if (gl_renderer->output_create(&output->base,
-				       output->gl.egl_window,
-				       output->gl.egl_window,
-				       gl_renderer->alpha_attribs,
-				       NULL,
-				       0) < 0)
+	if (gl_renderer->output_window_create(&output->base,
+					      output->gl.egl_window,
+					      output->gl.egl_window,
+					      gl_renderer->alpha_attribs,
+					      NULL,
+					      0) < 0)
 		goto cleanup_window;
 
 	return 0;
diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index 097a5ce..069b321 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -928,12 +928,13 @@  x11_backend_create_output(struct x11_backend *b, int x, int y,
 		 * but eglCreateWindowSurface takes a Window. */
 		Window xid = (Window) output->window;
 
-		ret = gl_renderer->output_create(&output->base,
-						 (EGLNativeWindowType) output->window,
-						 &xid,
-						 gl_renderer->opaque_attribs,
-						 NULL,
-						 0);
+		ret = gl_renderer->output_window_create(
+					&output->base,
+					(EGLNativeWindowType) output->window,
+					&xid,
+					gl_renderer->opaque_attribs,
+					NULL,
+					0);
 		if (ret < 0)
 			return NULL;
 	}
diff --git a/src/gl-renderer.c b/src/gl-renderer.c
index 197e5c2..9e75025 100644
--- a/src/gl-renderer.c
+++ b/src/gl-renderer.c
@@ -2547,12 +2547,12 @@  static int
 gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface);
 
 static int
-gl_renderer_output_create(struct weston_output *output,
-			  EGLNativeWindowType window_for_legacy,
-			  void *window_for_platform,
-			  const EGLint *attribs,
-			  const EGLint *visual_id,
-			  int n_ids)
+gl_renderer_output_window_create(struct weston_output *output,
+				 EGLNativeWindowType window_for_legacy,
+				 void *window_for_platform,
+				 const EGLint *attribs,
+				 const EGLint *visual_id,
+				 int n_ids)
 {
 	struct weston_compositor *ec = output->compositor;
 	struct gl_renderer *gr = get_renderer(ec);
@@ -3149,7 +3149,7 @@  WL_EXPORT struct gl_renderer_interface gl_renderer_interface = {
 
 	.display_create = gl_renderer_display_create,
 	.display = gl_renderer_display,
-	.output_create = gl_renderer_output_create,
+	.output_window_create = gl_renderer_output_window_create,
 	.output_destroy = gl_renderer_output_destroy,
 	.output_surface = gl_renderer_output_surface,
 	.output_set_border = gl_renderer_output_set_border,
diff --git a/src/gl-renderer.h b/src/gl-renderer.h
index 69ed77e..30b5918 100644
--- a/src/gl-renderer.h
+++ b/src/gl-renderer.h
@@ -84,12 +84,12 @@  struct gl_renderer_interface {
 
 	EGLDisplay (*display)(struct weston_compositor *ec);
 
-	int (*output_create)(struct weston_output *output,
-			     EGLNativeWindowType window_for_legacy,
-			     void *window_for_platform,
-			     const EGLint *attribs,
-			     const EGLint *visual_id,
-			     const int n_ids);
+	int (*output_window_create)(struct weston_output *output,
+				    EGLNativeWindowType window_for_legacy,
+				    void *window_for_platform,
+				    const EGLint *attribs,
+				    const EGLint *visual_id,
+				    const int n_ids);
 
 	void (*output_destroy)(struct weston_output *output);