Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Testicular Slingshot
Alchemy Viewer
Commits
660ff6ba
Commit
660ff6ba
authored
Feb 19, 2020
by
Rye Mutt
🍞
Browse files
Import Beq Janus's changes to fix skypants.
parent
55204be2
Changes
1
Hide whitespace changes
Inline
Side-by-side
indra/newview/lldynamictexture.cpp
View file @
660ff6ba
...
...
@@ -125,11 +125,11 @@ BOOL LLViewerDynamicTexture::render()
//-----------------------------------------------------------------------------
void
LLViewerDynamicTexture
::
preRender
(
BOOL
clear_depth
)
{
//only images up to 1024*1024 are supported
llassert
(
mFull
Height
<=
512
);
llassert
(
mFull
Width
<=
512
);
gPipeline
.
allocatePhysicsBuffer
();
llassert
(
mFull
Width
<=
static_cast
<
S32
>
(
gPipeline
.
mPhysicsDisplay
.
getWidth
())
);
llassert
(
mFull
Height
<=
static_cast
<
S32
>
(
gPipeline
.
mPhysicsDisplay
.
getHeight
())
);
if
(
gGLManager
.
mHasFramebufferObject
&&
gPipeline
.
m
WaterDis
.
isComplete
()
&&
!
gGLManager
.
mIsATI
)
if
(
gGLManager
.
mHasFramebufferObject
&&
gPipeline
.
m
PhysicsDisplay
.
isComplete
()
&&
!
gGLManager
.
mIsATI
)
{
//using offscreen render target, just use the bottom left corner
mOrigin
.
set
(
0
,
0
);
}
...
...
@@ -216,11 +216,10 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
return
TRUE
;
}
bool
use_fbo
=
gGLManager
.
mHasFramebufferObject
&&
gPipeline
.
mWaterDis
.
isComplete
()
&&
!
gGLManager
.
mIsATI
;
bool
use_fbo
=
gGLManager
.
mHasFramebufferObject
&&
gPipeline
.
mPhysicsDisplay
.
isComplete
()
&&
!
gGLManager
.
mIsATI
;
if
(
use_fbo
)
{
gPipeline
.
m
WaterDis
.
bindTarget
();
gPipeline
.
m
PhysicsDisplay
.
bindTarget
();
}
LLGLSLShader
::
bindNoShader
();
...
...
@@ -256,7 +255,7 @@ BOOL LLViewerDynamicTexture::updateAllInstances()
if
(
use_fbo
)
{
gPipeline
.
m
WaterDis
.
flush
();
gPipeline
.
m
PhysicsDisplay
.
flush
();
}
return
ret
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment