Skip to content

A
angle
Commit 50aadb05 by daniel@transgaming.com
Options

Moved D3DConstantTable, IndexDataManager, VertexDataManager and vertexconversion files.

TRAC #22198 Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1547 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 25e16afc
Showing with 36 additions and 45 deletions
src/libGLESv2/Buffer.cpp
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
#include "libGLESv2/Buffer.h" #include "libGLESv2/Buffer.h"
#include "libGLESv2/main.h" #include "libGLESv2/main.h"
#include "libGLESv2/VertexDataManager.h"
#include "libGLESv2/IndexDataManager.h"
namespace gl namespace gl
{ {
......
src/libGLESv2/ProgramBinary.h
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "libGLESv2/Program.h" #include "libGLESv2/Program.h"
#include "libGLESv2/Context.h" #include "libGLESv2/Context.h"
#include "libGLESv2/D3DConstantTable.h"
#include "libGLESv2/mathutil.h" #include "libGLESv2/mathutil.h"
#include "libGLESv2/Shader.h" #include "libGLESv2/Shader.h"
......
src/libGLESv2/libGLESv2.vcxproj
...@@ -232,12 +232,10 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\" ...@@ -232,12 +232,10 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ClCompile Include="Buffer.cpp" /> <ClCompile Include="Buffer.cpp" />
<ClCompile Include="Context.cpp" /> <ClCompile Include="Context.cpp" />
<ClCompile Include="..\common\debug.cpp" /> <ClCompile Include="..\common\debug.cpp" />
<ClCompile Include="D3DConstantTable.cpp" />
<ClCompile Include="Fence.cpp" /> <ClCompile Include="Fence.cpp" />
<ClCompile Include="Float16ToFloat32.cpp" /> <ClCompile Include="Float16ToFloat32.cpp" />
<ClCompile Include="Framebuffer.cpp" /> <ClCompile Include="Framebuffer.cpp" />
<ClCompile Include="HandleAllocator.cpp" /> <ClCompile Include="HandleAllocator.cpp" />
<ClCompile Include="IndexDataManager.cpp" />
<ClCompile Include="libGLESv2.cpp" /> <ClCompile Include="libGLESv2.cpp" />
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
<ClCompile Include="Program.cpp" /> <ClCompile Include="Program.cpp" />
...@@ -246,6 +244,8 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\" ...@@ -246,6 +244,8 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ClCompile Include="..\common\RefCountObject.cpp" /> <ClCompile Include="..\common\RefCountObject.cpp" />
<ClCompile Include="Renderbuffer.cpp" /> <ClCompile Include="Renderbuffer.cpp" />
<ClCompile Include="renderer\Blit.cpp" /> <ClCompile Include="renderer\Blit.cpp" />
<ClCompile Include="renderer\D3DConstantTable.cpp" />
<ClCompile Include="renderer\IndexDataManager.cpp" />
<ClCompile Include="renderer\Renderer.cpp" /> <ClCompile Include="renderer\Renderer.cpp" />
<ClCompile Include="renderer\Renderer11.cpp" /> <ClCompile Include="renderer\Renderer11.cpp" />
<ClCompile Include="renderer\renderer11_utils.cpp" /> <ClCompile Include="renderer\renderer11_utils.cpp" />
...@@ -260,13 +260,13 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\" ...@@ -260,13 +260,13 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ClCompile Include="renderer\SwapChain11.cpp" /> <ClCompile Include="renderer\SwapChain11.cpp" />
<ClCompile Include="renderer\SwapChain9.cpp" /> <ClCompile Include="renderer\SwapChain9.cpp" />
<ClCompile Include="renderer\TextureStorage.cpp" /> <ClCompile Include="renderer\TextureStorage.cpp" />
<ClCompile Include="renderer\VertexDataManager.cpp" />
<ClCompile Include="renderer\VertexDeclarationCache.cpp" /> <ClCompile Include="renderer\VertexDeclarationCache.cpp" />
<ClCompile Include="ResourceManager.cpp" /> <ClCompile Include="ResourceManager.cpp" />
<ClCompile Include="Shader.cpp" /> <ClCompile Include="Shader.cpp" />
<ClCompile Include="Texture.cpp" /> <ClCompile Include="Texture.cpp" />
<ClCompile Include="TextureSSE2.cpp" /> <ClCompile Include="TextureSSE2.cpp" />
<ClCompile Include="utilities.cpp" /> <ClCompile Include="utilities.cpp" />
<ClCompile Include="VertexDataManager.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\third_party\murmurhash\MurmurHash3.h" /> <ClInclude Include="..\third_party\murmurhash\MurmurHash3.h" />
...@@ -274,14 +274,12 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\" ...@@ -274,14 +274,12 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ClInclude Include="BinaryStream.h" /> <ClInclude Include="BinaryStream.h" />
<ClInclude Include="Buffer.h" /> <ClInclude Include="Buffer.h" />
<ClInclude Include="Context.h" /> <ClInclude Include="Context.h" />
<ClInclude Include="D3DConstantTable.h" />
<ClInclude Include="Fence.h" /> <ClInclude Include="Fence.h" />
<ClInclude Include="Framebuffer.h" /> <ClInclude Include="Framebuffer.h" />
<ClInclude Include="..\..\include\GLES2\gl2.h" /> <ClInclude Include="..\..\include\GLES2\gl2.h" />
<ClInclude Include="..\..\include\GLES2\gl2ext.h" /> <ClInclude Include="..\..\include\GLES2\gl2ext.h" />
<ClInclude Include="..\..\include\GLES2\gl2platform.h" /> <ClInclude Include="..\..\include\GLES2\gl2platform.h" />
<ClInclude Include="HandleAllocator.h" /> <ClInclude Include="HandleAllocator.h" />
<ClInclude Include="IndexDataManager.h" />
<ClInclude Include="main.h" /> <ClInclude Include="main.h" />
<ClInclude Include="mathutil.h" /> <ClInclude Include="mathutil.h" />
<ClInclude Include="Program.h" /> <ClInclude Include="Program.h" />
...@@ -290,7 +288,9 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\" ...@@ -290,7 +288,9 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ClInclude Include="..\common\RefCountObject.h" /> <ClInclude Include="..\common\RefCountObject.h" />
<ClInclude Include="Renderbuffer.h" /> <ClInclude Include="Renderbuffer.h" />
<ClInclude Include="renderer\Blit.h" /> <ClInclude Include="renderer\Blit.h" />
<ClInclude Include="renderer\D3DConstantTable.h" />
<ClInclude Include="renderer\Image.h" /> <ClInclude Include="renderer\Image.h" />
<ClInclude Include="renderer\IndexDataManager.h" />
<ClInclude Include="renderer\Renderer.h" /> <ClInclude Include="renderer\Renderer.h" />
<ClInclude Include="renderer\Renderer11.h" /> <ClInclude Include="renderer\Renderer11.h" />
<ClInclude Include="renderer\renderer11_utils.h" /> <ClInclude Include="renderer\renderer11_utils.h" />
...@@ -308,6 +308,8 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\" ...@@ -308,6 +308,8 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ClInclude Include="renderer\SwapChain11.h" /> <ClInclude Include="renderer\SwapChain11.h" />
<ClInclude Include="renderer\SwapChain9.h" /> <ClInclude Include="renderer\SwapChain9.h" />
<ClInclude Include="renderer\TextureStorage.h" /> <ClInclude Include="renderer\TextureStorage.h" />
<ClInclude Include="renderer\vertexconversion.h" />
<ClInclude Include="renderer\VertexDataManager.h" />
<ClInclude Include="renderer\VertexDeclarationCache.h" /> <ClInclude Include="renderer\VertexDeclarationCache.h" />
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
<ClInclude Include="ResourceManager.h" /> <ClInclude Include="ResourceManager.h" />
...@@ -315,8 +317,6 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\" ...@@ -315,8 +317,6 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ClInclude Include="Texture.h" /> <ClInclude Include="Texture.h" />
<ClInclude Include="utilities.h" /> <ClInclude Include="utilities.h" />
<ClInclude Include="..\common\version.h" /> <ClInclude Include="..\common\version.h" />
<ClInclude Include="vertexconversion.h" />
<ClInclude Include="VertexDataManager.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="libGLESv2.def" /> <None Include="libGLESv2.def" />
......
src/libGLESv2/libGLESv2.vcxproj.filters
...@@ -29,9 +29,6 @@ ...@@ -29,9 +29,6 @@
<ClCompile Include="..\common\debug.cpp"> <ClCompile Include="..\common\debug.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="D3DConstantTable.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Fence.cpp"> <ClCompile Include="Fence.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
...@@ -44,9 +41,6 @@ ...@@ -44,9 +41,6 @@
<ClCompile Include="HandleAllocator.cpp"> <ClCompile Include="HandleAllocator.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="IndexDataManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="libGLESv2.cpp"> <ClCompile Include="libGLESv2.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
...@@ -83,9 +77,6 @@ ...@@ -83,9 +77,6 @@
<ClCompile Include="utilities.cpp"> <ClCompile Include="utilities.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="VertexDataManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="renderer\Renderer9.cpp"> <ClCompile Include="renderer\Renderer9.cpp">
<Filter>Renderer</Filter> <Filter>Renderer</Filter>
</ClCompile> </ClCompile>
...@@ -134,7 +125,13 @@ ...@@ -134,7 +125,13 @@
<ClCompile Include="renderer\ShaderExecutable9.cpp"> <ClCompile Include="renderer\ShaderExecutable9.cpp">
<Filter>Renderer</Filter> <Filter>Renderer</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="renderer\ShaderExecutable11.cpp"> <ClCompile Include="renderer\D3DConstantTable.cpp">
<Filter>Renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\IndexDataManager.cpp">
<Filter>Renderer</Filter>
</ClCompile>
<ClCompile Include="renderer\VertexDataManager.cpp">
<Filter>Renderer</Filter> <Filter>Renderer</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
...@@ -148,9 +145,6 @@ ...@@ -148,9 +145,6 @@
<ClInclude Include="Context.h"> <ClInclude Include="Context.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="D3DConstantTable.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Fence.h"> <ClInclude Include="Fence.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
...@@ -169,9 +163,6 @@ ...@@ -169,9 +163,6 @@
<ClInclude Include="HandleAllocator.h"> <ClInclude Include="HandleAllocator.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="IndexDataManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="main.h"> <ClInclude Include="main.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
...@@ -211,12 +202,6 @@ ...@@ -211,12 +202,6 @@
<ClInclude Include="..\common\version.h"> <ClInclude Include="..\common\version.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="vertexconversion.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="VertexDataManager.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="renderer\ShaderCache.h"> <ClInclude Include="renderer\ShaderCache.h">
<Filter>Renderer</Filter> <Filter>Renderer</Filter>
</ClInclude> </ClInclude>
...@@ -280,7 +265,16 @@ ...@@ -280,7 +265,16 @@
<ClInclude Include="renderer\ShaderExecutable9.h"> <ClInclude Include="renderer\ShaderExecutable9.h">
<Filter>Renderer</Filter> <Filter>Renderer</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="renderer\ShaderExecutable11.h"> <ClInclude Include="renderer\VertexDataManager.h">
<Filter>Renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\D3DConstantTable.h">
<Filter>Renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\IndexDataManager.h">
<Filter>Renderer</Filter>
</ClInclude>
<ClInclude Include="renderer\vertexconversion.h">
<Filter>Renderer</Filter> <Filter>Renderer</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
......
src/libGLESv2/D3DConstantTable.cpp → src/libGLESv2/renderer/D3DConstantTable.cpp
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
// Restructures the constant table as a hierarchy of constants in the same // Restructures the constant table as a hierarchy of constants in the same
// way as D3DX. // way as D3DX.
#include "libGLESv2/D3DConstantTable.h" #include "libGLESv2/renderer/D3DConstantTable.h"
#include <d3d9.h> #include <d3d9.h>
#include <d3d9types.h> #include <d3d9types.h>
......
src/libGLESv2/IndexDataManager.cpp → src/libGLESv2/renderer/IndexDataManager.cpp
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// IndexDataManager.cpp: Defines the IndexDataManager, a class that // IndexDataManager.cpp: Defines the IndexDataManager, a class that
// runs the Buffer translation process for index buffers. // runs the Buffer translation process for index buffers.
#include "libGLESv2/IndexDataManager.h" #include "libGLESv2/renderer/IndexDataManager.h"
#include "common/debug.h" #include "common/debug.h"
......
src/libGLESv2/renderer/Renderer9.cpp
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#include "libGLESv2/Framebuffer.h" #include "libGLESv2/Framebuffer.h"
#include "libGLESv2/Program.h" #include "libGLESv2/Program.h"
#include "libGLESv2/ProgramBinary.h" #include "libGLESv2/ProgramBinary.h"
#include "libGLESv2/IndexDataManager.h" #include "libGLESv2/renderer/IndexDataManager.h"
#include "libGLESv2/VertexDataManager.h" #include "libGLESv2/renderer/VertexDataManager.h"
#include "libGLESv2/renderer/Renderer9.h" #include "libGLESv2/renderer/Renderer9.h"
#include "libGLESv2/renderer/renderer9_utils.h" #include "libGLESv2/renderer/renderer9_utils.h"
#include "libGLESv2/renderer/ShaderExecutable9.h" #include "libGLESv2/renderer/ShaderExecutable9.h"
......
src/libGLESv2/renderer/Renderer9.h
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "libGLESv2/renderer/ShaderCache.h" #include "libGLESv2/renderer/ShaderCache.h"
#include "libGLESv2/renderer/VertexDeclarationCache.h" #include "libGLESv2/renderer/VertexDeclarationCache.h"
#include "libGLESv2/renderer/Renderer.h" #include "libGLESv2/renderer/Renderer.h"
#include "libGLESv2/IndexDataManager.h" #include "libGLESv2/renderer/IndexDataManager.h"
namespace gl namespace gl
{ {
......
src/libGLESv2/renderer/ShaderExecutable.h
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#define LIBGLESV2_RENDERER_SHADEREXECUTABLE_H_ #define LIBGLESV2_RENDERER_SHADEREXECUTABLE_H_
#include "common/angleutils.h" #include "common/angleutils.h"
#include "libGLESv2/D3DConstantTable.h" #include "libGLESv2/renderer/D3DConstantTable.h"
namespace rx namespace rx
{ {
......
src/libGLESv2/renderer/ShaderExecutable9.h
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <d3d9.h> #include <d3d9.h>
#include "libGLESv2/renderer/ShaderExecutable.h" #include "libGLESv2/renderer/ShaderExecutable.h"
#include "libGLESv2/D3DConstantTable.h" #include "libGLESv2/renderer/D3DConstantTable.h"
namespace rx namespace rx
{ {
......
src/libGLESv2/VertexDataManager.cpp → src/libGLESv2/renderer/VertexDataManager.cpp
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// VertexDataManager.h: Defines the VertexDataManager, a class that // VertexDataManager.h: Defines the VertexDataManager, a class that
// runs the Buffer translation process. // runs the Buffer translation process.
#include "libGLESv2/VertexDataManager.h" #include "libGLESv2/renderer/VertexDataManager.h"
#include "common/debug.h" #include "common/debug.h"
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "libGLESv2/ProgramBinary.h" #include "libGLESv2/ProgramBinary.h"
#include "libGLESv2/main.h" #include "libGLESv2/main.h"
#include "libGLESv2/vertexconversion.h" #include "libGLESv2/renderer/vertexconversion.h"
#include "libGLESv2/IndexDataManager.h" #include "libGLESv2/renderer/IndexDataManager.h"
#include <limits> #include <limits>
......
src/libGLESv2/renderer/VertexDeclarationCache.cpp
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// VertexDeclarationCache.cpp: Implements a helper class to construct and cache vertex declarations. // VertexDeclarationCache.cpp: Implements a helper class to construct and cache vertex declarations.
#include "libGLESv2/ProgramBinary.h" #include "libGLESv2/ProgramBinary.h"
#include "libGLESv2/VertexDataManager.h" #include "libGLESv2/renderer/VertexDataManager.h"
#include "libGLESv2/renderer/VertexDeclarationCache.h" #include "libGLESv2/renderer/VertexDeclarationCache.h"
namespace rx namespace rx
......
src/libGLESv2/renderer/VertexDeclarationCache.h
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#define LIBGLESV2_RENDERER_VERTEXDECLARATIONCACHE_H_ #define LIBGLESV2_RENDERER_VERTEXDECLARATIONCACHE_H_
#include "libGLESv2/Context.h" #include "libGLESv2/Context.h"
#include "libGLESv2/VertexDataManager.h" #include "libGLESv2/renderer/VertexDataManager.h"
namespace gl namespace gl
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment