Add libGLES_CM to the Code::Blocks project.

src/Common/SharedLibrary.hpp

@@ -94,6 +94,6 @@ void *loadLibrary(const char *(&names)[n])
 
 	inline void *getProcAddress(void *library, const char *name)
 	{
-		return dlsym(library, name);
+		return library ? dlsym(library, name) : 0;
 	}
 #endif

src/Common/Version.h

 #define MAJOR_VERSION 3
 #define MINOR_VERSION 2
 #define BUILD_VERSION 7
-#define BUILD_REVISION 47655
+#define BUILD_REVISION 47656
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/OpenGL/libEGL/exports.map

+{
+global:
+	eglBindAPI;
+	eglBindTexImage;
+	eglChooseConfig;
+	eglCopyBuffers;
+	eglCreateContext;
+	eglCreatePbufferFromClientBuffer;
+	eglCreatePbufferSurface;
+	eglCreatePixmapSurface;
+	eglCreateWindowSurface;
+	eglDestroyContext;
+	eglDestroySurface;
+	eglGetConfigAttrib;
+	eglGetConfigs;
+	eglGetCurrentContext;
+	eglGetCurrentDisplay;
+	eglGetCurrentSurface;
+	eglGetDisplay;
+	eglGetError;
+	eglGetProcAddress;
+	eglInitialize;
+	eglMakeCurrent;
+	eglQueryAPI;
+	eglQueryContext;
+	eglQueryString;
+	eglQuerySurface;
+	eglReleaseTexImage;
+	eglReleaseThread;
+	eglSurfaceAttrib;
+	eglSwapBuffers;
+	eglSwapInterval;
+	eglTerminate;
+	eglWaitClient;
+	eglWaitGL;
+	eglWaitNative;
+
+	# Extensions
+	eglCreateImageKHR;
+	eglDestroyImageKHR;
+	eglGetPlatformDisplayEXT;
+    eglCreatePlatformWindowSurfaceEXT;
+    eglCreatePlatformPixmapSurfaceEXT;
+
+	# Functions that don't change the error code, for use by client APIs
+	clientGetCurrentContext;
+	clientGetCurrentDisplay;
+
+local:
+    *;
+};
+

src/OpenGL/libEGL/libEGL.cbp

@@ -97,6 +97,7 @@
 			<Add directory="./../../" />
 		</Compiler>
 		<Linker>
+			<Add option="-Wl,--version-script=./exports.map" />
 			<Add library="pthread" />
 		</Linker>
 		<Unit filename="../../Common/SharedLibrary.hpp" />

src/OpenGL/libGLES_CM/Context.cpp

@@ -20,7 +20,6 @@
 #include "ResourceManager.h"
 #include "Buffer.h"
 #include "Framebuffer.h"
-#include "Query.h"
 #include "Renderbuffer.h"
 #include "Texture.h"
 #include "VertexDataManager.h"

src/OpenGL/libGLES_CM/exports.map

 {
 global:
+	eglBindTexImage;
+    eglChooseConfig;
+    eglCopyBuffers;
+    eglCreateContext;
+    eglCreatePbufferSurface;
+    eglCreatePixmapSurface;
+    eglCreateWindowSurface;
+    eglDestroyContext;
+    eglDestroySurface;
+    eglGetConfigAttrib;
+    eglGetConfigs;
+    eglGetCurrentContext;
+    eglGetCurrentDisplay;
+    eglGetCurrentSurface;
+    eglGetDisplay;
+    eglGetError;
+    eglGetProcAddress;
+    eglInitialize;
+    eglMakeCurrent;
+    eglQueryContext;
+    eglQueryString;
+    eglQuerySurface;
+    eglReleaseTexImage;
+    eglSurfaceAttrib;
+    eglSwapBuffers;
+    eglSwapInterval;
+    eglTerminate;
+    eglWaitGL;
+    eglWaitNative;
     glActiveTexture;
-    glAttachShader;
-    glBindAttribLocation;
+    glAlphaFunc;
+    glAlphaFuncx;
     glBindBuffer;
-    glBindFramebuffer;
-    glBindRenderbuffer;
     glBindTexture;
-    glBlendColor;
-    glBlendEquation;
-    glBlendEquationSeparate;
     glBlendFunc;
-    glBlendFuncSeparate;
     glBufferData;
     glBufferSubData;
-    glCheckFramebufferStatus;
     glClear;
     glClearColor;
+    glClearColorx;
     glClearDepthf;
+    glClearDepthx;
     glClearStencil;
+    glClientActiveTexture;
+    glClipPlanef;
+    glClipPlanex;
+    glColor4f;
+    glColor4ub;
+    glColor4x;
     glColorMask;
-    glCompileShader;
+    glColorPointer;
     glCompressedTexImage2D;
     glCompressedTexSubImage2D;
     glCopyTexImage2D;
     glCopyTexSubImage2D;
-    glCreateProgram;
-    glCreateShader;
     glCullFace;
     glDeleteBuffers;
-    glDeleteFramebuffers;
-    glDeleteProgram;
-    glDeleteRenderbuffers;
-    glDeleteShader;
     glDeleteTextures;
     glDepthFunc;
     glDepthMask;
     glDepthRangef;
-    glDetachShader;
+    glDepthRangex;
     glDisable;
-    glDisableVertexAttribArray;
+    glDisableClientState;
     glDrawArrays;
     glDrawElements;
     glEnable;
-    glEnableVertexAttribArray;
+    glEnableClientState;
     glFinish;
     glFlush;
-    glFramebufferRenderbuffer;
-    glFramebufferTexture2D;
+    glFogf;
+    glFogfv;
+    glFogx;
+    glFogxv;
     glFrontFace;
+    glFrustumf;
+    glFrustumx;
     glGenBuffers;
-    glGenFramebuffers;
-    glGenRenderbuffers;
     glGenTextures;
-    glGenerateMipmap;
-    glGetActiveAttrib;
-    glGetActiveUniform;
-    glGetAttachedShaders;
-    glGetAttribLocation;
     glGetBooleanv;
     glGetBufferParameteriv;
+    glGetClipPlanef;
+    glGetClipPlanex;
     glGetError;
+    glGetFixedv;
     glGetFloatv;
-    glGetFramebufferAttachmentParameteriv;
     glGetIntegerv;
-    glGetProgramInfoLog;
-    glGetProgramiv;
-    glGetRenderbufferParameteriv;
-    glGetShaderInfoLog;
-    glGetShaderPrecisionFormat;
-    glGetShaderSource;
-    glGetShaderiv;
+    glGetLightfv;
+    glGetLightxv;
+    glGetMaterialfv;
+    glGetMaterialxv;
+    glGetPointerv;
     glGetString;
+    glGetTexEnvfv;
+    glGetTexEnviv;
+    glGetTexEnvxv;
     glGetTexParameterfv;
     glGetTexParameteriv;
-    glGetUniformLocation;
-    glGetUniformfv;
-    glGetUniformiv;
-    glGetVertexAttribPointerv;
-    glGetVertexAttribfv;
-    glGetVertexAttribiv;
+    glGetTexParameterxv;
     glHint;
     glIsBuffer;
     glIsEnabled;
-    glIsFramebuffer;
-    glIsProgram;
-    glIsRenderbuffer;
-    glIsShader;
     glIsTexture;
+    glLightModelf;
+    glLightModelfv;
+    glLightModelx;
+    glLightModelxv;
+    glLightf;
+    glLightfv;
+    glLightx;
+    glLightxv;
     glLineWidth;
-    glLinkProgram;
+    glLineWidthx;
+    glLoadIdentity;
+    glLoadMatrixf;
+    glLoadMatrixx;
+    glLogicOp;
+    glMaterialf;
+    glMaterialfv;
+    glMaterialx;
+    glMaterialxv;
+    glMatrixMode;
+    glMultMatrixf;
+    glMultMatrixx;
+    glMultiTexCoord4f;
+    glMultiTexCoord4x;
+    glNormal3f;
+    glNormal3x;
+    glNormalPointer;
+    glOrthof;
+    glOrthox;
     glPixelStorei;
+    glPointParameterf;
+    glPointParameterfv;
+    glPointParameterx;
+    glPointParameterxv;
+    glPointSize;
+    glPointSizex;
     glPolygonOffset;
+    glPolygonOffsetx;
+    glPopMatrix;
+    glPushMatrix;
     glReadPixels;
-    glReleaseShaderCompiler;
-    glRenderbufferStorage;
+    glRotatef;
+    glRotatex;
     glSampleCoverage;
+    glSampleCoveragex;
+    glScalef;
+    glScalex;
     glScissor;
-    glShaderBinary;
-    glShaderSource;
+    glShadeModel;
     glStencilFunc;
-    glStencilFuncSeparate;
     glStencilMask;
-    glStencilMaskSeparate;
     glStencilOp;
-    glStencilOpSeparate;
+    glTexCoordPointer;
+    glTexEnvf;
+    glTexEnvfv;
+    glTexEnvi;
+    glTexEnviv;
+    glTexEnvx;
+    glTexEnvxv;
     glTexImage2D;
     glTexParameterf;
     glTexParameterfv;
     glTexParameteri;
     glTexParameteriv;
+    glTexParameterx;
+    glTexParameterxv;
     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;
+    glTranslatef;
+    glTranslatex;
+    glVertexPointer;
     glViewport;
 
 	# Extensions
-    glTexImage3DOES;
-    glBlitFramebufferANGLE;
-    glRenderbufferStorageMultisampleANGLE;
-    glDeleteFencesNV;
-    glFinishFenceNV;
-    glGenFencesNV;
-    glGetFenceivNV;
-    glIsFenceNV;
-    glSetFenceNV;
-    glTestFenceNV;
-    glGetGraphicsResetStatusEXT;
-    glReadnPixelsEXT;
-    glGetnUniformfvEXT;
-    glGetnUniformivEXT;
-    glGenQueriesEXT;
-    glDeleteQueriesEXT;
-    glIsQueryEXT;
-    glBeginQueryEXT;
-    glEndQueryEXT;
-    glGetQueryivEXT;
-    glGetQueryObjectuivEXT;
+	glPointSizePointerOES;
+    glEGLImageTargetTexture2DOES;
+    glEGLImageTargetRenderbufferStorageOES;
+    glIsRenderbufferOES;
+    glBindRenderbufferOES;
+    glDeleteRenderbuffersOES;
+    glGenRenderbuffersOES;
+    glRenderbufferStorageOES;
+    glGetRenderbufferParameterivOES;
+    glIsFramebufferOES;
+    glBindFramebufferOES;
+    glDeleteFramebuffersOES;
+    glGenFramebuffersOES;
+    glCheckFramebufferStatusOES;
+    glFramebufferRenderbufferOES;
+    glFramebufferTexture2DOES;
+    glGetFramebufferAttachmentParameterivOES;
+    glGenerateMipmapOES;
+    glBlendEquationOES;
+    glBlendEquationSeparateOES;
+    glBlendFuncSeparateOES;
+    glDrawTexsOES;
+    glDrawTexiOES;
+    glDrawTexxOES;
+    glDrawTexsvOES;
+    glDrawTexivOES;
+    glDrawTexxvOES;
+    glDrawTexfOES;
+    glDrawTexfvOES;
 
     # EGL dependencies
     glCreateContext;
-    glDestroyContext;
-    glMakeCurrent;
-    glGetCurrentContext;
     glGetProcAddress;
-    glBindTexImage;
 
 	createFrameBuffer;
 	createBackBuffer;
-    createDevice;
+	createDepthStencil;
 
 	Register;
 

src/OpenGL/libGLES_CM/libGLES_CM.cpp

@@ -18,7 +18,6 @@
 #include "Framebuffer.h"
 #include "Renderbuffer.h"
 #include "Texture.h"
-#include "Query.h"
 #include "common/debug.h"
 #include "Common/SharedLibrary.hpp"
 #include "Common/Version.h"
@@ -2670,7 +2669,7 @@ const GLubyte* GL_APIENTRY glGetString(GLenum name)
         case GL_RENDERER:
             return (GLubyte*)"SwiftShader";
         case GL_VERSION:
-            return (GLubyte*)"OpenGL ES 1.1 SwiftShader "VERSION_STRING;
+            return (GLubyte*)"OpenGL ES 1.1 SwiftShader " VERSION_STRING;
         case GL_EXTENSIONS:
             // Keep list sorted in following order:
 	        // OES extensions

src/OpenGL/libGLESv2/exports.map

@@ -165,18 +165,16 @@ global:
     glEndQueryEXT;
     glGetQueryivEXT;
     glGetQueryObjectuivEXT;
+	glEGLImageTargetTexture2DOES;
+	glEGLImageTargetRenderbufferStorageOES;
 
     # EGL dependencies
     glCreateContext;
-    glDestroyContext;
-    glMakeCurrent;
-    glGetCurrentContext;
     glGetProcAddress;
-    glBindTexImage;
 
 	createFrameBuffer;
 	createBackBuffer;
-    createDevice;
+	createDepthStencil;
 
 	Register;
 

src/Reactor/RoutineManager.cpp

@@ -113,8 +113,11 @@ namespace sw
 
 	void RoutineManager::deallocateExceptionTable(void *ET)
 	{
+        if(ET)
+        {
             UNIMPLEMENTED();
         }
+	}
 
 	void RoutineManager::setMemoryWritable()
 	{

src/SwiftShader.workspace

@@ -5,6 +5,9 @@
 		<Project filename="OpenGL/libGLESv2/libGLESv2.cbp">
 			<Depends filename="LLVM/LLVM.cbp" />
 		</Project>
+		<Project filename="OpenGL/libGLES_CM/libGLES_CM.cbp">
+			<Depends filename="LLVM/LLVM.cbp" />
+		</Project>
 		<Project filename="LLVM/LLVM.cbp" />
 		<Project filename="../tests/third_party/PowerVR/Examples/Beginner/01_HelloAPI/OGLES2/Build/OGLES2HelloAPI.cbp">
 			<Depends filename="OpenGL/libEGL/libEGL.cbp" />