| … | |
… | |
| 17 | { |
17 | { |
| 18 | id = *(occ_query_objects.end () - 1); |
18 | id = *(occ_query_objects.end () - 1); |
| 19 | occ_query_objects.pop_back (); |
19 | occ_query_objects.pop_back (); |
| 20 | } |
20 | } |
| 21 | else |
21 | else |
| 22 | glGenQueriesARB (1, &id); |
22 | glGenQueries (1, &id); |
| 23 | |
23 | |
| 24 | glBeginQueryARB (GL_SAMPLES_PASSED, id); |
24 | glBeginQuery (GL_SAMPLES_PASSED, id); |
| 25 | return id; |
25 | return id; |
| 26 | } |
26 | } |
| 27 | |
27 | |
| 28 | inline void end_occ_query () |
28 | inline void end_occ_query () |
| 29 | { |
29 | { |
| 30 | glEndQueryARB (GL_SAMPLES_PASSED); |
30 | glEndQuery (GL_SAMPLES_PASSED); |
| 31 | } |
31 | } |
| 32 | |
32 | |
| 33 | static GLuint occ_query_result (GLuint id) |
33 | static GLuint occ_query_result (GLuint id) |
| 34 | { |
34 | { |
| 35 | GLuint count; |
35 | GLuint count; |
| 36 | |
36 | |
| 37 | glGetQueryObjectuivARB (id, GL_QUERY_RESULT, &count); |
37 | glGetQueryObjectuiv (id, GL_QUERY_RESULT, &count); |
| 38 | occ_query_objects.push_back (id); |
38 | occ_query_objects.push_back (id); |
| 39 | |
39 | |
| 40 | return count; |
40 | return count; |
| 41 | } |
41 | } |
| 42 | |
42 | |
| … | |
… | |
| 171 | z_far = max (nz_far, z_near * 2.F); |
171 | z_far = max (nz_far, z_near * 2.F); |
| 172 | c_far = nc_far; |
172 | c_far = nc_far; |
| 173 | |
173 | |
| 174 | reset_projection (); |
174 | reset_projection (); |
| 175 | |
175 | |
| 176 | nz_near = 1e37; |
176 | nz_near = 100.; |
| 177 | nc_far = nz_far = 1.F; |
177 | nc_far = nz_far = 1.F; |
| 178 | } |
178 | } |
| 179 | |
179 | |
| 180 | void view::end () |
180 | void view::end () |
| 181 | { |
181 | { |
