Skip to content

A
angle
Commit ea0e1af4 by alokp@chromium.org
Options

Minor reshuffling of directory structure in preparation of ESSL to GLSL compiler work.

1. Added include/GLSLANG which includes compiler API 2. Deleted src/include and moved the header files to the same directory as the corresponding source files 3. Modied include path to be relative to src/. I have only fixed paths for files I moved. We should fix it for all new files at least. It is much easier to see where an included file is coming from. I noticed that a few libGLESv2 source files include headers from libEGL project, which seems wrong. I think we should address this issue. Next step: move compiler source files to compiler/frontend and create two new projects compiler/glsl_backend and compiler/hlsl_backend. Review URL: http://codereview.appspot.com/662042 git-svn-id: https://angleproject.googlecode.com/svn/trunk@62 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 0599dc6d
Showing with 61 additions and 119 deletions
CONTRIBUTORS
...@@ -16,3 +16,4 @@ TransGaming Inc. ...@@ -16,3 +16,4 @@ TransGaming Inc.
Google Inc. Google Inc.
Henry Bridge Henry Bridge
Vangelis Kokkevis Vangelis Kokkevis
Alok Priyadarshi
src/compiler/Initialize.h
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef _INITIALIZE_INCLUDED_ #ifndef _INITIALIZE_INCLUDED_
#define _INITIALIZE_INCLUDED_ #define _INITIALIZE_INCLUDED_
#include "ResourceLimits.h" #include "GLSLANG/ResourceLimits.h"
#include "Common.h" #include "Common.h"
#include "ShHandle.h" #include "ShHandle.h"
#include "SymbolTable.h" #include "SymbolTable.h"
......
src/compiler/InitializeDll.cpp
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "InitializeGlobals.h" #include "InitializeGlobals.h"
#include "InitializeParseContext.h" #include "InitializeParseContext.h"
#include "ShaderLang.h" #include "GLSLANG/ShaderLang.h"
OS_TLSIndex ThreadInitializeIndex = OS_INVALID_TLS_INDEX; OS_TLSIndex ThreadInitializeIndex = OS_INVALID_TLS_INDEX;
......
src/compiler/OutputHLSL.cpp
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#include "OutputHLSL.h" #include "OutputHLSL.h"
#include "common/debug.h"
#include "InfoSink.h" #include "InfoSink.h"
#include "debug.h"
namespace sh namespace sh
{ {
......
src/compiler/ShHandle.h
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
// This should not be included by driver code. // This should not be included by driver code.
// //
#include "ShaderLang.h" #include "GLSLANG/ShaderLang.h"
#include "InfoSink.h" #include "InfoSink.h"
......
src/compiler/ShaderLang.cpp
...@@ -8,16 +8,15 @@ ...@@ -8,16 +8,15 @@
// Implement the top-level of interface to the compiler/linker, // Implement the top-level of interface to the compiler/linker,
// as defined in ShaderLang.h // as defined in ShaderLang.h
// //
#include "SymbolTable.h"
#include "ParseHelper.h"
#include "ShHandle.h" #include "GLSLANG/ShaderLang.h"
#include "InitializeDll.h"
#include "ShaderLang.h"
#include "Initialize.h" #include "Initialize.h"
#include "InitializeDll.h"
#include "OutputHLSL.h" #include "OutputHLSL.h"
#include "ParseHelper.h"
#include "ShHandle.h"
#include "SymbolTable.h"
// //
// A symbol table for each language. Each has a different // A symbol table for each language. Each has a different
......
src/compiler/compiler.vcproj
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="./; ../include/" AdditionalIncludeDirectories="./;../;../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="./; ../include/" AdditionalIncludeDirectories="./;../;../../include/"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -386,11 +386,11 @@ ...@@ -386,11 +386,11 @@
> >
</File> </File>
<File <File
RelativePath=".\ResourceLimits.h" RelativePath="..\..\include\GLSLANG\ResourceLimits.h"
> >
</File> </File>
<File <File
RelativePath=".\ShaderLang.h" RelativePath="..\..\include\GLSLANG\ShaderLang.h"
> >
</File> </File>
<File <File
...@@ -462,12 +462,6 @@ ...@@ -462,12 +462,6 @@
</File> </File>
</Filter> </Filter>
</Filter> </Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>
......
src/compiler/glslang.y
...@@ -27,7 +27,7 @@ Jutta Degener, 1995 ...@@ -27,7 +27,7 @@ Jutta Degener, 1995
#include "SymbolTable.h" #include "SymbolTable.h"
#include "ParseHelper.h" #include "ParseHelper.h"
#include "ShaderLang.h" #include "GLSLANG/ShaderLang.h"
#ifdef _WIN32 #ifdef _WIN32
#define YYPARSE_PARAM parseContext #define YYPARSE_PARAM parseContext
......
src/compiler/localintermediate.h
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#ifndef _LOCAL_INTERMEDIATE_INCLUDED_ #ifndef _LOCAL_INTERMEDIATE_INCLUDED_
#define _LOCAL_INTERMEDIATE_INCLUDED_ #define _LOCAL_INTERMEDIATE_INCLUDED_
#include "GLSLANG/ShaderLang.h"
#include "intermediate.h" #include "intermediate.h"
#include "ShaderLang.h"
#include "SymbolTable.h" #include "SymbolTable.h"
struct TVectorFields { struct TVectorFields {
......
src/libEGL/Config.cpp
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include "debug.h" #include "common/debug.h"
using namespace std; using namespace std;
......
src/include/Config.h → src/libEGL/Config.h
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <set> #include <set>
#include "angleutils.h" #include "common/angleutils.h"
namespace egl namespace egl
{ {
......
src/libEGL/Display.cpp
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <vector> #include <vector>
#include "main.h" #include "main.h"
#include "debug.h" #include "common/debug.h"
namespace egl namespace egl
{ {
......
src/include/Display.h → src/libEGL/Display.h
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "Config.h" #include "Config.h"
#include "Surface.h" #include "Surface.h"
#include "Context.h" #include "libGLESv2/Context.h"
#include <set> #include <set>
......
src/libEGL/Surface.cpp
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "Surface.h" #include "Surface.h"
#include "main.h" #include "main.h"
#include "debug.h" #include "common/debug.h"
namespace egl namespace egl
{ {
......
src/include/Surface.h → src/libEGL/Surface.h
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <EGL/egl.h> #include <EGL/egl.h>
#include <d3d9.h> #include <d3d9.h>
#include "angleutils.h" #include "common/angleutils.h"
namespace egl namespace egl
{ {
......
src/libEGL/libEGL.cpp
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#include "main.h" #include "main.h"
#include "Display.h" #include "Display.h"
#include "Context.h" #include "libGLESv2/Context.h"
#include "debug.h" #include "common/debug.h"
#include <exception> #include <exception>
......
src/libEGL/libEGL.vcproj
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../include/;../../include/;" AdditionalIncludeDirectories="./;../;../../include/;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBEGL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBEGL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../include/;../../include/;" AdditionalIncludeDirectories="./;../;../../include/;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBEGL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBEGL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -210,35 +210,23 @@ ...@@ -210,35 +210,23 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File <File
RelativePath="..\Include\Config.h" RelativePath="..\Config.h"
> >
</File> </File>
<File <File
RelativePath="..\Include\Context.h" RelativePath=".\Display.h"
> >
</File> </File>
<File <File
RelativePath="..\Include\debug.h" RelativePath="..\..\include\EGL\egl.h"
> >
</File> </File>
<File <File
RelativePath="..\Include\Display.h" RelativePath="..\..\include\EGL\eglext.h"
> >
</File> </File>
<File <File
RelativePath="..\Include\EGL\egl.h" RelativePath="..\..\include\EGL\eglplatform.h"
>
</File>
<File
RelativePath="..\Include\EGL\eglext.h"
>
</File>
<File
RelativePath="..\Include\EGL\eglplatform.h"
>
</File>
<File
RelativePath="..\Include\gateutils.h"
> >
</File> </File>
<File <File
...@@ -246,16 +234,10 @@ ...@@ -246,16 +234,10 @@
> >
</File> </File>
<File <File
RelativePath="..\Include\Surface.h" RelativePath=".\Surface.h"
> >
</File> </File>
</Filter> </Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
<File <File
RelativePath=".\libEGL.def" RelativePath=".\libEGL.def"
> >
......
src/libEGL/main.cpp
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "main.h" #include "main.h"
#include "debug.h" #include "common/debug.h"
static DWORD currentTLS = TLS_OUT_OF_INDEXES; static DWORD currentTLS = TLS_OUT_OF_INDEXES;
......
src/libGLESv2/Buffer.cpp
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <limits> #include <limits>
#include <utility> #include <utility>
#include "debug.h" #include "common/debug.h"
#include "geometry/backend.h" #include "geometry/backend.h"
namespace gl namespace gl
......
src/libGLESv2/Buffer.h
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#define GL_APICALL #define GL_APICALL
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include "angleutils.h" #include "common/angleutils.h"
namespace gl namespace gl
{ {
......
src/libGLESv2/Context.cpp
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <algorithm> #include <algorithm>
#include "main.h" #include "main.h"
#include "Display.h" #include "libEGL/Display.h"
#include "Buffer.h" #include "Buffer.h"
#include "Shader.h" #include "Shader.h"
#include "Program.h" #include "Program.h"
......
src/include/Context.h → src/libGLESv2/Context.h
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <map> #include <map>
#include "angleutils.h" #include "common/angleutils.h"
namespace egl namespace egl
{ {
......
src/libGLESv2/Framebuffer.h
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <d3d9.h> #include <d3d9.h>
#include "angleutils.h" #include "common/angleutils.h"
namespace gl namespace gl
{ {
......
src/libGLESv2/Program.cpp
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "main.h" #include "main.h"
#include "Shader.h" #include "Shader.h"
#include "debug.h" #include "common/debug.h"
namespace gl namespace gl
{ {
......
src/libGLESv2/Renderbuffer.h
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <d3d9.h> #include <d3d9.h>
#include "angleutils.h" #include "common/angleutils.h"
namespace gl namespace gl
{ {
......
src/libGLESv2/Shader.cpp
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include "Shader.h" #include "Shader.h"
#include "main.h" #include "main.h"
#include "Shaderlang.h" #include "GLSLANG/Shaderlang.h"
#include "OutputHLSL.h" #include "compiler/OutputHLSL.h"
#include "debug.h" #include "common/debug.h"
namespace gl namespace gl
{ {
......
src/libGLESv2/Texture.cpp
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "main.h" #include "main.h"
#include "mathutil.h" #include "mathutil.h"
#include "debug.h" #include "common/debug.h"
#include "utilities.h" #include "utilities.h"
namespace gl namespace gl
......
src/libGLESv2/geometry/VertexDataManager.cpp
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "geometry/VertexDataManager.h" #include "geometry/VertexDataManager.h"
#include "debug.h" #include "common/debug.h"
#include "Program.h" #include "Program.h"
#include "Buffer.h" #include "Buffer.h"
......
src/libGLESv2/geometry/backend.cpp
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "geometry/backend.h" #include "geometry/backend.h"
#include "debug.h" #include "common/debug.h"
namespace gl namespace gl
{ {
......
src/libGLESv2/geometry/dx9.cpp
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include "Context.h" #include "Context.h"
#include "debug.h" #include "common/debug.h"
#include "geometry/vertexconversion.h" #include "geometry/vertexconversion.h"
......
src/libGLESv2/libGLESv2.cpp
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "Renderbuffer.h" #include "Renderbuffer.h"
#include "Framebuffer.h" #include "Framebuffer.h"
#include "mathutil.h" #include "mathutil.h"
#include "debug.h" #include "common/debug.h"
#include "utilities.h" #include "utilities.h"
extern "C" extern "C"
......
src/libGLESv2/libGLESv2.vcproj
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../include/;../include/; ../compiler/;." AdditionalIncludeDirectories="./;../;../../include/"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../include/;../include/; ../compiler/;." AdditionalIncludeDirectories="./;../;../../include/"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX"
RuntimeLibrary="0" RuntimeLibrary="0"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
> >
</File> </File>
<File <File
RelativePath="..\Common\debug.cpp" RelativePath="..\common\debug.cpp"
> >
</File> </File>
<File <File
...@@ -247,27 +247,11 @@ ...@@ -247,27 +247,11 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File <File
RelativePath="..\Include\angleutils.h"
>
</File>
<File
RelativePath=".\Buffer.h" RelativePath=".\Buffer.h"
> >
</File> </File>
<File <File
RelativePath="..\Include\Config.h" RelativePath=".\Context.h"
>
</File>
<File
RelativePath="..\Include\Context.h"
>
</File>
<File
RelativePath="..\Include\debug.h"
>
</File>
<File
RelativePath="..\Include\Display.h"
> >
</File> </File>
<File <File
...@@ -275,19 +259,19 @@ ...@@ -275,19 +259,19 @@
> >
</File> </File>
<File <File
RelativePath="..\Include\GLES2\gl2.h" RelativePath="..\..\include\GLES2\gl2.h"
> >
</File> </File>
<File <File
RelativePath="..\Include\GLES2\gl2ext.h" RelativePath="..\..\include\GLES2\gl2ext.h"
> >
</File> </File>
<File <File
RelativePath="..\Include\GLES2\gl2platform.h" RelativePath="..\..\include\GLES2\gl2extimg.h"
> >
</File> </File>
<File <File
RelativePath="..\Include\KHR\khrplatform.h" RelativePath="..\..\include\GLES2\gl2platform.h"
> >
</File> </File>
<File <File
...@@ -339,28 +323,10 @@ ...@@ -339,28 +323,10 @@
</File> </File>
</Filter> </Filter>
</Filter> </Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
<File
RelativePath="..\AUTHORS"
>
</File>
<File
RelativePath="..\CONTRIBUTORS"
>
</File>
<File <File
RelativePath=".\libGLESv2.def" RelativePath=".\libGLESv2.def"
> >
</File> </File>
<File
RelativePath="..\LICENSE"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>
......
src/libGLESv2/main.cpp
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include "main.h" #include "main.h"
#include "Framebuffer.h" #include "Framebuffer.h"
#include "Surface.h" #include "libEGL/Surface.h"
#include "debug.h" #include "common/debug.h"
static DWORD currentTLS = TLS_OUT_OF_INDEXES; static DWORD currentTLS = TLS_OUT_OF_INDEXES;
......
src/libGLESv2/main.h
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include "Context.h" #include "Context.h"
#include "Display.h" #include "common/debug.h"
#include "debug.h" #include "libEGL/Display.h"
namespace gl namespace gl
{ {
......
src/libGLESv2/utilities.cpp
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "utilities.h" #include "utilities.h"
#include "debug.h" #include "common/debug.h"
#include "mathutil.h" #include "mathutil.h"
#include "Context.h" #include "Context.h"
......
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