summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2015-12-10 11:40:59 +0100
committerDave Airlie <airlied@gmail.com>2016-01-17 18:38:53 +1000
commit0738199d417e9621c3b307e2c38bdfc260d8ad6c (patch)
tree336bce5f69c2924ca7dd94b7195a237fe8d78355
parentab0857c1b7f227810e6ecb6441f4f5a3ba2334bd (diff)
renderer: return an int in vrend_renderer_init
This is an internal API.
-rw-r--r--src/virglrenderer.c3
-rw-r--r--src/vrend_renderer.c4
-rw-r--r--src/vrend_renderer.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/virglrenderer.c b/src/virglrenderer.c
index ea382db..ae02939 100644
--- a/src/virglrenderer.c
+++ b/src/virglrenderer.c
@@ -266,8 +266,7 @@ int virgl_renderer_init(void *cookie, int flags, struct virgl_renderer_callbacks
use_egl_context = 1;
}
- vrend_renderer_init(&virgl_cbs);
- return 0;
+ return vrend_renderer_init(&virgl_cbs);
}
int virgl_renderer_get_fd_for_texture(uint32_t tex_id, int *fd)
diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c
index 0d3298f..0a95f18 100644
--- a/src/vrend_renderer.c
+++ b/src/vrend_renderer.c
@@ -3483,7 +3483,7 @@ static GLenum tgsitargettogltarget(const enum pipe_texture_target target, int nr
return PIPE_BUFFER;
}
-void vrend_renderer_init(struct vrend_if_cbs *cbs)
+int vrend_renderer_init(struct vrend_if_cbs *cbs)
{
int gl_ver;
virgl_gl_context gl_context;
@@ -3556,6 +3556,8 @@ void vrend_renderer_init(struct vrend_if_cbs *cbs)
list_inithead(&vrend_state.active_ctx_list);
/* create 0 context */
vrend_renderer_context_create_internal(0, 0, NULL);
+
+ return 0;
}
void
diff --git a/src/vrend_renderer.h b/src/vrend_renderer.h
index ee26993..bc2e447 100644
--- a/src/vrend_renderer.h
+++ b/src/vrend_renderer.h
@@ -98,7 +98,7 @@ struct vrend_if_cbs {
void (*destroy_gl_context)(virgl_gl_context ctx);
int (*make_current)(int scanout, virgl_gl_context ctx);
};
-void vrend_renderer_init(struct vrend_if_cbs *cbs);
+int vrend_renderer_init(struct vrend_if_cbs *cbs);
void vrend_insert_format(struct vrend_format_table *entry, uint32_t bindings);
void vrend_insert_format_swizzle(int override_format, struct vrend_format_table *entry, uint32_t bindings, uint8_t swizzle[4]);