diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-08-08 13:12:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-08 13:12:16 -0400 |
| commit | ba87585bbe7f119d6ebd9d13c85af15d82aa9431 (patch) | |
| tree | ec186a0475956d7ac1ff100c81a74bee5900f84c /examples/rotation.c | |
| parent | 622a0d838b2d645ab8f649c6804276262d1eec50 (diff) | |
| parent | e167f41fde7532ca453a9a70ad1e3f27d7177071 (diff) | |
Merge pull request #48 from nyorain/wlr_texture
Rename wlr_surface -> wlr_texture; attach -> upload
Diffstat (limited to 'examples/rotation.c')
| -rw-r--r-- | examples/rotation.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/rotation.c b/examples/rotation.c index bcf855d9..34994e04 100644 --- a/examples/rotation.c +++ b/examples/rotation.c @@ -23,7 +23,7 @@ struct sample_state { struct wl_list config; struct wlr_renderer *renderer; - struct wlr_surface *cat_texture; + struct wlr_texture *cat_texture; }; struct output_data { @@ -52,7 +52,7 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts float matrix[16]; for (int y = -128 + (int)odata->y_offs; y < height; y += 128) { for (int x = -128 + (int)odata->x_offs; x < width; x += 128) { - wlr_surface_get_matrix(sample->cat_texture, &matrix, + wlr_texture_get_matrix(sample->cat_texture, &matrix, &wlr_output->transform_matrix, x, y); wlr_render_with_matrix(sample->renderer, sample->cat_texture, &matrix); @@ -205,13 +205,13 @@ int main(int argc, char *argv[]) { compositor_init(&compositor); state.renderer = wlr_gles2_renderer_init(); - state.cat_texture = wlr_render_surface_init(state.renderer); - wlr_surface_attach_pixels(state.cat_texture, WL_SHM_FORMAT_ABGR8888, + state.cat_texture = wlr_render_texture_init(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); compositor_run(&compositor); - wlr_surface_destroy(state.cat_texture); + wlr_texture_destroy(state.cat_texture); wlr_renderer_destroy(state.renderer); struct output_config *ptr, *tmp; |