Move ShaderCache.h to the d3d directory.

Change-Id: I56e0f5ff11cebd8b9415081b930a804dcce9530c Reviewed-on: https://chromium-review.googlesource.com/185566Tested-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Move ShaderCache.h to the d3d directory.
7ea42a55 · Geoff Lang · 0bf3a982 · 7ea42a55 · 7ea42a55 · 7ea42a55
Commit 7ea42a55 authored Feb 10, 2014 by Geoff Lang
4 changed files
--- a/projects/src/libGLESv2.vcxproj
+++ b/projects/src/libGLESv2.vcxproj
@@ -161,7 +161,6 @@
    <ClInclude Include="..\..\src\libGLESv2\renderer\imageformats.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\ShaderExecutable.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\QueryImpl.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\ShaderCache.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\copyimage.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\IndexBuffer.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\loadimage.h"/>
@@ -248,6 +247,7 @@
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\ShaderCache.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\SwapChain9.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.h"/>

--- a/projects/src/libGLESv2.vcxproj.filters
+++ b/projects/src/libGLESv2.vcxproj.filters
@@ -112,7 +112,7 @@
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\TransformFeedback.h">
-      <Filter>libGLESv2</Filter>
+      <Filter>src\libGLESv2</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\Context.h">
      <Filter>src\libGLESv2</Filter>
@@ -139,7 +139,7 @@
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\libGLESv2\TransformFeedback.cpp">
-      <Filter>libGLESv2</Filter>
+      <Filter>src\libGLESv2</Filter>
    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\ProgramBinary.h">
      <Filter>src\libGLESv2</Filter>
@@ -276,9 +276,6 @@
    <ClInclude Include="..\..\src\libGLESv2\renderer\QueryImpl.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\ShaderCache.h">
-      <Filter>src\libGLESv2\renderer</Filter>
-    </ClInclude>
    <ClCompile Include="..\..\src\libGLESv2\renderer\VertexBuffer.cpp">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClCompile>
@@ -642,6 +639,9 @@
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\ShaderCache.h">
+      <Filter>src\libGLESv2\renderer\d3d9</Filter>
+    </ClInclude>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.cpp">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClCompile>

--- a/src/libGLESv2/renderer/d3d9/Renderer9.h
+++ b/src/libGLESv2/renderer/d3d9/Renderer9.h
@@ -11,7 +11,7 @@

 #include "common/angleutils.h"
 #include "common/mathutil.h"
-#include "libGLESv2/renderer/ShaderCache.h"
+#include "libGLESv2/renderer/d3d9/ShaderCache.h"
 #include "libGLESv2/renderer/d3d9/VertexDeclarationCache.h"
 #include "libGLESv2/renderer/Renderer.h"
 #include "libGLESv2/renderer/RenderTarget.h"

--- a/src/libGLESv2/renderer/ShaderCache.h
+++ b/src/libGLESv2/renderer/ShaderCache.h