summaryrefslogtreecommitdiffstats
path: root/src/gallium/tests/graw/tri-instanced.c
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2014-12-01 20:24:06 +0000
committerJosé Fonseca <[email protected]>2014-12-01 20:24:51 +0000
commit0806bf88158cb3ac865762285f11082114520c48 (patch)
tree5ac865713e4e3bf0be9b41cc067c4e81083ce917 /src/gallium/tests/graw/tri-instanced.c
parent120426b13d8ef3d154301a1f8741230fa395fc13 (diff)
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-instanced.c')
-rw-r--r--src/gallium/tests/graw/tri-instanced.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/tests/graw/tri-instanced.c b/src/gallium/tests/graw/tri-instanced.c
index 65c5936e6bd..a71bf71b61b 100644
--- a/src/gallium/tests/graw/tri-instanced.c
+++ b/src/gallium/tests/graw/tri-instanced.c
@@ -80,12 +80,12 @@ static ushort indices[3] = { 0, 2, 1 };
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;