Rename libGLESv2 to libGL.

src/OpenGL/libGL/Buffer.h

@@ -13,8 +13,8 @@
 // index data. Implements GL buffer objects and related functionality.
 // [OpenGL ES 2.0.24] section 2.9 page 21.
 
-#ifndef LIBGLESV2_BUFFER_H_
-#define LIBGLESV2_BUFFER_H_
+#ifndef LIBGL_BUFFER_H_
+#define LIBGL_BUFFER_H_
 
 #include "common/Object.hpp"
 #include "Common/Resource.hpp"
@@ -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 @@
 // Context.h: Defines the Context class, managing all GL state and performing
 // rendering operations. It is the GLES2 specific implementation of EGLContext.
 
-#ifndef LIBGLESV2_CONTEXT_H_
-#define LIBGLESV2_CONTEXT_H_
+#ifndef LIBGL_CONTEXT_H_
+#define LIBGL_CONTEXT_H_
 
 #include "libEGL/Context.hpp"
 #include "ResourceManager.h"

src/OpenGL/libGL/Fence.h

@@ -11,8 +11,8 @@
 
 // Fence.h: Defines the Fence class, which supports the GL_NV_fence extension.
 
-#ifndef LIBGLESV2_FENCE_H_
-#define LIBGLESV2_FENCE_H_
+#ifndef LIBGL_FENCE_H_
+#define LIBGL_FENCE_H_
 
 #define GL_APICALL
 #include <GLES2/gl2.h>
@@ -40,4 +40,4 @@ class Fence
 
 }
 
-#endif   // LIBGLESV2_FENCE_H_
+#endif   // LIBGL_FENCE_H_

src/OpenGL/libGL/Framebuffer.h

@@ -12,8 +12,8 @@
 // Framebuffer.h: Defines the Framebuffer class. Implements GL framebuffer
 // objects and related functionality. [OpenGL ES 2.0.24] section 4.4 page 105.
 
-#ifndef LIBGLESV2_FRAMEBUFFER_H_
-#define LIBGLESV2_FRAMEBUFFER_H_
+#ifndef LIBGL_FRAMEBUFFER_H_
+#define LIBGL_FRAMEBUFFER_H_
 
 #include "common/Object.hpp"
 #include "Image.hpp"
@@ -87,4 +87,4 @@ public:
 
 }
 
-#endif   // LIBGLESV2_FRAMEBUFFER_H_
+#endif   // LIBGL_FRAMEBUFFER_H_

src/OpenGL/libGL/HandleAllocator.h

@@ -12,8 +12,8 @@
 // HandleAllocator.h: Defines the HandleAllocator class, which is used to
 // allocate GL handles.
 
-#ifndef LIBGLESV2_HANDLEALLOCATOR_H_
-#define LIBGLESV2_HANDLEALLOCATOR_H_
+#ifndef LIBGL_HANDLEALLOCATOR_H_
+#define LIBGL_HANDLEALLOCATOR_H_
 
 #define GL_APICALL
 #include <GLES2/gl2.h>
@@ -43,4 +43,4 @@ class HandleAllocator
 
 }
 
-#endif   // LIBGLESV2_HANDLEALLOCATOR_H_
+#endif   // LIBGL_HANDLEALLOCATOR_H_

src/OpenGL/libGL/IndexDataManager.h

@@ -12,8 +12,8 @@
 // IndexDataManager.h: Defines the IndexDataManager, a class that
 // runs the Buffer translation process for index buffers.
 
-#ifndef LIBGLESV2_INDEXDATAMANAGER_H_
-#define LIBGLESV2_INDEXDATAMANAGER_H_
+#ifndef LIBGL_INDEXDATAMANAGER_H_
+#define LIBGL_INDEXDATAMANAGER_H_
 
 #include "Context.h"
 
@@ -66,4 +66,4 @@ class IndexDataManager
 
 }
 
-#endif   // LIBGLESV2_INDEXDATAMANAGER_H_
+#endif   // LIBGL_INDEXDATAMANAGER_H_

src/OpenGL/libGL/Program.h

@@ -12,8 +12,8 @@
 // Program.h: Defines the Program class. Implements GL program objects
 // and related functionality. [OpenGL ES 2.0.24] section 2.10.3 page 28.
 
-#ifndef LIBGLESV2_PROGRAM_H_
-#define LIBGLESV2_PROGRAM_H_
+#ifndef LIBGL_PROGRAM_H_
+#define LIBGL_PROGRAM_H_
 
 #include "Shader.h"
 #include "Context.h"
@@ -204,4 +204,4 @@ namespace es2
 	};
 }
 
-#endif   // LIBGLESV2_PROGRAM_H_
+#endif   // LIBGL_PROGRAM_H_

src/OpenGL/libGL/Query.h

@@ -11,8 +11,8 @@
 
 // Query.h: Defines the es2::Query class
 
-#ifndef LIBGLESV2_QUERY_H_
-#define LIBGLESV2_QUERY_H_
+#ifndef LIBGL_QUERY_H_
+#define LIBGL_QUERY_H_
 
 #include "common/Object.hpp"
 #include "Renderer/Renderer.hpp"
@@ -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 @@
 // DepthStencilbuffer, Depthbuffer and Stencilbuffer. Implements GL renderbuffer
 // objects and related functionality. [OpenGL ES 2.0.24] section 4.4.3 page 108.
 
-#ifndef LIBGLESV2_RENDERBUFFER_H_
-#define LIBGLESV2_RENDERBUFFER_H_
+#ifndef LIBGL_RENDERBUFFER_H_
+#define LIBGL_RENDERBUFFER_H_
 
 #include "common/Object.hpp"
 #include "Image.hpp"
@@ -226,4 +226,4 @@ public:
 };
 }
 
-#endif   // LIBGLESV2_RENDERBUFFER_H_
+#endif   // LIBGL_RENDERBUFFER_H_

src/OpenGL/libGL/ResourceManager.h

@@ -12,8 +12,8 @@
 // ResourceManager.h : Defines the ResourceManager class, which tracks objects
 // shared by multiple GL contexts.
 
-#ifndef LIBGLESV2_RESOURCEMANAGER_H_
-#define LIBGLESV2_RESOURCEMANAGER_H_
+#ifndef LIBGL_RESOURCEMANAGER_H_
+#define LIBGL_RESOURCEMANAGER_H_
 
 #include "HandleAllocator.h"
 
@@ -97,4 +97,4 @@ class ResourceManager
 
 }
 
-#endif // LIBGLESV2_RESOURCEMANAGER_H_
+#endif // LIBGL_RESOURCEMANAGER_H_

src/OpenGL/libGL/Shader.h

@@ -14,8 +14,8 @@
 // related functionality. [OpenGL ES 2.0.24] section 2.10 page 24 and section
 // 3.8 page 84.
 
-#ifndef LIBGLESV2_SHADER_H_
-#define LIBGLESV2_SHADER_H_
+#ifndef LIBGL_SHADER_H_
+#define LIBGL_SHADER_H_
 
 #include "ResourceManager.h"
 
@@ -157,4 +157,4 @@ private:
 };
 }
 
-#endif   // LIBGLESV2_SHADER_H_
+#endif   // LIBGL_SHADER_H_

src/OpenGL/libGL/Texture.h

@@ -13,8 +13,8 @@
 // classes Texture2D and TextureCubeMap. Implements GL texture objects and
 // related functionality. [OpenGL ES 2.0.24] section 3.7 page 63.
 
-#ifndef LIBGLESV2_TEXTURE_H_
-#define LIBGLESV2_TEXTURE_H_
+#ifndef LIBGL_TEXTURE_H_
+#define LIBGL_TEXTURE_H_
 
 #include "Renderbuffer.h"
 #include "common/Object.hpp"
@@ -237,4 +237,4 @@ public:
 };
 }
 
-#endif   // LIBGLESV2_TEXTURE_H_
+#endif   // LIBGL_TEXTURE_H_

src/OpenGL/libGL/VertexDataManager.h

@@ -12,8 +12,8 @@
 // VertexDataManager.h: Defines the VertexDataManager, a class that
 // runs the Buffer translation process.
 
-#ifndef LIBGLESV2_VERTEXDATAMANAGER_H_
-#define LIBGLESV2_VERTEXDATAMANAGER_H_
+#ifndef LIBGL_VERTEXDATAMANAGER_H_
+#define LIBGL_VERTEXDATAMANAGER_H_
 
 #include "Context.h"
 #include "Device.hpp"
@@ -96,4 +96,4 @@ class VertexDataManager
 
 }
 
-#endif   // LIBGLESV2_VERTEXDATAMANAGER_H_
+#endif   // LIBGL_VERTEXDATAMANAGER_H_

src/OpenGL/libGL/exports.map

-{
-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 @@
 // 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.
 //
-// libGLESv2.cpp: Implements the exported OpenGL ES 2.0 functions.
+// libGL.cpp: Implements the exported OpenGL functions.
 
 #include "main.h"
 #include "mathutil.h"

src/OpenGL/libGL/libGLESv2.def → src/OpenGL/libGL/libGL.def

-LIBRARY libGLESv2
+LIBRARY libGL
 EXPORTS
     glActiveTexture                 @1
     glAttachShader                  @2

src/OpenGL/libGL/libGLESv2.rc → src/OpenGL/libGL/libGL.rc

@@ -70,13 +70,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "FileDescription", "SwiftShader libGLESv2 Dynamic Link Library"
+            VALUE "FileDescription", "SwiftShader OpenGL Dynamic Link Library"
             VALUE "FileVersion", VERSION_STRING
-            VALUE "InternalName", "libGLESv2"
+            VALUE "InternalName", "libGL"
             VALUE "LegalCopyright", "Copyright (C) 2012 TransGaming Inc."
-            VALUE "OriginalFilename", "libGLESv2.dll"
+            VALUE "OriginalFilename", "opengl32.dll"
             VALUE "PrivateBuild", VERSION_STRING
-            VALUE "ProductName", "SwiftShader libGLESv2 Dynamic Link Library"
+            VALUE "ProductName", "SwiftShader openGL Dynamic Link Library"
             VALUE "ProductVersion", VERSION_STRING
         END
     END

src/OpenGL/libGL/libGLESv2.vcxproj.filters → src/OpenGL/libGL/libGL.vcxproj.filters

@@ -32,7 +32,7 @@
     <ClCompile Include="IndexDataManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="libGLESv2.cpp">
+    <ClCompile Include="libGL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="main.cpp">
@@ -147,9 +147,9 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="libGLESv2.rc" />
+    <ResourceCompile Include="libGL.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="libGLESv2.def" />
+    <None Include="libGL.def" />
   </ItemGroup>
 </Project>
\ No newline at end of file

src/OpenGL/libGL/main.h

@@ -11,8 +11,8 @@
 
 // main.h: Management of thread-local data.
 
-#ifndef LIBGLESV2_MAIN_H_
-#define LIBGLESV2_MAIN_H_
+#ifndef LIBGL_MAIN_H_
+#define LIBGL_MAIN_H_
 
 #include "Context.h"
 #include "Device.hpp"
@@ -61,4 +61,4 @@ namespace es1
 extern void *libEGL;       // Handle to the libEGL 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 @@
 
 // mathutil.h: Math and bit manipulation functions.
 
-#ifndef LIBGLESV2_MATHUTIL_H_
-#define LIBGLESV2_MATHUTIL_H_
+#ifndef LIBGL_MATHUTIL_H_
+#define LIBGL_MATHUTIL_H_
 
 #include "common/debug.h"
 
@@ -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}}
 // Microsoft Visual C++ generated include file.
-// Used by libGLESv2.rc
+// Used by libGL.rc
 
 // Next default values for new objects
 // 

src/OpenGL/libGL/utilities.h

@@ -11,8 +11,8 @@
 
 // utilities.h: Conversion functions and other utility routines.
 
-#ifndef LIBGLESV2_UTILITIES_H
-#define LIBGLESV2_UTILITIES_H
+#ifndef LIBGL_UTILITIES_H
+#define LIBGL_UTILITIES_H
 
 #include "Device.hpp"
 #include "Image.hpp"
@@ -83,4 +83,4 @@ namespace sw2es
 	GLenum ConvertDepthStencilFormat(sw::Format format);
 }
 
-#endif  // LIBGLESV2_UTILITIES_H
+#endif  // LIBGL_UTILITIES_H