Title: [188536] trunk/Source/WebCore
- Revision
- 188536
- Author
- [email protected]
- Date
- 2015-08-17 13:19:55 -0700 (Mon, 17 Aug 2015)
Log Message
Remove unused multisampling check
https://bugs.webkit.org/show_bug.cgi?id=148030
Patch by Alex Christensen <[email protected]> on 2015-08-17
Reviewed by Dean Jackson.
No change in behavior.
Extensions3DOpenGLCommon.m_maySupportMultisampling is always true.
* platform/graphics/Extensions3D.h:
* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
(WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon):
* platform/graphics/opengl/Extensions3DOpenGLCommon.h:
(WebCore::Extensions3DOpenGLCommon::isImagination):
(WebCore::Extensions3DOpenGLCommon::vendor):
(WebCore::Extensions3DOpenGLCommon::requiresBuiltInFunctionEmulation):
(WebCore::Extensions3DOpenGLCommon::requiresRestrictedMaximumTextureSize):
(WebCore::Extensions3DOpenGLCommon::maySupportMultisampling): Deleted.
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::validateDepthStencil):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188535 => 188536)
--- trunk/Source/WebCore/ChangeLog 2015-08-17 19:52:56 UTC (rev 188535)
+++ trunk/Source/WebCore/ChangeLog 2015-08-17 20:19:55 UTC (rev 188536)
@@ -1,3 +1,25 @@
+2015-08-17 Alex Christensen <[email protected]>
+
+ Remove unused multisampling check
+ https://bugs.webkit.org/show_bug.cgi?id=148030
+
+ Reviewed by Dean Jackson.
+
+ No change in behavior.
+ Extensions3DOpenGLCommon.m_maySupportMultisampling is always true.
+
+ * platform/graphics/Extensions3D.h:
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+ (WebCore::Extensions3DOpenGLCommon::Extensions3DOpenGLCommon):
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.h:
+ (WebCore::Extensions3DOpenGLCommon::isImagination):
+ (WebCore::Extensions3DOpenGLCommon::vendor):
+ (WebCore::Extensions3DOpenGLCommon::requiresBuiltInFunctionEmulation):
+ (WebCore::Extensions3DOpenGLCommon::requiresRestrictedMaximumTextureSize):
+ (WebCore::Extensions3DOpenGLCommon::maySupportMultisampling): Deleted.
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::validateDepthStencil):
+
2015-08-17 Andy Estes <[email protected]>
REGRESSION (r188486): Crash in SubresourceLoader::didReceiveResponse() when TemporaryChange goes out of scope
Modified: trunk/Source/WebCore/platform/graphics/Extensions3D.h (188535 => 188536)
--- trunk/Source/WebCore/platform/graphics/Extensions3D.h 2015-08-17 19:52:56 UTC (rev 188535)
+++ trunk/Source/WebCore/platform/graphics/Extensions3D.h 2015-08-17 20:19:55 UTC (rev 188536)
@@ -255,13 +255,6 @@
virtual bool isImagination() = 0;
virtual String vendor() = 0;
- // If this method returns false then the system *definitely* does not support multisampling.
- // It does not necessarily say the system does support it - callers must attempt to construct
- // multisampled renderbuffers and check framebuffer completeness.
- // Ports should implement this to return false on configurations where it is known
- // that multisampling is not available.
- virtual bool maySupportMultisampling() = 0;
-
// Some configurations have bugs regarding built-in functions in their OpenGL drivers
// that must be avoided. Ports should implement these flags on such configurations.
virtual bool requiresBuiltInFunctionEmulation() = 0;
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (188535 => 188536)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2015-08-17 19:52:56 UTC (rev 188535)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2015-08-17 20:19:55 UTC (rev 188536)
@@ -58,7 +58,6 @@
, m_isAMD(false)
, m_isIntel(false)
, m_isImagination(false)
- , m_maySupportMultisampling(true)
, m_requiresBuiltInFunctionEmulation(false)
, m_requiresRestrictedMaximumTextureSize(false)
{
@@ -80,17 +79,8 @@
if (m_isAMD || m_isIntel)
m_requiresBuiltInFunctionEmulation = true;
- // Currently in Mac we only allow multisampling if the vendor is NVIDIA,
- // or if the vendor is AMD/ATI and the system is 10.7.2 and above.
-
- bool systemSupportsMultisampling = true;
-
- if (m_isAMD && !systemSupportsMultisampling)
- m_maySupportMultisampling = false;
-
// Intel HD 3000 devices have problems with large textures. <rdar://problem/16649140>
- if (m_isIntel)
- m_requiresRestrictedMaximumTextureSize = m_renderer.startsWith("Intel HD Graphics 3000");
+ m_requiresRestrictedMaximumTextureSize = m_renderer.startsWith("Intel HD Graphics 3000");
#endif
}
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h (188535 => 188536)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h 2015-08-17 19:52:56 UTC (rev 188535)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.h 2015-08-17 20:19:55 UTC (rev 188536)
@@ -65,7 +65,6 @@
virtual bool isImagination() { return m_isImagination; }
virtual String vendor() { return m_vendor; }
- virtual bool maySupportMultisampling() { return m_maySupportMultisampling; }
virtual bool requiresBuiltInFunctionEmulation() { return m_requiresBuiltInFunctionEmulation; }
virtual bool requiresRestrictedMaximumTextureSize() { return m_requiresRestrictedMaximumTextureSize; }
@@ -87,7 +86,6 @@
bool m_isAMD;
bool m_isIntel;
bool m_isImagination;
- bool m_maySupportMultisampling;
bool m_requiresBuiltInFunctionEmulation;
bool m_requiresRestrictedMaximumTextureSize;
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (188535 => 188536)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2015-08-17 19:52:56 UTC (rev 188535)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2015-08-17 20:19:55 UTC (rev 188536)
@@ -133,7 +133,7 @@
m_attrs.stencil = false;
}
if (m_attrs.antialias) {
- if (!extensions->maySupportMultisampling() || !extensions->supports("GL_ANGLE_framebuffer_multisample") || isGLES2Compliant())
+ if (!extensions->supports("GL_ANGLE_framebuffer_multisample") || isGLES2Compliant())
m_attrs.antialias = false;
else
extensions->ensureEnabled("GL_ANGLE_framebuffer_multisample");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
