From: Nicolas Capens <capn@google.com>
Date: Thu, 23 Oct 2014 17:36:27 +0000 (-0400)
Subject: Rename libGLESv2 files to libGLES_CM.
X-Git-Tag: android-x86-7.1-r1~1414
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1c571f2474419db752f6b41364a2f024184463ff;p=android-x86%2Fexternal-swiftshader.git

Rename libGLESv2 files to libGLES_CM.

BUG=18110152

Change-Id: I8edde80796fdd677dab3c5b8289b852c12329f55
Reviewed-on: https://swiftshader-review.googlesource.com/1231
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
---

diff --git a/src/GLES2/libGLES_CM/libGLESv2.cpp b/src/GLES2/libGLES_CM/libGLES_CM.cpp
similarity index 100%
rename from src/GLES2/libGLES_CM/libGLESv2.cpp
rename to src/GLES2/libGLES_CM/libGLES_CM.cpp
diff --git a/src/GLES2/libGLES_CM/libGLESv2.def b/src/GLES2/libGLES_CM/libGLES_CM.def
similarity index 100%
rename from src/GLES2/libGLES_CM/libGLESv2.def
rename to src/GLES2/libGLES_CM/libGLES_CM.def
diff --git a/src/GLES2/libGLES_CM/libGLESv2.rc b/src/GLES2/libGLES_CM/libGLES_CM.rc
similarity index 100%
rename from src/GLES2/libGLES_CM/libGLESv2.rc
rename to src/GLES2/libGLES_CM/libGLES_CM.rc
diff --git a/src/GLES2/libGLES_CM/libGLESv2.vcxproj b/src/GLES2/libGLES_CM/libGLES_CM.vcxproj
similarity index 100%
rename from src/GLES2/libGLES_CM/libGLESv2.vcxproj
rename to src/GLES2/libGLES_CM/libGLES_CM.vcxproj
diff --git a/src/GLES2/libGLES_CM/libGLESv2.vcxproj.filters b/src/GLES2/libGLES_CM/libGLES_CM.vcxproj.filters
similarity index 100%
rename from src/GLES2/libGLES_CM/libGLESv2.vcxproj.filters
rename to src/GLES2/libGLES_CM/libGLES_CM.vcxproj.filters
diff --git a/src/GLES2/libGLES_CM/libGLESv2.cbp b/src/GLES2/libGLES_CM/libGLESv2.cbp
deleted file mode 100644
index a045a3ae8..000000000
--- a/src/GLES2/libGLES_CM/libGLESv2.cbp
+++ /dev/null
@@ -1,367 +0,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="gcc" />
-		<Build>
-			<Target title="Debug x86">
-				<Option output="./../../bin/x86/Debug/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
-				<Option object_output="obj/x86/Debug/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<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>
-			</Target>
-			<Target title="Release x86">
-				<Option output="./../../bin/x86/Release/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
-				<Option object_output="obj/x86/Release/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=i686" />
-					<Add option="-fomit-frame-pointer" />
-					<Add option="-O2" />
-					<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>
-			</Target>
-			<Target title="Debug x64">
-				<Option output="./../../bin/x64/Debug/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
-				<Option object_output="obj/x64/Debug/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<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>
-			</Target>
-			<Target title="Release x64">
-				<Option output="./../../bin/x64/Release/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
-				<Option object_output="obj/x64/Release/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-march=core2" />
-					<Add option="-fomit-frame-pointer" />
-					<Add option="-O2" />
-					<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>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-			<Add option="-fexceptions" />
-			<Add option="-fno-operator-names" />
-			<Add option="-ffriend-injection" />
-			<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 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/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="./../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/RemoveTree.cpp" />
-		<Unit filename="../compiler/RemoveTree.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="./../libGLESv2/Buffer.cpp" />
-		<Unit filename="./../libGLESv2/Buffer.h" />
-		<Unit filename="./../libGLESv2/Context.cpp" />
-		<Unit filename="./../libGLESv2/Context.h" />
-		<Unit filename="./../libGLESv2/Device.cpp" />
-		<Unit filename="./../libGLESv2/Device.hpp" />
-		<Unit filename="./../libGLESv2/Fence.cpp" />
-		<Unit filename="./../libGLESv2/Fence.h" />
-		<Unit filename="./../libGLESv2/Framebuffer.cpp" />
-		<Unit filename="./../libGLESv2/Framebuffer.h" />
-		<Unit filename="./../libGLESv2/HandleAllocator.cpp" />
-		<Unit filename="./../libGLESv2/HandleAllocator.h" />
-		<Unit filename="./../libGLESv2/Image.cpp" />
-		<Unit filename="./../libGLESv2/Image.hpp" />
-		<Unit filename="./../libGLESv2/IndexDataManager.cpp" />
-		<Unit filename="./../libGLESv2/IndexDataManager.h" />
-		<Unit filename="./../libGLESv2/Program.cpp" />
-		<Unit filename="./../libGLESv2/Program.h" />
-		<Unit filename="./../libGLESv2/Query.cpp" />
-		<Unit filename="./../libGLESv2/Query.h" />
-		<Unit filename="./../libGLESv2/RefCountObject.cpp" />
-		<Unit filename="./../libGLESv2/RefCountObject.h" />
-		<Unit filename="./../libGLESv2/Renderbuffer.cpp" />
-		<Unit filename="./../libGLESv2/Renderbuffer.h" />
-		<Unit filename="./../libGLESv2/ResourceManager.cpp" />
-		<Unit filename="./../libGLESv2/ResourceManager.h" />
-		<Unit filename="./../libGLESv2/Shader.cpp" />
-		<Unit filename="./../libGLESv2/Shader.h" />
-		<Unit filename="./../libGLESv2/Texture.cpp" />
-		<Unit filename="./../libGLESv2/Texture.h" />
-		<Unit filename="./../libGLESv2/Unknown.hpp" />
-		<Unit filename="./../libGLESv2/VertexDataManager.cpp" />
-		<Unit filename="./../libGLESv2/VertexDataManager.h" />
-		<Unit filename="./../libGLESv2/libGLESv2.cpp" />
-		<Unit filename="./../libGLESv2/main.cpp" />
-		<Unit filename="./../libGLESv2/main.h" />
-		<Unit filename="./../libGLESv2/mathutil.h" />
-		<Unit filename="./../libGLESv2/resource.h" />
-		<Unit filename="./../libGLESv2/utilities.cpp" />
-		<Unit filename="./../libGLESv2/utilities.h" />
-		<Unit filename="./../libGLESv2/vertexconversion.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.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="./../../Main/crc.h" />
-		<Unit filename="./../../Main/serialcommon.h" />
-		<Unit filename="./../../Main/serialvalid.cpp" />
-		<Unit filename="./../../Main/serialvalid.h" />
-		<Unit filename="./../../Reactor/Routine.cpp" />
-		<Unit filename="./../../Reactor/Routine.hpp" />
-		<Unit filename="./../../Reactor/RoutineManager.cpp" />
-		<Unit filename="./../../Reactor/RoutineManager.hpp" />
-		<Unit filename="./../../Reactor/Nucleus.cpp" />
-		<Unit filename="./../../Reactor/Nucleus.hpp" />
-		<Unit filename="./../../Reactor/Reactor.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" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>