Changeset 152192 in webkit


Ignore:
Timestamp:
Jun 28, 2013 3:43:33 PM (11 years ago)
Author:
achristensen@apple.com
Message:

Added WebGL files to Windows build.
​https://bugs.webkit.org/show_bug.cgi?id=118200

Reviewed by Brent Fulgham.

  • WebCore.vcxproj/WebCore.vcxproj: Added WebGL files, removed unused GraphicsContext3DOpenGLES.cpp.
  • WebCore.vcxproj/WebCore.vcxproj.filters: Added WebGL files, removed unused GraphicsContext3DOpenGLES.cpp.
  • platform/graphics/cairo/GLContext.cpp: Only include GLContextEGL.h or GLContextGLX.h if they're needed.
  • platform/graphics/cg/GraphicsContext3DCG.cpp: Only include GraphicsContext3DNEON.h if it's needed.
Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r152185 r152192  
     12013-06-28  Alex Christensen  <achristensen@apple.com>
     2
     3        Added WebGL files to Windows build.
     4        https://bugs.webkit.org/show_bug.cgi?id=118200
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * WebCore.vcxproj/WebCore.vcxproj: Added WebGL files, removed unused GraphicsContext3DOpenGLES.cpp.
     9        * WebCore.vcxproj/WebCore.vcxproj.filters: Added WebGL files, removed unused GraphicsContext3DOpenGLES.cpp.
     10        * platform/graphics/cairo/GLContext.cpp: Only include GLContextEGL.h or GLContextGLX.h if they're needed.
     11        * platform/graphics/cg/GraphicsContext3DCG.cpp: Only include GraphicsContext3DNEON.h if it's needed.
     12
    1132013-06-28  Ryosuke Niwa  <rniwa@webkit.org>
    214

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r152167 r152192  
    362362      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    363363    </ClCompile>
     364    <ClCompile Include="..\bindings\js\JSWebGLRenderingContextCustom.cpp" />
    364365    <ClCompile Include="..\DerivedSources.cpp">
    365366      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    … …  
    38153816      <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">ICUVersion.h</ForcedIncludeFiles>
    38163817    </ClCompile>
     3818    <ClCompile Include="..\html\canvas\CanvasContextAttributes.cpp" />
    38173819    <ClCompile Include="..\html\canvas\CanvasPathMethods.cpp" />
    38183820    <ClCompile Include="..\html\canvas\EXTDrawBuffers.cpp" />
    … …  
    43484350    <ClCompile Include="..\platform\FileSystem.cpp" />
    43494351    <ClCompile Include="..\platform\graphics\ANGLEWebKitBridge.cpp" />
     4352    <ClCompile Include="..\platform\graphics\cairo\GLContext.cpp">
     4353      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     4354      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     4355      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     4356    </ClCompile>
     4357    <ClCompile Include="..\platform\graphics\cairo\GraphicsContext3DCairo.cpp">
     4358      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     4359      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     4360      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     4361    </ClCompile>
     4362    <ClCompile Include="..\platform\graphics\cairo\GraphicsContext3DPrivate.cpp">
     4363      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     4364      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     4365      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     4366    </ClCompile>
    43504367    <ClCompile Include="..\platform\graphics\ca\win\PlatformCAFiltersWin.cpp" />
     4368    <ClCompile Include="..\platform\graphics\cg\GraphicsContext3DCG.cpp">
     4369      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     4370      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
     4371    </ClCompile>
    43514372    <ClCompile Include="..\platform\graphics\cg\SubimageCacheWithTimer.cpp">
    43524373      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
    … …  
    43724393    <ClCompile Include="..\platform\graphics\opengl\GLPlatformContext.cpp" />
    43734394    <ClCompile Include="..\platform\graphics\opengl\GLPlatformSurface.cpp" />
     4395    <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGL.cpp">
     4396      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     4397      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     4398      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     4399    </ClCompile>
    43744400    <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLCommon.cpp" />
    4375     <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLES.cpp" />
     4401    <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLES.cpp">
     4402      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
     4403      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     4404    </ClCompile>
    43764405    <ClCompile Include="..\platform\HistogramSupport.cpp" />
    43774406    <ClCompile Include="..\platform\KillRingNone.cpp" />
    … …  
    1142411453    <ClInclude Include="..\ForwardingHeaders\runtime\WriteBarrier.h" />
    1142511454    <ClInclude Include="..\ForwardingHeaders\yarr\YarrJIT.h" />
     11455    <ClInclude Include="..\html\canvas\CanvasContextAttributes.h" />
    1142611456    <ClInclude Include="..\html\canvas\CanvasPathMethods.h" />
    1142711457    <ClInclude Include="..\html\canvas\EXTDrawBuffers.h" />
    … …  
    1185011880    <ClInclude Include="..\platform\graphics\ANGLEWebKitBridge.h" />
    1185111881    <ClInclude Include="..\platform\graphics\AudioTrackPrivate.h" />
     11882    <ClInclude Include="..\platform\graphics\cairo\GLContext.h" />
     11883    <ClInclude Include="..\platform\graphics\cairo\GraphicsContext3DPrivate.h" />
    1185211884    <ClInclude Include="..\platform\graphics\cg\SubimageCacheWithTimer.h">
    1185311885      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r152167 r152192  
    70317031      <Filter>platform\graphics\opengl</Filter>
    70327032    </ClCompile>
     7033    <ClCompile Include="..\page\CaptionUserPreferencesMediaAF.cpp">
     7034      <Filter>page</Filter>
     7035    </ClCompile>
     7036    <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGL.cpp">
     7037      <Filter>platform\graphics\opengl</Filter>
     7038    </ClCompile>
     7039    <ClCompile Include="..\platform\graphics\cg\GraphicsContext3DCG.cpp">
     7040      <Filter>platform\graphics\cg</Filter>
     7041    </ClCompile>
     7042    <ClCompile Include="..\bindings\js\JSWebGLRenderingContextCustom.cpp">
     7043      <Filter>bindings\js</Filter>
     7044    </ClCompile>
     7045    <ClCompile Include="..\platform\graphics\cairo\GraphicsContext3DCairo.cpp">
     7046      <Filter>platform\graphics\cairo</Filter>
     7047    </ClCompile>
     7048    <ClCompile Include="..\platform\graphics\cairo\GraphicsContext3DPrivate.cpp">
     7049      <Filter>platform\graphics\cairo</Filter>
     7050    </ClCompile>
     7051    <ClCompile Include="..\html\canvas\CanvasContextAttributes.cpp">
     7052      <Filter>html\canvas</Filter>
     7053    </ClCompile>
     7054    <ClCompile Include="..\platform\graphics\cairo\GLContext.cpp">
     7055      <Filter>platform\graphics\cairo</Filter>
     7056    </ClCompile>
    70337057    <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLES.cpp">
    70347058      <Filter>platform\graphics\opengl</Filter>
    7035     </ClCompile>
    7036     <ClCompile Include="..\page\CaptionUserPreferencesMediaAF.cpp">
    7037       <Filter>page</Filter>
    70387059    </ClCompile>
    70397060  </ItemGroup>
    … …  
    1473214753    <ClInclude Include="..\page\CaptionUserPreferencesMediaAF.h">
    1473314754      <Filter>page</Filter>
     14755    </ClInclude>
     14756    <ClInclude Include="..\platform\graphics\cairo\GraphicsContext3DPrivate.h">
     14757      <Filter>platform\graphics\cairo</Filter>
     14758    </ClInclude>
     14759    <ClInclude Include="..\html\canvas\CanvasContextAttributes.h">
     14760      <Filter>html\canvas</Filter>
     14761    </ClInclude>
     14762    <ClInclude Include="..\platform\graphics\cairo\GLContext.h">
     14763      <Filter>platform\graphics\cairo</Filter>
    1473414764    </ClInclude>
    1473514765  </ItemGroup>

  • trunk/Source/WebCore/platform/graphics/cairo/GLContext.cpp

    r151226 r152192  
    2222#if USE(OPENGL)
    2323
     24#if USE(EGL)
    2425#include "GLContextEGL.h"
     26#endif
     27
     28#if USE(GLX)
    2529#include "GLContextGLX.h"
     30#endif
     31
    2632#include <wtf/ThreadSpecific.h>
    2733

  • trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp

    r149387 r152192  
    3232
    3333#include "BitmapImage.h"
    34 #include "GraphicsContext3DNEON.h"
    3534#include "GraphicsContextCG.h"
    3635#include "Image.h"
     36
     37#if HAVE(ARM_NEON_INTRINSICS)
     38#include "GraphicsContext3DNEON.h"
     39#endif
    3740
    3841#include <CoreGraphics/CGBitmapContext.h>
Note: See TracChangeset for help on using the changeset viewer.