diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-01-04 18:34:27 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-01-04 18:34:27 -0600 |
| commit | 808cd0fcbfe017c1212fb0c1d423fa06bb06c148 (patch) | |
| tree | ed2091597430c0fef9f6705e5003d4661a9d2ea7 /indra/newview/llspatialpartition.h | |
| parent | 1e647e2cd2d0385bcf46fa054056de3615e95377 (diff) | |
VWR-21927 Fix for water reflections causing LoD updates.
SH-735 Potential fix for ATI X1950 wasting time in occlusion culling.
Diffstat (limited to 'indra/newview/llspatialpartition.h')
| -rw-r--r-- | indra/newview/llspatialpartition.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 16ec9f780b..85fd66b297 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -59,7 +59,8 @@ S32 AABBSphereIntersectR2(const LLVector3& min, const LLVector3& max, const LLVe void pushVerts(LLFace* face, U32 mask); // get index buffer for binary encoded axis vertex buffer given a box at center being viewed by given camera -U8* get_box_fan_indices(LLCamera* camera, const LLVector4a& center); +U32 get_box_fan_indices(LLCamera* camera, const LLVector4a& center); +U8* get_box_fan_indices_ptr(LLCamera* camera, const LLVector4a& center); class LLDrawInfo : public LLRefCount { @@ -393,7 +394,7 @@ public: LLSpatialPartition* mSpatialPartition; LLPointer<LLVertexBuffer> mVertexBuffer; - LLVector4a* mOcclusionVerts; + LLPointer<LLVertexBuffer> mOcclusionVerts; GLuint mOcclusionQuery[LLViewerCamera::NUM_CAMERAS]; U32 mBufferUsage; |