diff options
| author | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
| commit | 813ac136e48f60d4c2b13e808107870dafcc4d52 (patch) | |
| tree | 396a6c98276f6e9a04216933daebdf3af7b81d46 /jwxyz/jwzgles.c | |
| parent | Flush X events before locking if we have an external ungrab command (diff) | |
| parent | Update to 5.43 (diff) | |
| download | xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.gz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.xz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.zip | |
Merge branch 'master' into openslx (5.43)
Diffstat (limited to 'jwxyz/jwzgles.c')
| -rw-r--r-- | jwxyz/jwzgles.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jwxyz/jwzgles.c b/jwxyz/jwzgles.c index e0437e0..b26bc3a 100644 --- a/jwxyz/jwzgles.c +++ b/jwxyz/jwzgles.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2012-2018 Jamie Zawinski <jwz@jwz.org> +/* xscreensaver, Copyright (c) 2012-2019 Jamie Zawinski <jwz@jwz.org> * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -352,7 +352,8 @@ static jwzgles_state *state = 0; #ifdef DEBUG -static void Log(const char *fmt, ...) +void +Log(const char *fmt, ...) { va_list args; va_start (args, fmt); @@ -4287,6 +4288,7 @@ void jwzgles_##NAME (ARGS_##SIG) \ WRAP (glActiveTexture, I) WRAP (glAlphaFunc, IF) WRAP (glBlendFunc, II) +//WRAP (glBlendColor, FFFF); WRAP (glClear, I) WRAP (glClearColor, FFFF) WRAP (glClearStencil, I) |