[cogl] Revert "Do not use "near" and "far" variables"



commit e86543cd7d1db7fe1d88b6875a8662e377c9e9df
Author: Neil Roberts <neil linux intel com>
Date:   Tue Jun 14 14:40:27 2011 +0100

    Revert "Do not use "near" and "far" variables"
    
    This reverts commit 3d2564df8f71d6030d9496b7f8e57a27905a4b5a.
    
    Since 01e1260aa the 'near' and 'far' defines are now undef'd on
    Windows so we no longer have to remember not to use them in Cogl code.

 cogl/cogl-depth-state.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/cogl/cogl-depth-state.c b/cogl/cogl-depth-state.c
index c382ec1..076d1b2 100644
--- a/cogl/cogl-depth-state.c
+++ b/cogl/cogl-depth-state.c
@@ -89,12 +89,12 @@ cogl_depth_state_get_test_function (CoglDepthState *state)
 
 void
 cogl_depth_state_set_range (CoglDepthState *state,
-                            float near_val,
-                            float far_val)
+                            float near,
+                            float far)
 {
   g_return_if_fail (state->magic == COGL_DEPTH_STATE_MAGIC);
-  state->range_near = near_val;
-  state->range_far = far_val;
+  state->range_near = near;
+  state->range_far = far;
 }
 
 void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]