diff options
| author | José Fonseca <jfonseca@vmware.com> | 2014-12-01 20:24:06 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2014-12-01 20:24:51 +0000 |
| commit | 0806bf88158cb3ac865762285f11082114520c48 (patch) | |
| tree | 5ac865713e4e3bf0be9b41cc067c4e81083ce917 /src/gallium/tests/graw/tri-gs.c | |
| parent | 120426b13d8ef3d154301a1f8741230fa395fc13 (diff) | |
| download | external_mesa3d-0806bf88158cb3ac865762285f11082114520c48.zip external_mesa3d-0806bf88158cb3ac865762285f11082114520c48.tar.gz external_mesa3d-0806bf88158cb3ac865762285f11082114520c48.tar.bz2 | |
graw: Avoid 'near'/'far' variables.
They are defined by windows.h, which got included slightly more
frequently than before with u_atomic.h
Diffstat (limited to 'src/gallium/tests/graw/tri-gs.c')
| -rw-r--r-- | src/gallium/tests/graw/tri-gs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/tests/graw/tri-gs.c b/src/gallium/tests/graw/tri-gs.c index 7fe340d..5c6f426 100644 --- a/src/gallium/tests/graw/tri-gs.c +++ b/src/gallium/tests/graw/tri-gs.c @@ -51,12 +51,12 @@ static struct vertex vertices[4] = static void set_viewport( float x, float y, float width, float height, - float near, float far) + float zNear, float zFar) { - float z = far; + float z = zFar; float half_width = (float)width / 2.0f; float half_height = (float)height / 2.0f; - float half_depth = ((float)far - (float)near) / 2.0f; + float half_depth = ((float)zFar - (float)zNear) / 2.0f; struct pipe_viewport_state vp; vp.scale[0] = half_width; |