Skip to content

S
swiftshader
Commit a53bf06c by Nicolas Capens Committed by Nicolas Capens
Options

Add libGLES_CM to the Code::Blocks project.

Change-Id: Id69512842d9a863b110f8c8bf5244c117d96fae7 Reviewed-on: https://swiftshader-review.googlesource.com/1464Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 08ccba0d
Showing with 210 additions and 120 deletions
src/Common/SharedLibrary.hpp
...@@ -94,6 +94,6 @@ void *loadLibrary(const char *(&names)[n]) ...@@ -94,6 +94,6 @@ void *loadLibrary(const char *(&names)[n])
inline void *getProcAddress(void *library, const char *name) inline void *getProcAddress(void *library, const char *name)
{ {
return dlsym(library, name); return library ? dlsym(library, name) : 0;
} }
#endif #endif
src/Common/Version.h
#define MAJOR_VERSION 3 #define MAJOR_VERSION 3
#define MINOR_VERSION 2 #define MINOR_VERSION 2
#define BUILD_VERSION 7 #define BUILD_VERSION 7
#define BUILD_REVISION 47655 #define BUILD_REVISION 47656
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
src/OpenGL/libEGL/exports.map 0 → 100644
{
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 @@ ...@@ -97,6 +97,7 @@
<Add directory="./../../" /> <Add directory="./../../" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-Wl,--version-script=./exports.map" />
<Add library="pthread" /> <Add library="pthread" />
</Linker> </Linker>
<Unit filename="../../Common/SharedLibrary.hpp" /> <Unit filename="../../Common/SharedLibrary.hpp" />
......
src/OpenGL/libGLES_CM/Context.cpp
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include "ResourceManager.h" #include "ResourceManager.h"
#include "Buffer.h" #include "Buffer.h"
#include "Framebuffer.h" #include "Framebuffer.h"
#include "Query.h"
#include "Renderbuffer.h" #include "Renderbuffer.h"
#include "Texture.h" #include "Texture.h"
#include "VertexDataManager.h" #include "VertexDataManager.h"
......
src/OpenGL/libGLES_CM/exports.map
{ {
global: 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; glActiveTexture;
glAttachShader; glAlphaFunc;
glBindAttribLocation; glAlphaFuncx;
glBindBuffer; glBindBuffer;
glBindFramebuffer;
glBindRenderbuffer;
glBindTexture; glBindTexture;
glBlendColor;
glBlendEquation;
glBlendEquationSeparate;
glBlendFunc; glBlendFunc;
glBlendFuncSeparate;
glBufferData; glBufferData;
glBufferSubData; glBufferSubData;
glCheckFramebufferStatus;
glClear; glClear;
glClearColor; glClearColor;
glClearColorx;
glClearDepthf; glClearDepthf;
glClearDepthx;
glClearStencil; glClearStencil;
glClientActiveTexture;
glClipPlanef;
glClipPlanex;
glColor4f;
glColor4ub;
glColor4x;
glColorMask; glColorMask;
glCompileShader; glColorPointer;
glCompressedTexImage2D; glCompressedTexImage2D;
glCompressedTexSubImage2D; glCompressedTexSubImage2D;
glCopyTexImage2D; glCopyTexImage2D;
glCopyTexSubImage2D; glCopyTexSubImage2D;
glCreateProgram;
glCreateShader;
glCullFace; glCullFace;
glDeleteBuffers; glDeleteBuffers;
glDeleteFramebuffers;
glDeleteProgram;
glDeleteRenderbuffers;
glDeleteShader;
glDeleteTextures; glDeleteTextures;
glDepthFunc; glDepthFunc;
glDepthMask; glDepthMask;
glDepthRangef; glDepthRangef;
glDetachShader; glDepthRangex;
glDisable; glDisable;
glDisableVertexAttribArray; glDisableClientState;
glDrawArrays; glDrawArrays;
glDrawElements; glDrawElements;
glEnable; glEnable;
glEnableVertexAttribArray; glEnableClientState;
glFinish; glFinish;
glFlush; glFlush;
glFramebufferRenderbuffer; glFogf;
glFramebufferTexture2D; glFogfv;
glFogx;
glFogxv;
glFrontFace; glFrontFace;
glFrustumf;
glFrustumx;
glGenBuffers; glGenBuffers;
glGenFramebuffers;
glGenRenderbuffers;
glGenTextures; glGenTextures;
glGenerateMipmap;
glGetActiveAttrib;
glGetActiveUniform;
glGetAttachedShaders;
glGetAttribLocation;
glGetBooleanv; glGetBooleanv;
glGetBufferParameteriv; glGetBufferParameteriv;
glGetClipPlanef;
glGetClipPlanex;
glGetError; glGetError;
glGetFixedv;
glGetFloatv; glGetFloatv;
glGetFramebufferAttachmentParameteriv;
glGetIntegerv; glGetIntegerv;
glGetProgramInfoLog; glGetLightfv;
glGetProgramiv; glGetLightxv;
glGetRenderbufferParameteriv; glGetMaterialfv;
glGetShaderInfoLog; glGetMaterialxv;
glGetShaderPrecisionFormat; glGetPointerv;
glGetShaderSource;
glGetShaderiv;
glGetString; glGetString;
glGetTexEnvfv;
glGetTexEnviv;
glGetTexEnvxv;
glGetTexParameterfv; glGetTexParameterfv;
glGetTexParameteriv; glGetTexParameteriv;
glGetUniformLocation; glGetTexParameterxv;
glGetUniformfv;
glGetUniformiv;
glGetVertexAttribPointerv;
glGetVertexAttribfv;
glGetVertexAttribiv;
glHint; glHint;
glIsBuffer; glIsBuffer;
glIsEnabled; glIsEnabled;
glIsFramebuffer;
glIsProgram;
glIsRenderbuffer;
glIsShader;
glIsTexture; glIsTexture;
glLightModelf;
glLightModelfv;
glLightModelx;
glLightModelxv;
glLightf;
glLightfv;
glLightx;
glLightxv;
glLineWidth; glLineWidth;
glLinkProgram; glLineWidthx;
glLoadIdentity;
glLoadMatrixf;
glLoadMatrixx;
glLogicOp;
glMaterialf;
glMaterialfv;
glMaterialx;
glMaterialxv;
glMatrixMode;
glMultMatrixf;
glMultMatrixx;
glMultiTexCoord4f;
glMultiTexCoord4x;
glNormal3f;
glNormal3x;
glNormalPointer;
glOrthof;
glOrthox;
glPixelStorei; glPixelStorei;
glPointParameterf;
glPointParameterfv;
glPointParameterx;
glPointParameterxv;
glPointSize;
glPointSizex;
glPolygonOffset; glPolygonOffset;
glPolygonOffsetx;
glPopMatrix;
glPushMatrix;
glReadPixels; glReadPixels;
glReleaseShaderCompiler; glRotatef;
glRenderbufferStorage; glRotatex;
glSampleCoverage; glSampleCoverage;
glSampleCoveragex;
glScalef;
glScalex;
glScissor; glScissor;
glShaderBinary; glShadeModel;
glShaderSource;
glStencilFunc; glStencilFunc;
glStencilFuncSeparate;
glStencilMask; glStencilMask;
glStencilMaskSeparate;
glStencilOp; glStencilOp;
glStencilOpSeparate; glTexCoordPointer;
glTexEnvf;
glTexEnvfv;
glTexEnvi;
glTexEnviv;
glTexEnvx;
glTexEnvxv;
glTexImage2D; glTexImage2D;
glTexParameterf; glTexParameterf;
glTexParameterfv; glTexParameterfv;
glTexParameteri; glTexParameteri;
glTexParameteriv; glTexParameteriv;
glTexParameterx;
glTexParameterxv;
glTexSubImage2D; glTexSubImage2D;
glUniform1f; glTranslatef;
glUniform1fv; glTranslatex;
glUniform1i; glVertexPointer;
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; glViewport;
# Extensions # Extensions
glTexImage3DOES; glPointSizePointerOES;
glBlitFramebufferANGLE; glEGLImageTargetTexture2DOES;
glRenderbufferStorageMultisampleANGLE; glEGLImageTargetRenderbufferStorageOES;
glDeleteFencesNV; glIsRenderbufferOES;
glFinishFenceNV; glBindRenderbufferOES;
glGenFencesNV; glDeleteRenderbuffersOES;
glGetFenceivNV; glGenRenderbuffersOES;
glIsFenceNV; glRenderbufferStorageOES;
glSetFenceNV; glGetRenderbufferParameterivOES;
glTestFenceNV; glIsFramebufferOES;
glGetGraphicsResetStatusEXT; glBindFramebufferOES;
glReadnPixelsEXT; glDeleteFramebuffersOES;
glGetnUniformfvEXT; glGenFramebuffersOES;
glGetnUniformivEXT; glCheckFramebufferStatusOES;
glGenQueriesEXT; glFramebufferRenderbufferOES;
glDeleteQueriesEXT; glFramebufferTexture2DOES;
glIsQueryEXT; glGetFramebufferAttachmentParameterivOES;
glBeginQueryEXT; glGenerateMipmapOES;
glEndQueryEXT; glBlendEquationOES;
glGetQueryivEXT; glBlendEquationSeparateOES;
glGetQueryObjectuivEXT; glBlendFuncSeparateOES;
glDrawTexsOES;
glDrawTexiOES;
glDrawTexxOES;
glDrawTexsvOES;
glDrawTexivOES;
glDrawTexxvOES;
glDrawTexfOES;
glDrawTexfvOES;
# EGL dependencies # EGL dependencies
glCreateContext; glCreateContext;
glDestroyContext;
glMakeCurrent;
glGetCurrentContext;
glGetProcAddress; glGetProcAddress;
glBindTexImage;
createFrameBuffer; createFrameBuffer;
createBackBuffer; createBackBuffer;
createDevice; createDepthStencil;
Register; Register;
......
src/OpenGL/libGLES_CM/libGLES_CM.cpp
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include "Framebuffer.h" #include "Framebuffer.h"
#include "Renderbuffer.h" #include "Renderbuffer.h"
#include "Texture.h" #include "Texture.h"
#include "Query.h"
#include "common/debug.h" #include "common/debug.h"
#include "Common/SharedLibrary.hpp" #include "Common/SharedLibrary.hpp"
#include "Common/Version.h" #include "Common/Version.h"
...@@ -2670,7 +2669,7 @@ const GLubyte* GL_APIENTRY glGetString(GLenum name) ...@@ -2670,7 +2669,7 @@ const GLubyte* GL_APIENTRY glGetString(GLenum name)
case GL_RENDERER: case GL_RENDERER:
return (GLubyte*)"SwiftShader"; return (GLubyte*)"SwiftShader";
case GL_VERSION: case GL_VERSION:
return (GLubyte*)"OpenGL ES 1.1 SwiftShader "VERSION_STRING; return (GLubyte*)"OpenGL ES 1.1 SwiftShader " VERSION_STRING;
case GL_EXTENSIONS: case GL_EXTENSIONS:
// Keep list sorted in following order: // Keep list sorted in following order:
// OES extensions // OES extensions
......
src/OpenGL/libGLESv2/exports.map
...@@ -165,18 +165,16 @@ global: ...@@ -165,18 +165,16 @@ global:
glEndQueryEXT; glEndQueryEXT;
glGetQueryivEXT; glGetQueryivEXT;
glGetQueryObjectuivEXT; glGetQueryObjectuivEXT;
glEGLImageTargetTexture2DOES;
glEGLImageTargetRenderbufferStorageOES;
# EGL dependencies # EGL dependencies
glCreateContext; glCreateContext;
glDestroyContext;
glMakeCurrent;
glGetCurrentContext;
glGetProcAddress; glGetProcAddress;
glBindTexImage;
createFrameBuffer; createFrameBuffer;
createBackBuffer; createBackBuffer;
createDevice; createDepthStencil;
Register; Register;
......
src/Reactor/RoutineManager.cpp
...@@ -113,8 +113,11 @@ namespace sw ...@@ -113,8 +113,11 @@ namespace sw
void RoutineManager::deallocateExceptionTable(void *ET) void RoutineManager::deallocateExceptionTable(void *ET)
{ {
if(ET)
{
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
}
void RoutineManager::setMemoryWritable() void RoutineManager::setMemoryWritable()
{ {
......
src/SwiftShader.workspace
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
<Project filename="OpenGL/libGLESv2/libGLESv2.cbp"> <Project filename="OpenGL/libGLESv2/libGLESv2.cbp">
<Depends filename="LLVM/LLVM.cbp" /> <Depends filename="LLVM/LLVM.cbp" />
</Project> </Project>
<Project filename="OpenGL/libGLES_CM/libGLES_CM.cbp">
<Depends filename="LLVM/LLVM.cbp" />
</Project>
<Project filename="LLVM/LLVM.cbp" /> <Project filename="LLVM/LLVM.cbp" />
<Project filename="../tests/third_party/PowerVR/Examples/Beginner/01_HelloAPI/OGLES2/Build/OGLES2HelloAPI.cbp"> <Project filename="../tests/third_party/PowerVR/Examples/Beginner/01_HelloAPI/OGLES2/Build/OGLES2HelloAPI.cbp">
<Depends filename="OpenGL/libEGL/libEGL.cbp" /> <Depends filename="OpenGL/libEGL/libEGL.cbp" />
......
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