Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 656215 - check max size for textures and renderbuffers - r=joedrew

Browse Source 
This is needed to correctly handle exceedingly large canvases, for example.
This commit is contained in:
Benoit Jacob 2011-05-20 15:53:53 -04:00
parent b5dc4a0330
commit 7e05c500e7
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/thebes/GLContext.cpp
View File

@ -383,6 +383,7 @@ GLContext::InitWithPrefix(const char *prefix, PRBool trygl)
mViewportStack.AppendElement(nsIntRect(v[0], v[1], v[2], v[3])); mViewportStack.AppendElement(nsIntRect(v[0], v[1], v[2], v[3]));
fGetIntegerv(LOCAL_GL_MAX_TEXTURE_SIZE, &mMaxTextureSize); fGetIntegerv(LOCAL_GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);
fGetIntegerv(LOCAL_GL_MAX_RENDERBUFFER_SIZE, &mMaxRenderbufferSize);
UpdateActualFormat(); UpdateActualFormat();
} }
@ -702,6 +703,9 @@ BasicTextureImage::Resize(const nsIntSize& aSize)
PRBool PRBool
GLContext::ResizeOffscreenFBO(const gfxIntSize& aSize) GLContext::ResizeOffscreenFBO(const gfxIntSize& aSize)
{ {
if (!IsOffscreenSizeAllowed(aSize))
return PR_FALSE;
MakeCurrent(); MakeCurrent();
bool alpha = mCreationFormat.alpha > 0; bool alpha = mCreationFormat.alpha > 0;

7
gfx/thebes/GLContext.h
View File

@ -994,11 +994,18 @@ protected:
return teximage.forget(); return teximage.forget();
} }
bool IsOffscreenSizeAllowed(const gfxIntSize& aSize) const {
PRInt32 biggerDimension = NS_MAX(aSize.width, aSize.height);
PRInt32 maxAllowed = NS_MIN(mMaxRenderbufferSize, mMaxTextureSize);
return biggerDimension <= maxAllowed;
}
protected: protected:
nsTArray<nsIntRect> mViewportStack; nsTArray<nsIntRect> mViewportStack;
nsTArray<nsIntRect> mScissorStack; nsTArray<nsIntRect> mScissorStack;
GLint mMaxTextureSize; GLint mMaxTextureSize;
GLint mMaxRenderbufferSize;
public: public: