Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browser window less likely to display garbage when resized. (Initialized gl texture to black)

Browse Source 
Could improve even further by padding area around copied plugin texture with black. Doesn't seem too necessary tho.
This commit is contained in:
Shyotl
2011-03-10 22:57:48 -06:00
parent 996aaf6345
commit 4c3a73658c
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lldynamictexture.cpp
View File

@@ -97,7 +97,7 @@ void LLDynamicTexture::generateGLTexture()
generateGLTexture(-1, 0, 0, FALSE);
}
void LLDynamicTexture::generateGLTexture(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, BOOL swap_bytes)
void LLDynamicTexture::generateGLTexture(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, BOOL swap_bytes, const LLColor4U *fill_color/* = NULL*/)
{
if (mComponents < 1 || mComponents > 4)
{
@@ -105,6 +105,8 @@ void LLDynamicTexture::generateGLTexture(LLGLint internal_format, LLGLenum prima
}
releaseGLTexture();
LLPointer<LLImageRaw> raw_image = new LLImageRaw(mWidth, mHeight, mComponents);
if(fill_color)
raw_image->fill(*fill_color);
mTexture = new LLViewerImage(mWidth, mHeight, mComponents, FALSE);
if (internal_format >= 0)
{

2
indra/newview/lldynamictexture.h
View File

@@ -74,7 +74,7 @@ public:
protected:
void releaseGLTexture();
void generateGLTexture();
void generateGLTexture(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, BOOL swap_bytes = FALSE);
void generateGLTexture(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, BOOL swap_bytes = FALSE, const LLColor4U *fill_color = NULL);
protected:
S32 mWidth;

6
indra/newview/llmediactrl.cpp
View File

@@ -550,7 +550,7 @@ LLPluginClassMedia* LLMediaCtrl::getMediaPlugin()
//
void LLMediaCtrl::draw()
{
if ( ! mWebBrowserImage )
if ( ! mWebBrowserImage || mWebBrowserImage->getNeedsUpdate())
return;
if ( gRestoreGL == 1 )
@@ -1129,12 +1129,14 @@ bool LLWebBrowserTexture::updateBrowserTexture()
mHeight = media->getTextureHeight();
mTextureCoordsOpenGL = media->getTextureCoordsOpenGL();
const LLColor4U fill_color(0,0,0,255);
// will create mWidth * mHeight sized texture, using the texture params specified by the media.
LLDynamicTexture::generateGLTexture(
media->getTextureFormatInternal(),
media->getTextureFormatPrimary(),
media->getTextureFormatType(),
media->getTextureFormatSwapBytes());
media->getTextureFormatSwapBytes(),
&fill_color); //Initialize the texture to black.
mMediaSource->mNeedsNewTexture = false;