isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 20:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

pipeline: don't use near/far symbols

Browse Source 
According to 9cc9033347 the windows headers #define near as nothing,
and presumable the same is true for 'far' too. Apparently this define is
to improve compatibility with code written for Windows 3.1, so it's good
that people will be able to incorporate such code into their Clutter
applications.
This commit is contained in:
Robert Bragg 2010-12-08 11:30:00 +00:00
parent acd3d61568
commit ea66156c83
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clutter/cogl/cogl/cogl-pipeline.c
View File

@ -5902,11 +5902,11 @@ _cogl_pipeline_hash_depth_state (CoglPipeline *authority,
if (depth_state->depth_writing_enabled) if (depth_state->depth_writing_enabled)
{ {
guint8 enabled = depth_state->depth_writing_enabled; guint8 enabled = depth_state->depth_writing_enabled;
float near = depth_state->depth_range_near; float near_val = depth_state->depth_range_near;
float far = depth_state->depth_range_far; float far_val = depth_state->depth_range_far;
hash = _cogl_util_one_at_a_time_hash (hash, &enabled, sizeof (enabled)); hash = _cogl_util_one_at_a_time_hash (hash, &enabled, sizeof (enabled));
hash = _cogl_util_one_at_a_time_hash (hash, &near, sizeof (near)); hash = _cogl_util_one_at_a_time_hash (hash, &near_val, sizeof (near_val));
hash = _cogl_util_one_at_a_time_hash (hash, &far, sizeof (far)); hash = _cogl_util_one_at_a_time_hash (hash, &far_val, sizeof (far_val));
} }
state->hash = hash; state->hash = hash;