diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-04-26 11:18:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-26 11:18:01 +0200 |
| commit | fac2c3e25fb77a9bc934c21bc172db6d0475d751 (patch) | |
| tree | f25a9f5c082e3666ae83f83f908068a7ce7155a1 /include/render | |
| parent | 31857c9ed40a6bf34273b0459d2aa604642d1807 (diff) | |
| parent | 625a7a48dc9f348a7556b03dd3c10a6a7d9c6037 (diff) | |
Merge pull request #882 from emersion/unprefix-local-symbols
Remove wlr_ prefix from local symbols
Diffstat (limited to 'include/render')
| -rw-r--r-- | include/render/gles2.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/render/gles2.h b/include/render/gles2.h index 792f1b40..99beff29 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -18,7 +18,7 @@ extern PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES; -struct gles2_pixel_format { +struct wlr_gles2_pixel_format { uint32_t wl_format; GLint gl_format, gl_type; int depth, bpp; @@ -68,15 +68,16 @@ struct wlr_gles2_texture { }; }; -const struct gles2_pixel_format *gles2_format_from_wl(enum wl_shm_format fmt); -const enum wl_shm_format *gles2_formats(size_t *len); +const struct wlr_gles2_pixel_format *get_gles2_format_from_wl( + enum wl_shm_format fmt); +const enum wl_shm_format *get_gles2_formats(size_t *len); -struct wlr_gles2_texture *gles2_get_texture_in_context( +struct wlr_gles2_texture *get_gles2_texture_in_context( struct wlr_texture *wlr_texture); -void gles2_push_marker(const char *file, const char *func); -void gles2_pop_marker(void); -#define GLES2_DEBUG_PUSH gles2_push_marker(wlr_strip_path(__FILE__), __func__) -#define GLES2_DEBUG_POP gles2_pop_marker() +void push_gles2_marker(const char *file, const char *func); +void pop_gles2_marker(void); +#define PUSH_GLES2_DEBUG push_gles2_marker(wlr_strip_path(__FILE__), __func__) +#define POP_GLES2_DEBUG pop_gles2_marker() #endif |