BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc: Fix compilation with NO_VSYNC_OPENGL_GLSL / NO_C2 

Fix compilation with NO_VSYNC_OPENGL_GLSL / NO_C2.
This commit is contained in:
Richard Grenville 2014-07-29 09:29:26 +08:00
parent 4724c1f21a
commit 3cfbaac955
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/compton.c
View File

@ -2587,6 +2587,7 @@ win_update_opacity_rule(session_t *ps, win *w) {
if (IsViewable != w->a.map_state) if (IsViewable != w->a.map_state)
return; return;
#ifdef CONFIG_C2
// If long is 32-bit, unfortunately there's no way could we express "unset", // If long is 32-bit, unfortunately there's no way could we express "unset",
// so we just entirely don't distinguish "unset" and OPAQUE // so we just entirely don't distinguish "unset" and OPAQUE
opacity_t opacity = OPAQUE; opacity_t opacity = OPAQUE;
@ -2602,6 +2603,7 @@ win_update_opacity_rule(session_t *ps, win *w) {
else if (OPAQUE != w->opacity_set) else if (OPAQUE != w->opacity_set)
wid_rm_opacity_prop(ps, w->id); wid_rm_opacity_prop(ps, w->id);
w->opacity_set = opacity; w->opacity_set = opacity;
#endif
} }
/** /**
@ -5162,6 +5164,7 @@ parse_geometry_end:
*/ */
static inline bool static inline bool
parse_rule_opacity(session_t *ps, const char *src) { parse_rule_opacity(session_t *ps, const char *src) {
#ifdef CONFIG_C2
// Find opacity value // Find opacity value
char *endptr = NULL; char *endptr = NULL;
long val = strtol(src, &endptr, 0); long val = strtol(src, &endptr, 0);
@ -5186,6 +5189,10 @@ parse_rule_opacity(session_t *ps, const char *src) {
// Parse pattern // Parse pattern
// I hope 1-100 is acceptable for (void *) // I hope 1-100 is acceptable for (void *)
return c2_parsed(ps, &ps->o.opacity_rules, endptr, (void *) val); return c2_parsed(ps, &ps->o.opacity_rules, endptr, (void *) val);
#else
printf_errf("(\"%s\"): Condition support not compiled in.", src);
return false;
#endif
} }
#ifdef CONFIG_LIBCONFIG #ifdef CONFIG_LIBCONFIG

2
src/opengl.c
View File

@ -104,12 +104,14 @@ glx_init(session_t *ps, bool need_render) {
ps->psglx = cmalloc(1, glx_session_t); ps->psglx = cmalloc(1, glx_session_t);
memcpy(ps->psglx, &CGLX_SESSION_DEF, sizeof(glx_session_t)); memcpy(ps->psglx, &CGLX_SESSION_DEF, sizeof(glx_session_t));
#ifdef CONFIG_VSYNC_OPENGL_GLSL
for (int i = 0; i < MAX_BLUR_PASS; ++i) { for (int i = 0; i < MAX_BLUR_PASS; ++i) {
glx_blur_pass_t *ppass = &ps->psglx->blur_passes[i]; glx_blur_pass_t *ppass = &ps->psglx->blur_passes[i];
ppass->unifm_factor_center = -1; ppass->unifm_factor_center = -1;
ppass->unifm_offset_x = -1; ppass->unifm_offset_x = -1;
ppass->unifm_offset_y = -1; ppass->unifm_offset_y = -1;
} }
#endif
} }
glx_session_t *psglx = ps->psglx; glx_session_t *psglx = ps->psglx;