Title: [153588] trunk/Source/WebCore
- Revision
- 153588
- Author
- [email protected]
- Date
- 2013-08-01 09:53:48 -0700 (Thu, 01 Aug 2013)
Log Message
Made OESTextureHalfFloat work on Windows.
https://bugs.webkit.org/show_bug.cgi?id=119298
Reviewed by Christophe Dumez.
* DerivedSources.cpp: Added JSOESTextureHalfFloat.cpp inside of #if ENABLE(WEBGL).
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
Added JSOESTextureHalfFloat.cpp and JSOESTextureHalfFloat.h.
* html/canvas/OESTextureHalfFloat.idl: Added newline to end of file.
* html/canvas/WebGLObject.cpp: Removed unused #includes.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (153587 => 153588)
--- trunk/Source/WebCore/ChangeLog 2013-08-01 16:47:15 UTC (rev 153587)
+++ trunk/Source/WebCore/ChangeLog 2013-08-01 16:53:48 UTC (rev 153588)
@@ -1,3 +1,17 @@
+2013-08-01 Alex Christensen <[email protected]>
+
+ Made OESTextureHalfFloat work on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=119298
+
+ Reviewed by Christophe Dumez.
+
+ * DerivedSources.cpp: Added JSOESTextureHalfFloat.cpp inside of #if ENABLE(WEBGL).
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ Added JSOESTextureHalfFloat.cpp and JSOESTextureHalfFloat.h.
+ * html/canvas/OESTextureHalfFloat.idl: Added newline to end of file.
+ * html/canvas/WebGLObject.cpp: Removed unused #includes.
+
2013-08-01 Patrick Gansterer <[email protected]>
Rearrange the code of FrameWin
Modified: trunk/Source/WebCore/DerivedSources.cpp (153587 => 153588)
--- trunk/Source/WebCore/DerivedSources.cpp 2013-08-01 16:47:15 UTC (rev 153587)
+++ trunk/Source/WebCore/DerivedSources.cpp 2013-08-01 16:53:48 UTC (rev 153588)
@@ -44,6 +44,7 @@
#include "JSOESElementIndexUint.cpp"
#include "JSOESStandardDerivatives.cpp"
#include "JSOESTextureFloat.cpp"
+#include "JSOESTextureHalfFloat.cpp"
#include "JSOESVertexArrayObject.cpp"
#include "JSWebGLActiveInfo.cpp"
#include "JSWebGLBuffer.cpp"
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (153587 => 153588)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-08-01 16:47:15 UTC (rev 153587)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-08-01 16:53:48 UTC (rev 153588)
@@ -340,6 +340,20 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESTextureHalfFloat.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESVertexArrayObject.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -18731,6 +18745,7 @@
<ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESElementIndexUint.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESStandardDerivatives.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESTextureFloat.h" />
+ <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESTextureHalfFloat.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESVertexArrayObject.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWebGLActiveInfo.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSWebGLBuffer.h" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (153587 => 153588)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-08-01 16:47:15 UTC (rev 153587)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-08-01 16:53:48 UTC (rev 153588)
@@ -6877,6 +6877,9 @@
<ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESTextureFloat.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESTextureHalfFloat.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESVertexArrayObject.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
@@ -14640,6 +14643,9 @@
<ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESTextureFloat.h">
<Filter>DerivedSources</Filter>
</ClInclude>
+ <ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESTextureHalfFloat.h">
+ <Filter>DerivedSources</Filter>
+ </ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj32\WebCore\DerivedSources\JSOESVertexArrayObject.h">
<Filter>DerivedSources</Filter>
</ClInclude>
Modified: trunk/Source/WebCore/html/canvas/OESTextureHalfFloat.idl (153587 => 153588)
--- trunk/Source/WebCore/html/canvas/OESTextureHalfFloat.idl 2013-08-01 16:47:15 UTC (rev 153587)
+++ trunk/Source/WebCore/html/canvas/OESTextureHalfFloat.idl 2013-08-01 16:53:48 UTC (rev 153588)
@@ -28,4 +28,4 @@
Conditional=WEBGL,
GenerateIsReachable=ImplContext,
] interface OESTextureHalfFloat {
-};
\ No newline at end of file
+};
Modified: trunk/Source/WebCore/html/canvas/WebGLObject.cpp (153587 => 153588)
--- trunk/Source/WebCore/html/canvas/WebGLObject.cpp 2013-08-01 16:47:15 UTC (rev 153587)
+++ trunk/Source/WebCore/html/canvas/WebGLObject.cpp 2013-08-01 16:53:48 UTC (rev 153588)
@@ -30,9 +30,6 @@
#include "WebGLObject.h"
#include "EXTTextureFilterAnisotropic.h"
-#include "OESStandardDerivatives.h"
-#include "OESTextureFloat.h"
-#include "OESVertexArrayObject.h"
#include "WebGLCompressedTextureS3TC.h"
#include "WebGLContextGroup.h"
#include "WebGLDebugRendererInfo.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
