[webkit-changes] [199743] trunk/Source

Tue, 19 Apr 2016 14:45:55 -0700

Title: [199743] trunk/Source
Revision
199743
Author
[email protected]
Date
2016-04-19 14:45:44 -0700 (Tue, 19 Apr 2016)

Log Message

Build fix after r199738

Source/ThirdParty/ANGLE:

* CMakeLists.txt:

Source/WebCore:

* platform/graphics/efl/GraphicsContext3DEfl.cpp:
(WebCore::GraphicsContext3D::GraphicsContext3D):
* platform/graphics/win/GraphicsContext3DWin.cpp:
(WebCore::GraphicsContext3D::GraphicsContext3D):

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (199742 => 199743)


--- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt	2016-04-19 21:02:15 UTC (rev 199742)
+++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt	2016-04-19 21:45:44 UTC (rev 199743)
@@ -82,7 +82,6 @@
     src/compiler/translator/SearchSymbol.cpp
     src/compiler/translator/StructureHLSL.cpp
     src/compiler/translator/TranslatorHLSL.cpp
-    src/compiler/translator/UnfoldShortCircuit.cpp
     src/compiler/translator/UniformHLSL.cpp
     src/compiler/translator/UtilsHLSL.cpp
     src/compiler/translator/ArrayReturnValueToOutParameter.cpp
@@ -127,7 +126,6 @@
     src/compiler/translator/ShaderVars.cpp
     src/compiler/translator/SymbolTable.cpp
     src/compiler/translator/Types.cpp
-    src/compiler/translator/UnfoldShortCircuit.cpp
     src/compiler/translator/UnfoldShortCircuitAST.cpp
     src/compiler/translator/UnfoldShortCircuitToIf.cpp
     src/compiler/translator/util.cpp
@@ -179,6 +177,7 @@
     src/libANGLE/renderer/d3d/CompilerD3D.cpp
     src/libANGLE/renderer/d3d/EGLImageD3D.cpp
     src/libANGLE/renderer/d3d/copyimage.cpp
+    src/libANGLE/renderer/d3d/loadimage_etc.cpp
     src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
     src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
     src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
@@ -204,7 +203,6 @@
     src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
     src/libANGLE/renderer/d3d/d3d11/VertexBuffer11.cpp
     src/libANGLE/renderer/d3d/d3d11/dxgi_support_table.cpp
-    src/libANGLE/renderer/d3d/d3d11/loadimage_etc.cpp
     src/libANGLE/renderer/d3d/d3d11/load_functions_table_autogen.cpp
     src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
     src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (199742 => 199743)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2016-04-19 21:02:15 UTC (rev 199742)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2016-04-19 21:45:44 UTC (rev 199743)
@@ -1,5 +1,11 @@
 2016-04-19  Alex Christensen  <[email protected]>
 
+        Build fix after r199738
+
+        * CMakeLists.txt:
+
+2016-04-19  Alex Christensen  <[email protected]>
+
         Build fix.
 
         * src/compiler/translator/Intermediate.h: Added.

Modified: trunk/Source/WebCore/ChangeLog (199742 => 199743)


--- trunk/Source/WebCore/ChangeLog	2016-04-19 21:02:15 UTC (rev 199742)
+++ trunk/Source/WebCore/ChangeLog	2016-04-19 21:45:44 UTC (rev 199743)
@@ -1,3 +1,12 @@
+2016-04-19  Alex Christensen  <[email protected]>
+
+        Build fix after r199738
+
+        * platform/graphics/efl/GraphicsContext3DEfl.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+        * platform/graphics/win/GraphicsContext3DWin.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
 2016-04-19  Keith Miller  <[email protected]>
 
         ObjcInstance::stringValue should not call NSObject's description method

Modified: trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp (199742 => 199743)


--- trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp	2016-04-19 21:02:15 UTC (rev 199742)
+++ trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp	2016-04-19 21:45:44 UTC (rev 199743)
@@ -39,7 +39,7 @@
 GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attrs, HostWindow* hostWindow, GraphicsContext3D::RenderStyle renderStyle)
     : m_currentWidth(0)
     , m_currentHeight(0)
-    , m_compiler(isGLES2Compliant() ? SH_ESSL_OUTPUT : SH_GLSL_OUTPUT)
+    , m_compiler(isGLES2Compliant() ? SH_ESSL_OUTPUT : SH_GLSL_COMPATIBILITY_OUTPUT)
     , m_attrs(attrs)
     , m_renderStyle(renderStyle)
     , m_texture(0)

Modified: trunk/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp (199742 => 199743)


--- trunk/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp	2016-04-19 21:02:15 UTC (rev 199742)
+++ trunk/Source/WebCore/platform/graphics/win/GraphicsContext3DWin.cpp	2016-04-19 21:45:44 UTC (rev 199743)
@@ -69,7 +69,7 @@
 GraphicsContext3D::GraphicsContext3D(GraphicsContext3D::Attributes attributes, HostWindow*, GraphicsContext3D::RenderStyle renderStyle)
     : m_currentWidth(0)
     , m_currentHeight(0)
-    , m_compiler(isGLES2Compliant() ? SH_ESSL_OUTPUT : SH_GLSL_OUTPUT)
+    , m_compiler(isGLES2Compliant() ? SH_ESSL_OUTPUT : SH_GLSL_COMPATIBILITY_OUTPUT)
     , m_attrs(attributes)
     , m_texture(0)
     , m_fbo(0)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to