diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-07-15 14:17:07 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-07-15 14:17:07 -0400 |
| commit | c5c19919ce627b98d8aab4284da1694573bcccd4 (patch) | |
| tree | 2e29b313b79b6a392e020fd5723e3cc00c800fd2 /progs/demos/spriteblast.c | |
| parent | a0d4a12614fce072fa1eb5516e626909171c95e1 (diff) | |
| parent | 3a3b83e5112b725e22f05b32a273a2351b820944 (diff) | |
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
This builds, but I get an assertion in radeonGetLock() due to
the drawable being null.
Diffstat (limited to 'progs/demos/spriteblast.c')
| -rw-r--r-- | progs/demos/spriteblast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/progs/demos/spriteblast.c b/progs/demos/spriteblast.c index f6630c25d0..d73b680b79 100644 --- a/progs/demos/spriteblast.c +++ b/progs/demos/spriteblast.c @@ -209,13 +209,13 @@ redraw(void) { int i; + glDepthMask(GL_TRUE); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glPushMatrix(); glRotatef(15.0, 1.0, 0.0, 0.0); glRotatef(angle, 0.0, 1.0, 0.0); - glDepthMask(GL_FALSE); /* Draw the floor. */ /* glEnable(GL_TEXTURE_2D);*/ @@ -232,7 +232,7 @@ redraw(void) glEnd(); /* Allow particles to blend with each other. */ - glDepthMask(GL_TRUE); + glDepthMask(GL_FALSE); if (blend) glEnable(GL_BLEND); |