diff options
author | Keith Whitwell <keithw@vmware.com> | 2009-02-16 19:50:48 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2009-02-16 19:50:48 +0000 |
commit | 59d54334c96f44ed1d8bf660dc96221362a77d04 (patch) | |
tree | e9ab34e568256bcdc2a88602c47072ab769211e8 /progs/demos/engine.c | |
parent | 7c8836e9ef49d938aa55a1c385b95c6371c301f1 (diff) | |
parent | c5c383596ddb26cd75e4b355918ad16915283b59 (diff) |
Merge branch 'master' into gallium-texture-transfer
Conflicts:
src/mesa/state_tracker/st_cb_accum.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'progs/demos/engine.c')
-rw-r--r-- | progs/demos/engine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/demos/engine.c b/progs/demos/engine.c index 5b9b5baa7b..14fd1e6862 100644 --- a/progs/demos/engine.c +++ b/progs/demos/engine.c @@ -554,7 +554,7 @@ SquareWithHole(float squareSize, float holeRadius) for (i = 0; i <= 360; i += 5) { const float x1 = holeRadius * cos(DEG_TO_RAD(i)); const float y1 = holeRadius * sin(DEG_TO_RAD(i)); - float x2, y2; + float x2 = 0.0F, y2 = 0.0F; if (i > 315 || i <= 45) { x2 = squareSize; y2 = squareSize * tan(DEG_TO_RAD(i)); |