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 /include/render | |
| parent | 622a0d838b2d645ab8f649c6804276262d1eec50 (diff) | |
| parent | e167f41fde7532ca453a9a70ad1e3f27d7177071 (diff) | |
| download | wlroots-ba87585bbe7f119d6ebd9d13c85af15d82aa9431.tar.xz | |
Merge pull request #48 from nyorain/wlr_texture
Rename wlr_surface -> wlr_texture; attach -> upload
Diffstat (limited to 'include/render')
| -rw-r--r-- | include/render/gles2.h | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/include/render/gles2.h b/include/render/gles2.h index e57d40f4..41af0593 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -14,8 +14,8 @@ struct pixel_format {  	GLuint *shader;  }; -struct wlr_surface_state { -	struct wlr_surface *wlr_surface; +struct wlr_texture_state { +	struct wlr_texture *wlr_texture;  	GLuint tex_id;  	const struct pixel_format *pixel_format;  }; @@ -31,7 +31,7 @@ extern struct shaders shaders;  const struct pixel_format *gl_format_for_wl_format(enum wl_shm_format fmt); -struct wlr_surface *gles2_surface_init(); +struct wlr_texture *gles2_texture_init();  extern const GLchar quad_vertex_src[];  extern const GLchar quad_fragment_src[]; | 
