diff options
author | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-18 11:55:58 +0100 |
commit | aa7530630e595b80d5db54655fd827b61edc0fd7 (patch) | |
tree | 048cb74072450c7592f254c3537ac8f252d09d73 /hacks/glx/flurry-texture.c | |
parent | Forgot one DPMS killing instance (diff) | |
parent | Update to 5.42 (diff) | |
download | xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.gz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.tar.xz xscreensaver-aa7530630e595b80d5db54655fd827b61edc0fd7.zip |
Merge branch 'master' into openslxv23
Diffstat (limited to 'hacks/glx/flurry-texture.c')
-rw-r--r-- | hacks/glx/flurry-texture.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hacks/glx/flurry-texture.c b/hacks/glx/flurry-texture.c index c787f59..f1b7e36 100644 --- a/hacks/glx/flurry-texture.c +++ b/hacks/glx/flurry-texture.c @@ -53,7 +53,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. static GLubyte smallTextureArray[32][32]; static GLubyte bigTextureArray[256][256][2]; -GLuint theTexture = 0; /* simple smoothing routine */ static void SmoothTexture(void) @@ -187,8 +186,9 @@ static void AverageLastAndFirstTextures(void) } } -void MakeTexture() +GLuint MakeTexture(void) { + GLuint theTexture = 0; int i,j; for (i=0;i<8;i++) { @@ -221,4 +221,5 @@ void MakeTexture() gluBuild2DMipmaps(GL_TEXTURE_2D, 2, 256, 256, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, bigTextureArray); glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + return theTexture; } |