aboutsummaryrefslogtreecommitdiff
path: root/include/render
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-04-25 23:24:58 +0100
committeremersion <contact@emersion.fr>2018-04-25 23:24:58 +0100
commit71ca45e2c0cbecf8fb24f0cab019646d92cce14b (patch)
tree001f93657d3de3d7baafa280dc7eb13abc9dd3a9 /include/render
parentf9f75a13623726ec56810eb89b60ca43462e1ca2 (diff)
Make sure we don't use others' prefixes
Diffstat (limited to 'include/render')
-rw-r--r--include/render/gles2.h17
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