Skip to content

S
swiftshader
Commit cc5c464b by Alexis Hetu Committed by Alexis Hétu
Options

Silence unused private member warning

Removed mConfig from Context and related functions. Change-Id: I91eba6a4dbbd8ff48f212a246b1894009d513436 Reviewed-on: https://swiftshader-review.googlesource.com/5531Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 1fb3a755
Showing with 15 additions and 16 deletions
src/OpenGL/libEGL/Display.cpp
...@@ -423,7 +423,7 @@ EGLContext Display::createContext(EGLConfig configHandle, const egl::Context *sh ...@@ -423,7 +423,7 @@ EGLContext Display::createContext(EGLConfig configHandle, const egl::Context *sh
{ {
if(libGLES_CM) if(libGLES_CM)
{ {
context = libGLES_CM->es1CreateContext(this, config, shareContext); context = libGLES_CM->es1CreateContext(this, shareContext);
} }
} }
else if((clientVersion == 2 && config->mRenderableType & EGL_OPENGL_ES2_BIT) else if((clientVersion == 2 && config->mRenderableType & EGL_OPENGL_ES2_BIT)
...@@ -434,7 +434,7 @@ EGLContext Display::createContext(EGLConfig configHandle, const egl::Context *sh ...@@ -434,7 +434,7 @@ EGLContext Display::createContext(EGLConfig configHandle, const egl::Context *sh
{ {
if(libGLESv2) if(libGLESv2)
{ {
context = libGLESv2->es2CreateContext(this, config, shareContext, clientVersion); context = libGLESv2->es2CreateContext(this, shareContext, clientVersion);
} }
} }
else else
......
src/OpenGL/libGLES_CM/Context.cpp
...@@ -37,7 +37,7 @@ using std::abs; ...@@ -37,7 +37,7 @@ using std::abs;
namespace es1 namespace es1
{ {
Context::Context(egl::Display *const display, const egl::Config *config, const Context *shareContext) Context::Context(egl::Display *const display, const Context *shareContext)
: egl::Context(display), : egl::Context(display),
modelViewStack(MAX_MODELVIEW_STACK_DEPTH), modelViewStack(MAX_MODELVIEW_STACK_DEPTH),
projectionStack(MAX_PROJECTION_STACK_DEPTH), projectionStack(MAX_PROJECTION_STACK_DEPTH),
...@@ -3452,8 +3452,8 @@ unsigned int Context::getActiveTexture() const ...@@ -3452,8 +3452,8 @@ unsigned int Context::getActiveTexture() const
} }
egl::Context *es1CreateContext(egl::Display *display, const egl::Config *config, const egl::Context *shareContext) egl::Context *es1CreateContext(egl::Display *display, const egl::Context *shareContext)
{ {
ASSERT(!shareContext || shareContext->getClientVersion() == 1); // Should be checked by eglCreateContext ASSERT(!shareContext || shareContext->getClientVersion() == 1); // Should be checked by eglCreateContext
return new es1::Context(display, config, static_cast<const es1::Context*>(shareContext)); return new es1::Context(display, static_cast<const es1::Context*>(shareContext));
} }
src/OpenGL/libGLES_CM/Context.h
...@@ -294,7 +294,7 @@ struct State ...@@ -294,7 +294,7 @@ struct State
class Context : public egl::Context class Context : public egl::Context
{ {
public: public:
Context(egl::Display *display, const egl::Config *config, const Context *shareContext); Context(egl::Display *display, const Context *shareContext);
virtual void makeCurrent(egl::Surface *surface); virtual void makeCurrent(egl::Surface *surface);
virtual int getClientVersion() const; virtual int getClientVersion() const;
......
src/OpenGL/libGLES_CM/libGLES_CM.hpp
...@@ -219,7 +219,7 @@ public: ...@@ -219,7 +219,7 @@ public:
void (*glDrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); void (*glDrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
void (*glDrawTexfvOES)(const GLfloat *coords); void (*glDrawTexfvOES)(const GLfloat *coords);
egl::Context *(*es1CreateContext)(egl::Display *display, const egl::Config *config, const egl::Context *shareContext); egl::Context *(*es1CreateContext)(egl::Display *display, const egl::Context *shareContext);
__eglMustCastToProperFunctionPointerType (*es1GetProcAddress)(const char *procname); __eglMustCastToProperFunctionPointerType (*es1GetProcAddress)(const char *procname);
egl::Image *(*createBackBuffer)(int width, int height, const egl::Config *config); egl::Image *(*createBackBuffer)(int width, int height, const egl::Config *config);
egl::Image *(*createDepthStencil)(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard); egl::Image *(*createDepthStencil)(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard);
......
src/OpenGL/libGLES_CM/main.cpp
...@@ -330,7 +330,7 @@ void DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) ...@@ -330,7 +330,7 @@ void DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
void DrawTexfvOES(const GLfloat *coords); void DrawTexfvOES(const GLfloat *coords);
} }
egl::Context *es1CreateContext(egl::Display *display, const egl::Config *config, const egl::Context *shareContext); egl::Context *es1CreateContext(egl::Display *display, const egl::Context *shareContext);
extern "C" __eglMustCastToProperFunctionPointerType es1GetProcAddress(const char *procname); extern "C" __eglMustCastToProperFunctionPointerType es1GetProcAddress(const char *procname);
egl::Image *createBackBuffer(int width, int height, const egl::Config *config); egl::Image *createBackBuffer(int width, int height, const egl::Config *config);
egl::Image *createDepthStencil(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard); egl::Image *createDepthStencil(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard);
......
src/OpenGL/libGLESv2/Context.cpp
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
namespace es2 namespace es2
{ {
Context::Context(egl::Display *display, const egl::Config *config, const Context *shareContext, EGLint clientVersion) Context::Context(egl::Display *display, const Context *shareContext, EGLint clientVersion)
: egl::Context(display), clientVersion(clientVersion), mConfig(config) : egl::Context(display), clientVersion(clientVersion)
{ {
sw::Context *context = new sw::Context(); sw::Context *context = new sw::Context();
device = new es2::Device(context); device = new es2::Device(context);
...@@ -4366,8 +4366,8 @@ const GLubyte* Context::getExtensions(GLuint index, GLuint* numExt) const ...@@ -4366,8 +4366,8 @@ const GLubyte* Context::getExtensions(GLuint index, GLuint* numExt) const
} }
egl::Context *es2CreateContext(egl::Display *display, const egl::Config *config, const egl::Context *shareContext, int clientVersion) egl::Context *es2CreateContext(egl::Display *display, const egl::Context *shareContext, int clientVersion)
{ {
ASSERT(!shareContext || shareContext->getClientVersion() == clientVersion); // Should be checked by eglCreateContext ASSERT(!shareContext || shareContext->getClientVersion() == clientVersion); // Should be checked by eglCreateContext
return new es2::Context(display, config, static_cast<const es2::Context*>(shareContext), clientVersion); return new es2::Context(display, static_cast<const es2::Context*>(shareContext), clientVersion);
} }
src/OpenGL/libGLESv2/Context.h
...@@ -425,7 +425,7 @@ struct State ...@@ -425,7 +425,7 @@ struct State
class Context : public egl::Context class Context : public egl::Context
{ {
public: public:
Context(egl::Display *display, const egl::Config *config, const Context *shareContext, EGLint clientVersion); Context(egl::Display *display, const Context *shareContext, EGLint clientVersion);
virtual void makeCurrent(egl::Surface *surface); virtual void makeCurrent(egl::Surface *surface);
virtual EGLint getClientVersion() const; virtual EGLint getClientVersion() const;
...@@ -720,7 +720,6 @@ private: ...@@ -720,7 +720,6 @@ private:
Query *createQuery(GLuint handle, GLenum type); Query *createQuery(GLuint handle, GLenum type);
const EGLint clientVersion; const EGLint clientVersion;
const egl::Config *const mConfig;
State mState; State mState;
......
src/OpenGL/libGLESv2/libGLESv2.hpp
...@@ -241,7 +241,7 @@ public: ...@@ -241,7 +241,7 @@ public:
void (*glGenerateMipmapOES)(GLenum target); void (*glGenerateMipmapOES)(GLenum target);
void (*glDrawBuffersEXT)(GLsizei n, const GLenum *bufs); void (*glDrawBuffersEXT)(GLsizei n, const GLenum *bufs);
egl::Context *(*es2CreateContext)(egl::Display *display, const egl::Config *config, const egl::Context *shareContext, int clientVersion); egl::Context *(*es2CreateContext)(egl::Display *display, const egl::Context *shareContext, int clientVersion);
__eglMustCastToProperFunctionPointerType (*es2GetProcAddress)(const char *procname); __eglMustCastToProperFunctionPointerType (*es2GetProcAddress)(const char *procname);
egl::Image *(*createBackBuffer)(int width, int height, const egl::Config *config); egl::Image *(*createBackBuffer)(int width, int height, const egl::Config *config);
egl::Image *(*createDepthStencil)(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard); egl::Image *(*createDepthStencil)(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard);
......
src/OpenGL/libGLESv2/main.cpp
...@@ -1327,7 +1327,7 @@ GL_APICALL void GL_APIENTRY glDrawBuffersEXT(GLsizei n, const GLenum *bufs) ...@@ -1327,7 +1327,7 @@ GL_APICALL void GL_APIENTRY glDrawBuffersEXT(GLsizei n, const GLenum *bufs)
} }
} }
egl::Context *es2CreateContext(egl::Display *display, const egl::Config *config, const egl::Context *shareContext, int clientVersion); egl::Context *es2CreateContext(egl::Display *display, const egl::Context *shareContext, int clientVersion);
extern "C" __eglMustCastToProperFunctionPointerType es2GetProcAddress(const char *procname); extern "C" __eglMustCastToProperFunctionPointerType es2GetProcAddress(const char *procname);
egl::Image *createBackBuffer(int width, int height, const egl::Config *config); egl::Image *createBackBuffer(int width, int height, const egl::Config *config);
egl::Image *createDepthStencil(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard); egl::Image *createDepthStencil(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard);
......
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