diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-11 01:21:42 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-11 01:21:42 +0300 |
| commit | ee49b3b045e366aec466f46743214386d7fecb21 (patch) | |
| tree | d5b498f2a73eb6709b5c24241549f854a14b7bb6 /indra/llrender/llrendertarget.h | |
| parent | 8f6e50ed6a8b2a3f7b2a173bf7c535aac13f22b5 (diff) | |
| parent | a73773bc1abdac6bc3beea36fd4ba58eba686e13 (diff) | |
Merge branch 'main' into marchcat/c-merge
# Conflicts:
# indra/newview/llviewermenufile.cpp
Diffstat (limited to 'indra/llrender/llrendertarget.h')
| -rw-r--r-- | indra/llrender/llrendertarget.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h index b5745b5b49..340276a752 100644 --- a/indra/llrender/llrendertarget.h +++ b/indra/llrender/llrendertarget.h @@ -169,6 +169,9 @@ public: static LLRenderTarget* getCurrentBoundTarget() { return sBoundTarget; } + // *HACK + void swapFBORefs(LLRenderTarget& other); + protected: U32 mResX; U32 mResY; |