Skip to content

S
swiftshader
Commit 79eef885 by Nicolas Capens
Options

Rename libGLESv2 to libGL.

Bug 18962347 Change-Id: Ia6c6c07f79a076ef836d60a3809614bcb16add32 Reviewed-on: https://swiftshader-review.googlesource.com/1724Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent 264f1526
Showing with 80 additions and 659 deletions
src/OpenGL/libGL/Buffer.h
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
// index data. Implements GL buffer objects and related functionality. // index data. Implements GL buffer objects and related functionality.
// [OpenGL ES 2.0.24] section 2.9 page 21. // [OpenGL ES 2.0.24] section 2.9 page 21.
#ifndef LIBGLESV2_BUFFER_H_ #ifndef LIBGL_BUFFER_H_
#define LIBGLESV2_BUFFER_H_ #define LIBGL_BUFFER_H_
#include "common/Object.hpp" #include "common/Object.hpp"
#include "Common/Resource.hpp" #include "Common/Resource.hpp"
...@@ -51,4 +51,4 @@ class Buffer : public gl::RefCountObject ...@@ -51,4 +51,4 @@ class Buffer : public gl::RefCountObject
} }
#endif // LIBGLESV2_BUFFER_H_ #endif // LIBGL_BUFFER_H_
src/OpenGL/libGL/Context.h
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
// Context.h: Defines the Context class, managing all GL state and performing // Context.h: Defines the Context class, managing all GL state and performing
// rendering operations. It is the GLES2 specific implementation of EGLContext. // rendering operations. It is the GLES2 specific implementation of EGLContext.
#ifndef LIBGLESV2_CONTEXT_H_ #ifndef LIBGL_CONTEXT_H_
#define LIBGLESV2_CONTEXT_H_ #define LIBGL_CONTEXT_H_
#include "libEGL/Context.hpp" #include "libEGL/Context.hpp"
#include "ResourceManager.h" #include "ResourceManager.h"
......
src/OpenGL/libGL/Fence.h
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
// Fence.h: Defines the Fence class, which supports the GL_NV_fence extension. // Fence.h: Defines the Fence class, which supports the GL_NV_fence extension.
#ifndef LIBGLESV2_FENCE_H_ #ifndef LIBGL_FENCE_H_
#define LIBGLESV2_FENCE_H_ #define LIBGL_FENCE_H_
#define GL_APICALL #define GL_APICALL
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
...@@ -40,4 +40,4 @@ class Fence ...@@ -40,4 +40,4 @@ class Fence
} }
#endif // LIBGLESV2_FENCE_H_ #endif // LIBGL_FENCE_H_
src/OpenGL/libGL/Framebuffer.h
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
// Framebuffer.h: Defines the Framebuffer class. Implements GL framebuffer // Framebuffer.h: Defines the Framebuffer class. Implements GL framebuffer
// objects and related functionality. [OpenGL ES 2.0.24] section 4.4 page 105. // objects and related functionality. [OpenGL ES 2.0.24] section 4.4 page 105.
#ifndef LIBGLESV2_FRAMEBUFFER_H_ #ifndef LIBGL_FRAMEBUFFER_H_
#define LIBGLESV2_FRAMEBUFFER_H_ #define LIBGL_FRAMEBUFFER_H_
#include "common/Object.hpp" #include "common/Object.hpp"
#include "Image.hpp" #include "Image.hpp"
...@@ -87,4 +87,4 @@ public: ...@@ -87,4 +87,4 @@ public:
} }
#endif // LIBGLESV2_FRAMEBUFFER_H_ #endif // LIBGL_FRAMEBUFFER_H_
src/OpenGL/libGL/HandleAllocator.h
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
// HandleAllocator.h: Defines the HandleAllocator class, which is used to // HandleAllocator.h: Defines the HandleAllocator class, which is used to
// allocate GL handles. // allocate GL handles.
#ifndef LIBGLESV2_HANDLEALLOCATOR_H_ #ifndef LIBGL_HANDLEALLOCATOR_H_
#define LIBGLESV2_HANDLEALLOCATOR_H_ #define LIBGL_HANDLEALLOCATOR_H_
#define GL_APICALL #define GL_APICALL
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
...@@ -43,4 +43,4 @@ class HandleAllocator ...@@ -43,4 +43,4 @@ class HandleAllocator
} }
#endif // LIBGLESV2_HANDLEALLOCATOR_H_ #endif // LIBGL_HANDLEALLOCATOR_H_
src/OpenGL/libGL/IndexDataManager.h
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
// IndexDataManager.h: Defines the IndexDataManager, a class that // IndexDataManager.h: Defines the IndexDataManager, a class that
// runs the Buffer translation process for index buffers. // runs the Buffer translation process for index buffers.
#ifndef LIBGLESV2_INDEXDATAMANAGER_H_ #ifndef LIBGL_INDEXDATAMANAGER_H_
#define LIBGLESV2_INDEXDATAMANAGER_H_ #define LIBGL_INDEXDATAMANAGER_H_
#include "Context.h" #include "Context.h"
...@@ -66,4 +66,4 @@ class IndexDataManager ...@@ -66,4 +66,4 @@ class IndexDataManager
} }
#endif // LIBGLESV2_INDEXDATAMANAGER_H_ #endif // LIBGL_INDEXDATAMANAGER_H_
src/OpenGL/libGL/Program.h
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
// Program.h: Defines the Program class. Implements GL program objects // Program.h: Defines the Program class. Implements GL program objects
// and related functionality. [OpenGL ES 2.0.24] section 2.10.3 page 28. // and related functionality. [OpenGL ES 2.0.24] section 2.10.3 page 28.
#ifndef LIBGLESV2_PROGRAM_H_ #ifndef LIBGL_PROGRAM_H_
#define LIBGLESV2_PROGRAM_H_ #define LIBGL_PROGRAM_H_
#include "Shader.h" #include "Shader.h"
#include "Context.h" #include "Context.h"
...@@ -204,4 +204,4 @@ namespace es2 ...@@ -204,4 +204,4 @@ namespace es2
}; };
} }
#endif // LIBGLESV2_PROGRAM_H_ #endif // LIBGL_PROGRAM_H_
src/OpenGL/libGL/Query.h
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
// Query.h: Defines the es2::Query class // Query.h: Defines the es2::Query class
#ifndef LIBGLESV2_QUERY_H_ #ifndef LIBGL_QUERY_H_
#define LIBGLESV2_QUERY_H_ #define LIBGL_QUERY_H_
#include "common/Object.hpp" #include "common/Object.hpp"
#include "Renderer/Renderer.hpp" #include "Renderer/Renderer.hpp"
...@@ -47,4 +47,4 @@ class Query : public gl::RefCountObject ...@@ -47,4 +47,4 @@ class Query : public gl::RefCountObject
} }
#endif // LIBGLESV2_QUERY_H_ #endif // LIBGL_QUERY_H_
src/OpenGL/libGL/Renderbuffer.h
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
// DepthStencilbuffer, Depthbuffer and Stencilbuffer. Implements GL renderbuffer // DepthStencilbuffer, Depthbuffer and Stencilbuffer. Implements GL renderbuffer
// objects and related functionality. [OpenGL ES 2.0.24] section 4.4.3 page 108. // objects and related functionality. [OpenGL ES 2.0.24] section 4.4.3 page 108.
#ifndef LIBGLESV2_RENDERBUFFER_H_ #ifndef LIBGL_RENDERBUFFER_H_
#define LIBGLESV2_RENDERBUFFER_H_ #define LIBGL_RENDERBUFFER_H_
#include "common/Object.hpp" #include "common/Object.hpp"
#include "Image.hpp" #include "Image.hpp"
...@@ -226,4 +226,4 @@ public: ...@@ -226,4 +226,4 @@ public:
}; };
} }
#endif // LIBGLESV2_RENDERBUFFER_H_ #endif // LIBGL_RENDERBUFFER_H_
src/OpenGL/libGL/ResourceManager.h
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
// ResourceManager.h : Defines the ResourceManager class, which tracks objects // ResourceManager.h : Defines the ResourceManager class, which tracks objects
// shared by multiple GL contexts. // shared by multiple GL contexts.
#ifndef LIBGLESV2_RESOURCEMANAGER_H_ #ifndef LIBGL_RESOURCEMANAGER_H_
#define LIBGLESV2_RESOURCEMANAGER_H_ #define LIBGL_RESOURCEMANAGER_H_
#include "HandleAllocator.h" #include "HandleAllocator.h"
...@@ -97,4 +97,4 @@ class ResourceManager ...@@ -97,4 +97,4 @@ class ResourceManager
} }
#endif // LIBGLESV2_RESOURCEMANAGER_H_ #endif // LIBGL_RESOURCEMANAGER_H_
src/OpenGL/libGL/Shader.h
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
// related functionality. [OpenGL ES 2.0.24] section 2.10 page 24 and section // related functionality. [OpenGL ES 2.0.24] section 2.10 page 24 and section
// 3.8 page 84. // 3.8 page 84.
#ifndef LIBGLESV2_SHADER_H_ #ifndef LIBGL_SHADER_H_
#define LIBGLESV2_SHADER_H_ #define LIBGL_SHADER_H_
#include "ResourceManager.h" #include "ResourceManager.h"
...@@ -157,4 +157,4 @@ private: ...@@ -157,4 +157,4 @@ private:
}; };
} }
#endif // LIBGLESV2_SHADER_H_ #endif // LIBGL_SHADER_H_
src/OpenGL/libGL/Texture.h
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
// classes Texture2D and TextureCubeMap. Implements GL texture objects and // classes Texture2D and TextureCubeMap. Implements GL texture objects and
// related functionality. [OpenGL ES 2.0.24] section 3.7 page 63. // related functionality. [OpenGL ES 2.0.24] section 3.7 page 63.
#ifndef LIBGLESV2_TEXTURE_H_ #ifndef LIBGL_TEXTURE_H_
#define LIBGLESV2_TEXTURE_H_ #define LIBGL_TEXTURE_H_
#include "Renderbuffer.h" #include "Renderbuffer.h"
#include "common/Object.hpp" #include "common/Object.hpp"
...@@ -237,4 +237,4 @@ public: ...@@ -237,4 +237,4 @@ public:
}; };
} }
#endif // LIBGLESV2_TEXTURE_H_ #endif // LIBGL_TEXTURE_H_
src/OpenGL/libGL/VertexDataManager.h
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
// 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.
#ifndef LIBGLESV2_VERTEXDATAMANAGER_H_ #ifndef LIBGL_VERTEXDATAMANAGER_H_
#define LIBGLESV2_VERTEXDATAMANAGER_H_ #define LIBGL_VERTEXDATAMANAGER_H_
#include "Context.h" #include "Context.h"
#include "Device.hpp" #include "Device.hpp"
...@@ -96,4 +96,4 @@ class VertexDataManager ...@@ -96,4 +96,4 @@ class VertexDataManager
} }
#endif // LIBGLESV2_VERTEXDATAMANAGER_H_ #endif // LIBGL_VERTEXDATAMANAGER_H_
src/OpenGL/libGL/exports.map deleted 100644 → 0
{
global:
glActiveTexture;
glAttachShader;
glBindAttribLocation;
glBindBuffer;
glBindFramebuffer;
glBindRenderbuffer;
glBindTexture;
glBlendColor;
glBlendEquation;
glBlendEquationSeparate;
glBlendFunc;
glBlendFuncSeparate;
glBufferData;
glBufferSubData;
glCheckFramebufferStatus;
glClear;
glClearColor;
glClearDepthf;
glClearStencil;
glColorMask;
glCompileShader;
glCompressedTexImage2D;
glCompressedTexSubImage2D;
glCopyTexImage2D;
glCopyTexSubImage2D;
glCreateProgram;
glCreateShader;
glCullFace;
glDeleteBuffers;
glDeleteFramebuffers;
glDeleteProgram;
glDeleteRenderbuffers;
glDeleteShader;
glDeleteTextures;
glDepthFunc;
glDepthMask;
glDepthRangef;
glDetachShader;
glDisable;
glDisableVertexAttribArray;
glDrawArrays;
glDrawElements;
glEnable;
glEnableVertexAttribArray;
glFinish;
glFlush;
glFramebufferRenderbuffer;
glFramebufferTexture2D;
glFrontFace;
glGenBuffers;
glGenFramebuffers;
glGenRenderbuffers;
glGenTextures;
glGenerateMipmap;
glGetActiveAttrib;
glGetActiveUniform;
glGetAttachedShaders;
glGetAttribLocation;
glGetBooleanv;
glGetBufferParameteriv;
glGetError;
glGetFloatv;
glGetFramebufferAttachmentParameteriv;
glGetIntegerv;
glGetProgramInfoLog;
glGetProgramiv;
glGetRenderbufferParameteriv;
glGetShaderInfoLog;
glGetShaderPrecisionFormat;
glGetShaderSource;
glGetShaderiv;
glGetString;
glGetTexParameterfv;
glGetTexParameteriv;
glGetUniformLocation;
glGetUniformfv;
glGetUniformiv;
glGetVertexAttribPointerv;
glGetVertexAttribfv;
glGetVertexAttribiv;
glHint;
glIsBuffer;
glIsEnabled;
glIsFramebuffer;
glIsProgram;
glIsRenderbuffer;
glIsShader;
glIsTexture;
glLineWidth;
glLinkProgram;
glPixelStorei;
glPolygonOffset;
glReadPixels;
glReleaseShaderCompiler;
glRenderbufferStorage;
glSampleCoverage;
glScissor;
glShaderBinary;
glShaderSource;
glStencilFunc;
glStencilFuncSeparate;
glStencilMask;
glStencilMaskSeparate;
glStencilOp;
glStencilOpSeparate;
glTexImage2D;
glTexParameterf;
glTexParameterfv;
glTexParameteri;
glTexParameteriv;
glTexSubImage2D;
glUniform1f;
glUniform1fv;
glUniform1i;
glUniform1iv;
glUniform2f;
glUniform2fv;
glUniform2i;
glUniform2iv;
glUniform3f;
glUniform3fv;
glUniform3i;
glUniform3iv;
glUniform4f;
glUniform4fv;
glUniform4i;
glUniform4iv;
glUniformMatrix2fv;
glUniformMatrix3fv;
glUniformMatrix4fv;
glUseProgram;
glValidateProgram;
glVertexAttrib1f;
glVertexAttrib1fv;
glVertexAttrib2f;
glVertexAttrib2fv;
glVertexAttrib3f;
glVertexAttrib3fv;
glVertexAttrib4f;
glVertexAttrib4fv;
glVertexAttribPointer;
glViewport;
# Extensions
glTexImage3DOES;
glBlitFramebufferANGLE;
glRenderbufferStorageMultisampleANGLE;
glDeleteFencesNV;
glFinishFenceNV;
glGenFencesNV;
glGetFenceivNV;
glIsFenceNV;
glSetFenceNV;
glTestFenceNV;
glGetGraphicsResetStatusEXT;
glReadnPixelsEXT;
glGetnUniformfvEXT;
glGetnUniformivEXT;
glGenQueriesEXT;
glDeleteQueriesEXT;
glIsQueryEXT;
glBeginQueryEXT;
glEndQueryEXT;
glGetQueryivEXT;
glGetQueryObjectuivEXT;
glEGLImageTargetTexture2DOES;
glEGLImageTargetRenderbufferStorageOES;
# EGL dependencies
glCreateContext;
glGetProcAddress;
createFrameBuffer;
createBackBuffer;
createDepthStencil;
Register;
local:
*;
};
src/OpenGL/libGL/libGLESv2.cpp → src/OpenGL/libGL/libGL.cpp
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
// agreement of TransGaming Inc. Without such an agreement, no rights or licenses, express // agreement of TransGaming Inc. Without such an agreement, no rights or licenses, express
// or implied, including but not limited to any patent rights, are granted to you. // or implied, including but not limited to any patent rights, are granted to you.
// //
// libGLESv2.cpp: Implements the exported OpenGL ES 2.0 functions. // libGL.cpp: Implements the exported OpenGL functions.
#include "main.h" #include "main.h"
#include "mathutil.h" #include "mathutil.h"
......
src/OpenGL/libGL/libGLESv2.def → src/OpenGL/libGL/libGL.def
LIBRARY libGLESv2 LIBRARY libGL
EXPORTS EXPORTS
glActiveTexture @1 glActiveTexture @1
glAttachShader @2 glAttachShader @2
......
src/OpenGL/libGL/libGLESv2.rc → src/OpenGL/libGL/libGL.rc
...@@ -70,13 +70,13 @@ BEGIN ...@@ -70,13 +70,13 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "SwiftShader libGLESv2 Dynamic Link Library" VALUE "FileDescription", "SwiftShader OpenGL Dynamic Link Library"
VALUE "FileVersion", VERSION_STRING VALUE "FileVersion", VERSION_STRING
VALUE "InternalName", "libGLESv2" VALUE "InternalName", "libGL"
VALUE "LegalCopyright", "Copyright (C) 2012 TransGaming Inc." VALUE "LegalCopyright", "Copyright (C) 2012 TransGaming Inc."
VALUE "OriginalFilename", "libGLESv2.dll" VALUE "OriginalFilename", "opengl32.dll"
VALUE "PrivateBuild", VERSION_STRING VALUE "PrivateBuild", VERSION_STRING
VALUE "ProductName", "SwiftShader libGLESv2 Dynamic Link Library" VALUE "ProductName", "SwiftShader openGL Dynamic Link Library"
VALUE "ProductVersion", VERSION_STRING VALUE "ProductVersion", VERSION_STRING
END END
END END
......
src/OpenGL/libGL/libGLESv2.vcxproj → src/OpenGL/libGL/libGL.vcxproj
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{B5871A7A-968C-42E3-A33B-981E6F448E78}</ProjectGuid> <ProjectGuid>{B5871A7A-968C-42E3-A33B-981E6F448E78}</ProjectGuid>
<RootNamespace>libGLESv2</RootNamespace> <RootNamespace>libGL</RootNamespace>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir)/..;$(ProjectDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir)/..;$(ProjectDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
...@@ -137,23 +137,21 @@ ...@@ -137,23 +137,21 @@
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile> <ModuleDefinitionFile>libGL.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" copy "$(OutDir)opengl32.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command>
mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_V2_translator.dll"</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir)/..;$(ProjectDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir)/..;$(ProjectDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBGL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader> <PrecompiledHeader>
...@@ -164,15 +162,13 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -164,15 +162,13 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile> <ModuleDefinitionFile>libGL.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" copy "$(OutDir)libGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command>
mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_V2_translator.dll"</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
...@@ -180,7 +176,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -180,7 +176,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<AdditionalIncludeDirectories>$(ProjectDir)/..;$(ProjectDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)/..;$(ProjectDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
...@@ -196,7 +192,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -196,7 +192,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
<Link> <Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile> <ModuleDefinitionFile>libGL.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
...@@ -205,9 +201,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -205,9 +201,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" copy "$(OutDir)libGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command>
mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_V2_translator.dll"</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
...@@ -215,7 +209,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -215,7 +209,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<AdditionalIncludeDirectories>$(ProjectDir)/..;$(ProjectDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)/..;$(ProjectDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
...@@ -231,7 +225,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -231,7 +225,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
<Link> <Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile> <ModuleDefinitionFile>libGL.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
...@@ -239,9 +233,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -239,9 +233,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" copy "$(OutDir)libGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command>
mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_V2_translator.dll"</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
...@@ -249,7 +241,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -249,7 +241,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<AdditionalIncludeDirectories>$(ProjectDir)/..; $(ProjectDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)/..; $(ProjectDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
...@@ -264,7 +256,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -264,7 +256,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
<Link> <Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile> <ModuleDefinitionFile>libGL.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
...@@ -273,9 +265,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -273,9 +265,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" copy "$(OutDir)libGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command>
mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_V2_translator.dll"</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
...@@ -283,7 +273,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -283,7 +273,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<AdditionalIncludeDirectories>$(ProjectDir)/..; $(ProjectDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)/..; $(ProjectDir)/../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGLESV2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBGL_EXPORTS;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
...@@ -298,7 +288,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -298,7 +288,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
<Link> <Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile> <ModuleDefinitionFile>libGL.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
...@@ -306,9 +296,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -306,9 +296,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\" copy "$(OutDir)libGL.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\"</Command>
mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Platform)\translator\libGLES_V2_translator.dll"</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
...@@ -322,7 +310,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -322,7 +310,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
<ClCompile Include="HandleAllocator.cpp" /> <ClCompile Include="HandleAllocator.cpp" />
<ClCompile Include="Image.cpp" /> <ClCompile Include="Image.cpp" />
<ClCompile Include="IndexDataManager.cpp" /> <ClCompile Include="IndexDataManager.cpp" />
<ClCompile Include="libGLESv2.cpp" /> <ClCompile Include="libGL.cpp" />
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
<ClCompile Include="Program.cpp" /> <ClCompile Include="Program.cpp" />
<ClCompile Include="Query.cpp" /> <ClCompile Include="Query.cpp" />
...@@ -360,10 +348,10 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat ...@@ -360,10 +348,10 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)_$(Plat
<ClInclude Include="VertexDataManager.h" /> <ClInclude Include="VertexDataManager.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="libGLESv2.def" /> <None Include="libGL.def" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="libGLESv2.rc" /> <ResourceCompile Include="libGL.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\SwiftShader\SwiftShader.vcxproj"> <ProjectReference Include="..\..\SwiftShader\SwiftShader.vcxproj">
......
src/OpenGL/libGL/libGLESv2.vcxproj.filters → src/OpenGL/libGL/libGL.vcxproj.filters
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<ClCompile Include="IndexDataManager.cpp"> <ClCompile Include="IndexDataManager.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="libGLESv2.cpp"> <ClCompile Include="libGL.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="main.cpp"> <ClCompile Include="main.cpp">
...@@ -147,9 +147,9 @@ ...@@ -147,9 +147,9 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="libGLESv2.rc" /> <ResourceCompile Include="libGL.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="libGLESv2.def" /> <None Include="libGL.def" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
src/OpenGL/libGL/libGLESv2.cbp deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="libGLESv2" />
<Option pch_mode="2" />
<Option compiler="clang" />
<Build>
<Target title="Debug x86">
<Option output="./../../../lib/Debug_x86/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x86/Debug/" />
<Option type="3" />
<Option compiler="clang" />
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-g" />
<Add option="-m32" />
</Compiler>
<Linker>
<Add option="-m32" />
<Add library="./../../LLVM/bin/x86/Debug/libLLVM.a" />
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libGLESv2.so.2 ./../../../lib/Debug_x86/libGLESv2.so" />
<Add after="mkdir -p ./../../../lib/Debug_x86/translator/" />
<Add after="cp ./../../../lib/Debug_x86/libGLESv2.so.2 ./../../../lib/Debug_x86/translator/libGLES_V2_translator.so" />
</ExtraCommands>
</Target>
<Target title="Release x86">
<Option output="./../../../lib/Release_x86/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x86/Release/" />
<Option type="3" />
<Option compiler="clang" />
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-fomit-frame-pointer" />
<Add option="-O2" />
<Add option="-march=i686" />
<Add option="-m32" />
<Add option="-ffunction-sections" />
<Add option="-fdata-sections" />
<Add option="-DNDEBUG" />
<Add option="-DANGLE_DISABLE_TRACE" />
</Compiler>
<Linker>
<Add option="-s" />
<Add option="-m32" />
<Add option="-Wl,--gc-sections" />
<Add library="./../../LLVM/bin/x86/Release/libLLVM.a" />
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libGLESv2.so.2 ./../../../lib/Release_x86/libGLESv2.so" />
<Add after="mkdir -p ./../../../lib/Release_x86/translator/" />
<Add after="cp ./../../../lib/Release_x86/libGLESv2.so.2 ./../../../lib/Release_x86/translator/libGLES_V2_translator.so" />
</ExtraCommands>
</Target>
<Target title="Debug x64">
<Option output="./../../../lib/Debug_x64/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x64/Debug/" />
<Option type="3" />
<Option compiler="clang" />
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-g" />
<Add option="-m64" />
<Add option="-fPIC" />
</Compiler>
<Linker>
<Add option="-m64" />
<Add library="./../../LLVM/bin/x64/Debug/libLLVM.a" />
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libGLESv2.so.2 ./../../../lib/Debug_x64/libGLESv2.so" />
<Add after="mkdir -p ./../../../lib/Debug_x64/translator/" />
<Add after="cp ./../../../lib/Debug_x64/libGLESv2.so.2 ./../../../lib/Debug_x64/translator/lib64GLES_V2_translator.so" />
</ExtraCommands>
</Target>
<Target title="Release x64">
<Option output="./../../../lib/Release_x64/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x64/Release/" />
<Option type="3" />
<Option compiler="clang" />
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-fomit-frame-pointer" />
<Add option="-O2" />
<Add option="-march=core2" />
<Add option="-m64" />
<Add option="-fPIC" />
<Add option="-ffunction-sections" />
<Add option="-fdata-sections" />
<Add option="-DNDEBUG" />
<Add option="-DANGLE_DISABLE_TRACE" />
</Compiler>
<Linker>
<Add option="-s" />
<Add option="-m64" />
<Add option="-Wl,--gc-sections" />
<Add library="./../../LLVM/bin/x64/Release/libLLVM.a" />
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libGLESv2.so.2 ./../../../lib/Release_x64/libGLESv2.so" />
<Add after="mkdir -p ./../../../lib/Release_x64/translator/" />
<Add after="cp ./../../../lib/Release_x64/libGLESv2.so.2 ./../../../lib/Release_x64/translator/lib64GLES_V2_translator.so" />
</ExtraCommands>
</Target>
</Build>
<Compiler>
<Add option="-Wall" />
<Add option="-std=c++11" />
<Add option="-fexceptions" />
<Add option="-fno-operator-names" />
<Add option="-msse2" />
<Add option="-D__STDC_LIMIT_MACROS" />
<Add option="-D__STDC_CONSTANT_MACROS" />
<Add directory="./../" />
<Add directory="./../include/" />
<Add directory="./../../" />
<Add directory="./../../LLVM/include-linux/" />
<Add directory="./../../LLVM/include/" />
<Add directory="./../../LLVM/lib/Target/X86" />
<Add directory="./../../Renderer/" />
<Add directory="./../../Common/" />
<Add directory="./../../Shader/" />
<Add directory="./../../Main/" />
</Compiler>
<Linker>
<Add option="-Wl,--version-script=./exports.map" />
<Add option="-Wl,--hash-style=both" />
<Add library="pthread" />
<Add library="X11" />
<Add library="Xext" />
</Linker>
<Unit filename="../../Common/CPUID.cpp" />
<Unit filename="../../Common/CPUID.hpp" />
<Unit filename="../../Common/Configurator.cpp" />
<Unit filename="../../Common/Configurator.hpp" />
<Unit filename="../../Common/Debug.cpp" />
<Unit filename="../../Common/Debug.hpp" />
<Unit filename="../../Common/ExceptionHandling.hpp" />
<Unit filename="../../Common/Half.cpp" />
<Unit filename="../../Common/Half.hpp" />
<Unit filename="../../Common/Math.cpp" />
<Unit filename="../../Common/Math.hpp" />
<Unit filename="../../Common/Memory.cpp" />
<Unit filename="../../Common/Memory.hpp" />
<Unit filename="../../Common/MetaMacro.hpp" />
<Unit filename="../../Common/MutexLock.hpp" />
<Unit filename="../../Common/Resource.cpp" />
<Unit filename="../../Common/Resource.hpp" />
<Unit filename="../../Common/SharedLibrary.hpp" />
<Unit filename="../../Common/Socket.cpp" />
<Unit filename="../../Common/Socket.hpp" />
<Unit filename="../../Common/Thread.cpp" />
<Unit filename="../../Common/Thread.hpp" />
<Unit filename="../../Common/Timer.cpp" />
<Unit filename="../../Common/Timer.hpp" />
<Unit filename="../../Common/Types.hpp" />
<Unit filename="../../Common/Version.h" />
<Unit filename="../../Main/Config.cpp" />
<Unit filename="../../Main/Config.hpp" />
<Unit filename="../../Main/FrameBuffer.cpp" />
<Unit filename="../../Main/FrameBuffer.hpp" />
<Unit filename="../../Main/FrameBufferX11.cpp" />
<Unit filename="../../Main/FrameBufferX11.hpp" />
<Unit filename="../../Main/Logo.cpp" />
<Unit filename="../../Main/Register.cpp" />
<Unit filename="../../Main/Register.hpp" />
<Unit filename="../../Main/SwiftConfig.cpp" />
<Unit filename="../../Main/SwiftConfig.hpp" />
<Unit filename="../../Main/crc.cpp" />
<Unit filename="../../Main/crc.h" />
<Unit filename="../../Main/serialcommon.h" />
<Unit filename="../../Main/serialvalid.cpp" />
<Unit filename="../../Main/serialvalid.h" />
<Unit filename="../../Reactor/Nucleus.cpp" />
<Unit filename="../../Reactor/Nucleus.hpp" />
<Unit filename="../../Reactor/Reactor.hpp" />
<Unit filename="../../Reactor/Routine.cpp" />
<Unit filename="../../Reactor/Routine.hpp" />
<Unit filename="../../Reactor/RoutineManager.cpp" />
<Unit filename="../../Reactor/RoutineManager.hpp" />
<Unit filename="../../Reactor/x86.hpp" />
<Unit filename="../../Renderer/Blitter.cpp" />
<Unit filename="../../Renderer/Blitter.hpp" />
<Unit filename="../../Renderer/Clipper.cpp" />
<Unit filename="../../Renderer/Clipper.hpp" />
<Unit filename="../../Renderer/Color.cpp" />
<Unit filename="../../Renderer/Color.hpp" />
<Unit filename="../../Renderer/Context.cpp" />
<Unit filename="../../Renderer/Context.hpp" />
<Unit filename="../../Renderer/LRUCache.hpp" />
<Unit filename="../../Renderer/Matrix.cpp" />
<Unit filename="../../Renderer/Matrix.hpp" />
<Unit filename="../../Renderer/PixelProcessor.cpp" />
<Unit filename="../../Renderer/PixelProcessor.hpp" />
<Unit filename="../../Renderer/Plane.cpp" />
<Unit filename="../../Renderer/Plane.hpp" />
<Unit filename="../../Renderer/Point.cpp" />
<Unit filename="../../Renderer/Point.hpp" />
<Unit filename="../../Renderer/Polygon.hpp" />
<Unit filename="../../Renderer/Primitive.hpp" />
<Unit filename="../../Renderer/QuadRasterizer.cpp" />
<Unit filename="../../Renderer/QuadRasterizer.hpp" />
<Unit filename="../../Renderer/Rasterizer.cpp" />
<Unit filename="../../Renderer/Rasterizer.hpp" />
<Unit filename="../../Renderer/Renderer.cpp" />
<Unit filename="../../Renderer/Renderer.hpp" />
<Unit filename="../../Renderer/Sampler.cpp" />
<Unit filename="../../Renderer/Sampler.hpp" />
<Unit filename="../../Renderer/SetupProcessor.cpp" />
<Unit filename="../../Renderer/SetupProcessor.hpp" />
<Unit filename="../../Renderer/Stream.hpp" />
<Unit filename="../../Renderer/Surface.cpp" />
<Unit filename="../../Renderer/Surface.hpp" />
<Unit filename="../../Renderer/TextureStage.cpp" />
<Unit filename="../../Renderer/TextureStage.hpp" />
<Unit filename="../../Renderer/Triangle.hpp" />
<Unit filename="../../Renderer/Vector.cpp" />
<Unit filename="../../Renderer/Vector.hpp" />
<Unit filename="../../Renderer/Vertex.hpp" />
<Unit filename="../../Renderer/VertexProcessor.cpp" />
<Unit filename="../../Renderer/VertexProcessor.hpp" />
<Unit filename="../../Shader/Constants.cpp" />
<Unit filename="../../Shader/Constants.hpp" />
<Unit filename="../../Shader/PixelRoutine.cpp" />
<Unit filename="../../Shader/PixelRoutine.hpp" />
<Unit filename="../../Shader/PixelShader.cpp" />
<Unit filename="../../Shader/PixelShader.hpp" />
<Unit filename="../../Shader/SamplerCore.cpp" />
<Unit filename="../../Shader/SamplerCore.hpp" />
<Unit filename="../../Shader/SetupRoutine.cpp" />
<Unit filename="../../Shader/SetupRoutine.hpp" />
<Unit filename="../../Shader/Shader.cpp" />
<Unit filename="../../Shader/Shader.hpp" />
<Unit filename="../../Shader/ShaderCore.cpp" />
<Unit filename="../../Shader/ShaderCore.hpp" />
<Unit filename="../../Shader/VertexPipeline.cpp" />
<Unit filename="../../Shader/VertexPipeline.hpp" />
<Unit filename="../../Shader/VertexProgram.cpp" />
<Unit filename="../../Shader/VertexProgram.hpp" />
<Unit filename="../../Shader/VertexRoutine.cpp" />
<Unit filename="../../Shader/VertexRoutine.hpp" />
<Unit filename="../../Shader/VertexShader.cpp" />
<Unit filename="../../Shader/VertexShader.hpp" />
<Unit filename="../common/Object.cpp" />
<Unit filename="../common/Object.hpp" />
<Unit filename="../common/debug.cpp" />
<Unit filename="../common/debug.h" />
<Unit filename="../compiler/AnalyzeCallDepth.cpp" />
<Unit filename="../compiler/AnalyzeCallDepth.h" />
<Unit filename="../compiler/BaseTypes.h" />
<Unit filename="../compiler/Common.h" />
<Unit filename="../compiler/Compiler.cpp" />
<Unit filename="../compiler/ConstantUnion.h" />
<Unit filename="../compiler/Diagnostics.cpp" />
<Unit filename="../compiler/Diagnostics.h" />
<Unit filename="../compiler/DirectiveHandler.cpp" />
<Unit filename="../compiler/DirectiveHandler.h" />
<Unit filename="../compiler/ExtensionBehavior.h" />
<Unit filename="../compiler/InfoSink.cpp" />
<Unit filename="../compiler/InfoSink.h" />
<Unit filename="../compiler/Initialize.cpp" />
<Unit filename="../compiler/Initialize.h" />
<Unit filename="../compiler/InitializeDll.cpp" />
<Unit filename="../compiler/InitializeDll.h" />
<Unit filename="../compiler/InitializeGlobals.h" />
<Unit filename="../compiler/InitializeParseContext.cpp" />
<Unit filename="../compiler/InitializeParseContext.h" />
<Unit filename="../compiler/IntermTraverse.cpp" />
<Unit filename="../compiler/Intermediate.cpp" />
<Unit filename="../compiler/MMap.h" />
<Unit filename="../compiler/OutputASM.cpp" />
<Unit filename="../compiler/OutputASM.h" />
<Unit filename="../compiler/ParseHelper.cpp" />
<Unit filename="../compiler/ParseHelper.h" />
<Unit filename="../compiler/PoolAlloc.cpp" />
<Unit filename="../compiler/PoolAlloc.h" />
<Unit filename="../compiler/Pragma.h" />
<Unit filename="../compiler/ShHandle.h" />
<Unit filename="../compiler/ShaderLang.cpp" />
<Unit filename="../compiler/SymbolTable.cpp" />
<Unit filename="../compiler/SymbolTable.h" />
<Unit filename="../compiler/TranslatorASM.cpp" />
<Unit filename="../compiler/TranslatorASM.h" />
<Unit filename="../compiler/Types.h" />
<Unit filename="../compiler/ValidateLimitations.cpp" />
<Unit filename="../compiler/ValidateLimitations.h" />
<Unit filename="../compiler/debug.cpp" />
<Unit filename="../compiler/debug.h" />
<Unit filename="../compiler/glslang.h" />
<Unit filename="../compiler/glslang_lex.cpp" />
<Unit filename="../compiler/glslang_tab.cpp" />
<Unit filename="../compiler/glslang_tab.h" />
<Unit filename="../compiler/intermOut.cpp" />
<Unit filename="../compiler/intermediate.h" />
<Unit filename="../compiler/localintermediate.h" />
<Unit filename="../compiler/osinclude.h" />
<Unit filename="../compiler/ossource_posix.cpp" />
<Unit filename="../compiler/parseConst.cpp" />
<Unit filename="../compiler/preprocessor/Diagnostics.cpp" />
<Unit filename="../compiler/preprocessor/Diagnostics.h" />
<Unit filename="../compiler/preprocessor/DirectiveHandler.cpp" />
<Unit filename="../compiler/preprocessor/DirectiveHandler.h" />
<Unit filename="../compiler/preprocessor/DirectiveParser.cpp" />
<Unit filename="../compiler/preprocessor/DirectiveParser.h" />
<Unit filename="../compiler/preprocessor/ExpressionParser.cpp" />
<Unit filename="../compiler/preprocessor/ExpressionParser.h" />
<Unit filename="../compiler/preprocessor/Input.cpp" />
<Unit filename="../compiler/preprocessor/Input.h" />
<Unit filename="../compiler/preprocessor/Lexer.cpp" />
<Unit filename="../compiler/preprocessor/Lexer.h" />
<Unit filename="../compiler/preprocessor/Macro.cpp" />
<Unit filename="../compiler/preprocessor/Macro.h" />
<Unit filename="../compiler/preprocessor/MacroExpander.cpp" />
<Unit filename="../compiler/preprocessor/MacroExpander.h" />
<Unit filename="../compiler/preprocessor/Preprocessor.cpp" />
<Unit filename="../compiler/preprocessor/Preprocessor.h" />
<Unit filename="../compiler/preprocessor/SourceLocation.h" />
<Unit filename="../compiler/preprocessor/Token.cpp" />
<Unit filename="../compiler/preprocessor/Token.h" />
<Unit filename="../compiler/preprocessor/Tokenizer.cpp" />
<Unit filename="../compiler/preprocessor/Tokenizer.h" />
<Unit filename="../compiler/preprocessor/length_limits.h" />
<Unit filename="../compiler/preprocessor/numeric_lex.h" />
<Unit filename="../compiler/preprocessor/pp_utils.h" />
<Unit filename="../compiler/util.cpp" />
<Unit filename="../compiler/util.h" />
<Unit filename="../include/EGL/egl.h" />
<Unit filename="../include/EGL/eglext.h" />
<Unit filename="../include/EGL/eglplatform.h" />
<Unit filename="../include/GLES2/gl2.h" />
<Unit filename="../include/GLES2/gl2ext.h" />
<Unit filename="../include/GLES2/gl2platform.h" />
<Unit filename="../include/GLSLANG/ShaderLang.h" />
<Unit filename="../include/KHR/khrplatform.h" />
<Unit filename="Buffer.cpp" />
<Unit filename="Buffer.h" />
<Unit filename="Context.cpp" />
<Unit filename="Context.h" />
<Unit filename="Device.cpp" />
<Unit filename="Device.hpp" />
<Unit filename="Fence.cpp" />
<Unit filename="Fence.h" />
<Unit filename="Framebuffer.cpp" />
<Unit filename="Framebuffer.h" />
<Unit filename="HandleAllocator.cpp" />
<Unit filename="HandleAllocator.h" />
<Unit filename="Image.cpp" />
<Unit filename="Image.hpp" />
<Unit filename="IndexDataManager.cpp" />
<Unit filename="IndexDataManager.h" />
<Unit filename="Program.cpp" />
<Unit filename="Program.h" />
<Unit filename="Query.cpp" />
<Unit filename="Query.h" />
<Unit filename="Renderbuffer.cpp" />
<Unit filename="Renderbuffer.h" />
<Unit filename="ResourceManager.cpp" />
<Unit filename="ResourceManager.h" />
<Unit filename="Shader.cpp" />
<Unit filename="Shader.h" />
<Unit filename="Texture.cpp" />
<Unit filename="Texture.h" />
<Unit filename="VertexDataManager.cpp" />
<Unit filename="VertexDataManager.h" />
<Unit filename="exports.map" />
<Unit filename="libGLESv2.cpp" />
<Unit filename="main.cpp" />
<Unit filename="main.h" />
<Unit filename="mathutil.h" />
<Unit filename="resource.h" />
<Unit filename="utilities.cpp" />
<Unit filename="utilities.h" />
<Extensions>
<code_completion />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>
src/OpenGL/libGL/main.h
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
// main.h: Management of thread-local data. // main.h: Management of thread-local data.
#ifndef LIBGLESV2_MAIN_H_ #ifndef LIBGL_MAIN_H_
#define LIBGLESV2_MAIN_H_ #define LIBGL_MAIN_H_
#include "Context.h" #include "Context.h"
#include "Device.hpp" #include "Device.hpp"
...@@ -61,4 +61,4 @@ namespace es1 ...@@ -61,4 +61,4 @@ namespace es1
extern void *libEGL; // Handle to the libEGL module extern void *libEGL; // Handle to the libEGL module
extern void *libGLES_CM; // Handle to the libGLES_CM module extern void *libGLES_CM; // Handle to the libGLES_CM module
#endif // LIBGLESV2_MAIN_H_ #endif // LIBGL_MAIN_H_
src/OpenGL/libGL/mathutil.h
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
// mathutil.h: Math and bit manipulation functions. // mathutil.h: Math and bit manipulation functions.
#ifndef LIBGLESV2_MATHUTIL_H_ #ifndef LIBGL_MATHUTIL_H_
#define LIBGLESV2_MATHUTIL_H_ #define LIBGL_MATHUTIL_H_
#include "common/debug.h" #include "common/debug.h"
...@@ -76,4 +76,4 @@ inline unsigned int unorm(float x) ...@@ -76,4 +76,4 @@ inline unsigned int unorm(float x)
} }
} }
#endif // LIBGLESV2_MATHUTIL_H_ #endif // LIBGL_MATHUTIL_H_
src/OpenGL/libGL/resource.h
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by libGLESv2.rc // Used by libGL.rc
// Next default values for new objects // Next default values for new objects
// //
......
src/OpenGL/libGL/utilities.h
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
// utilities.h: Conversion functions and other utility routines. // utilities.h: Conversion functions and other utility routines.
#ifndef LIBGLESV2_UTILITIES_H #ifndef LIBGL_UTILITIES_H
#define LIBGLESV2_UTILITIES_H #define LIBGL_UTILITIES_H
#include "Device.hpp" #include "Device.hpp"
#include "Image.hpp" #include "Image.hpp"
...@@ -83,4 +83,4 @@ namespace sw2es ...@@ -83,4 +83,4 @@ namespace sw2es
GLenum ConvertDepthStencilFormat(sw::Format format); GLenum ConvertDepthStencilFormat(sw::Format format);
} }
#endif // LIBGLESV2_UTILITIES_H #endif // LIBGL_UTILITIES_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