wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 680082 - [backout] Add GetMaxTextureImageSize to correct size support for TiledTextureImage.

Browse Source
This commit is contained in:
Benoit Girard 2011-10-27 10:17:40 -04:00
parent 662ec0aafa
commit bfebbb2e0b
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/layers/opengl/ThebesLayerOGL.cpp
View File

@ -506,8 +506,8 @@ BasicBufferOGL::BeginPaint(ContentType aContentType,
if (result.mRegionToDraw.IsEmpty()) if (result.mRegionToDraw.IsEmpty())
return result; return result;
if (destBufferRect.width > gl()->GetMaxTextureImageSize() || if (destBufferRect.width > gl()->GetMaxTextureSize() ||
destBufferRect.height > gl()->GetMaxTextureImageSize()) { destBufferRect.height > gl()->GetMaxTextureSize()) {
return result; return result;
} }

1
gfx/thebes/GLContext.cpp
View File

@ -419,7 +419,6 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
fGetIntegerv(LOCAL_GL_MAX_TEXTURE_SIZE, &mMaxTextureSize); fGetIntegerv(LOCAL_GL_MAX_TEXTURE_SIZE, &mMaxTextureSize);
fGetIntegerv(LOCAL_GL_MAX_RENDERBUFFER_SIZE, &mMaxRenderbufferSize); fGetIntegerv(LOCAL_GL_MAX_RENDERBUFFER_SIZE, &mMaxRenderbufferSize);
mMaxTextureImageSize = mMaxTextureSize;
UpdateActualFormat(); UpdateActualFormat();
} }

2
gfx/thebes/GLContext.h
View File

@ -1258,7 +1258,6 @@ public:
const char *extension); const char *extension);
GLint GetMaxTextureSize() { return mMaxTextureSize; } GLint GetMaxTextureSize() { return mMaxTextureSize; }
GLint GetMaxTextureImageSize() { return mMaxTextureImageSize; }
void SetFlipped(bool aFlipped) { mFlipped = aFlipped; } void SetFlipped(bool aFlipped) { mFlipped = aFlipped; }
// this should just be a std::bitset, but that ended up breaking // this should just be a std::bitset, but that ended up breaking
@ -1398,7 +1397,6 @@ protected:
nsTArray<nsIntRect> mScissorStack; nsTArray<nsIntRect> mScissorStack;
GLint mMaxTextureSize; GLint mMaxTextureSize;
GLint mMaxTextureImageSize;
GLint mMaxRenderbufferSize; GLint mMaxRenderbufferSize;
public: public:

3
gfx/thebes/GLContextProviderEGL.cpp
View File

@ -726,9 +726,6 @@ public:
} }
bool ok = InitWithPrefix("gl", true); bool ok = InitWithPrefix("gl", true);
PR_STATIC_ASSERT(sizeof(GLint) >= sizeof(int32_t));
mMaxTextureImageSize = INT32_MAX;
#if 0 #if 0
if (ok) { if (ok) {
EGLint v; EGLint v;