diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
| tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h | |
| parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
| download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 | |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h')
| -rw-r--r-- | WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h index c1de77c..e865710 100644 --- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h +++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.h @@ -70,8 +70,6 @@ public: virtual int sizeInBytes(int type); virtual bool isGLES2Compliant(); - virtual bool isGLES2NPOTStrict(); - virtual bool isErrorGeneratedOnOutOfBoundsAccesses(); virtual void reshape(int width, int height); @@ -271,6 +269,10 @@ private: WebGraphicsContext3D::Attributes m_attributes; bool m_initialized; bool m_renderDirectlyToWebView; + bool m_isGLES2; + bool m_haveEXTFramebufferObject; + bool m_haveEXTFramebufferMultisample; + bool m_haveANGLEFramebufferMultisample; unsigned int m_texture; unsigned int m_fbo; |