diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2018-03-28 00:20:39 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2018-03-28 00:20:39 -0400 |
| commit | 41e54ba632ae5804d09f75f1af4a708ea33932cf (patch) | |
| tree | 79a523c5dc4bdf148361ebcda47c4d6a9027e98a /examples/output-layout.c | |
| parent | edb643fc6c55b47dd766b4e516b16108719d1ecd (diff) | |
| parent | 330ee081269790922a46091399b616b12ce14f51 (diff) | |
Merge branch 'master' into xdg-positioner
Diffstat (limited to 'examples/output-layout.c')
| -rw-r--r-- | examples/output-layout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/output-layout.c b/examples/output-layout.c index 45d896b0..c1392a30 100644 --- a/examples/output-layout.c +++ b/examples/output-layout.c @@ -197,9 +197,9 @@ int main(int argc, char *argv[]) { compositor_init(&compositor); state.renderer = wlr_gles2_renderer_create(compositor.backend); - state.cat_texture = wlr_render_texture_create(state.renderer); - wlr_texture_upload_pixels(state.cat_texture, WL_SHM_FORMAT_ABGR8888, - cat_tex.width, cat_tex.width, cat_tex.height, cat_tex.pixel_data); + state.cat_texture = wlr_texture_from_pixels(state.renderer, + WL_SHM_FORMAT_ABGR8888, cat_tex.width * 4, cat_tex.width, cat_tex.height, + cat_tex.pixel_data); if (!wlr_backend_start(compositor.backend)) { wlr_log(L_ERROR, "Failed to start backend"); |